Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A set of powerline-related fixes #37

Merged
merged 5 commits into from
Jun 3, 2015
Merged

A set of powerline-related fixes #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
293072b
Move required python test dependencies to the package they belong to
ZyX-I May 29, 2015
a5f098f
Pexpect must be present for each tested version
ZyX-I May 29, 2015
3917bf2
Allow either libvterm or libvterm-neovim
ZyX-I May 29, 2015
2f4f6d2
Move libvterm to dev-libs from x11-libs
ZyX-I May 29, 2015
cce123b
Block libvterm-neovim
ZyX-I May 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions app-misc/powerline-bot-ci/powerline-bot-ci-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
# $Header: $
EAPI="5"

PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy{,3} )

inherit python-r1 git-r3
inherit git-r3

DESCRIPTION="Shell scripts used for building powerline test dependencies"
HOMEPAGE="https://github.com/powerline/bot-ci"
Expand All @@ -18,13 +16,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS=""
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"

RDEPEND="
dev-python/pexpect
dev-python/psutil[${PYTHON_USEDEP}]
x11-libs/libvterm
"
RDEPEND=""
DEPEND=""

# Such scripts are principally intended to be used with Travis and hence
Expand Down
10 changes: 9 additions & 1 deletion app-misc/powerline/powerline-9999-r20.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,15 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
man? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( app-misc/powerline-bot-ci )
test? (
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
|| (
dev-libs/libvterm
dev-libs/libvterm-neovim
)
app-misc/powerline-bot-ci
)
"
RDEPEND="
media-fonts/powerline-symbols
Expand Down
4 changes: 2 additions & 2 deletions x11-libs/libvterm/libvterm-9999-r2.ebuild → dev-libs/libvterm/libvterm-9999-r2.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ KEYWORDS=""
IUSE="test"

DEPEND=""
RDEPEND=""
RDEPEND="!dev-libs/libvterm-neovim"

src_prepare() {
# Prevent "libtool" from emitting ignorable warnings during installation
# resembling:
#
# libtool: warning: '/var/tmp/portage/x11-libs/libvterm-9999-r1/work/libvterm-9999/libvterm.la' has not been installed in '/usr/local/lib'
# libtool: warning: '/var/tmp/portage/dev-libs/libvterm-9999-r2/work/libvterm-9999/libvterm.la' has not been installed in '/usr/local/lib'
# libtool: warning: remember to run 'libtool --finish /usr/local/lib'
#
# We pass both "--no-warnings" *AND* "--warnings=none" to guarantee this.
Expand Down
0 x11-libs/libvterm/metadata.xml → dev-libs/libvterm/metadata.xml
View file
Open in desktop
File renamed without changes.