Merge pull request #37 from ZyX-I/fix-powerline

app-misc/powerline: Testing-related fixes.

It's all thanks to the illustrious ZyX-I, as ever.

app-misc/powerline-bot-ci/powerline-bot-ci-9999.ebuild

@@ -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"
@@ -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

app-misc/powerline/powerline-9999-r20.ebuild

@@ -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

x11-libs/libvterm/libvterm-9999-r2.ebuild → dev-libs/libvterm/libvterm-9999-r2.ebuild

@@ -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.