From a6d48232b088384f1773fd93ec8137ff7268e263 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@ya.ru>
Date: Sun, 10 Mar 2013 15:13:23 +0400
Subject: [PATCH] Add python_test, more exclusions

Fixes #289
---
 packages/gentoo/app-misc/powerline/Manifest   |  2 +-
 .../app-misc/powerline/powerline-9999.ebuild  | 26 ++++++++++++++++---
 setup.py                                      |  2 +-
 tests/test.sh                                 |  7 ++---
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/gentoo/app-misc/powerline/Manifest b/packages/gentoo/app-misc/powerline/Manifest
index 81dadd26..e8479c3f 100644
--- a/packages/gentoo/app-misc/powerline/Manifest
+++ b/packages/gentoo/app-misc/powerline/Manifest
@@ -1 +1 @@
-EBUILD powerline-9999.ebuild 3436 SHA256 9a09866972c18adb5bc3b9394ae8ec98e305aef27e7558803dd89f499829fa48 SHA512 620363137d24ca57457d97fabb95108e515aec2ce986d7dc6abb4b5c68ef2866e55a4024005efc91f7f84fcac58b79c9445af93e3bfff3d1c12aba462c8e8a61 WHIRLPOOL 227ab590e91c97fbe9b720c882d422ee7c05d0637c174cde48f4cd1f683653f14e67914abdb9ba03406d5090d6a56a96e546c501fb1b10961ddaa4005c04b686
+EBUILD powerline-9999.ebuild 3863 SHA256 cc90b1ce3cb2bab7875809a928e02950e3490810e58e6f73c1f21087e36877b7 SHA512 276f4edc5eae5cd3ce82eb54994559c269ea29f07125422787eb00bc2af2ffef67d59aac87c695827c048ad97784d66dedab6581c4f5e51fd3d3111b1dada08e WHIRLPOOL ea94e63f150a9035d05c0fd8403681b0b4d52c962ba22fdd361f7ca20cd986cb4b7179bcff26f98869e51b1b55a4c228c3b2a5146badb6c1ebd67bd9bf2368f9
diff --git a/packages/gentoo/app-misc/powerline/powerline-9999.ebuild b/packages/gentoo/app-misc/powerline/powerline-9999.ebuild
index 6a7e05aa..b3554855 100644
--- a/packages/gentoo/app-misc/powerline/powerline-9999.ebuild
+++ b/packages/gentoo/app-misc/powerline/powerline-9999.ebuild
@@ -19,7 +19,7 @@ SRC_URI=""
 LICENSE="CC-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim zsh doc awesome tmux bash ipython"
+IUSE="vim zsh doc awesome tmux bash ipython test git"
 
 #if LIVE
 SRC_URI=
@@ -30,8 +30,24 @@ S="${WORKDIR}/${PN}"
 
 RDEPEND="
 	vim? ( || ( app-editors/vim[python] app-editors/gvim[python] ) )
-	awesome? ( >=x11-wm/awesome-3.5 )"
-DEPEND="doc? ( dev-python/sphinx dev-python/docutils )"
+	awesome? ( >=x11-wm/awesome-3.5 )
+	git? ( || ( >=dev-vcs/git-1.7.2 >=dev-python/pygit2-0.17 ) )
+"
+DEPEND="
+	doc? ( dev-python/sphinx dev-python/docutils )
+	test? (
+		python_targets_python2_6? ( virtual/python-unittest2 )
+		|| ( >=dev-vcs/git-1.7.2 >=dev-python/pygit2-0.17 )
+		python_targets_python2_6? (
+			dev-vcs/mercurial
+			dev-vcs/bzr
+		)
+		python_targets_python2_7? (
+			dev-vcs/mercurial
+			dev-vcs/bzr
+		)
+	)
+"
 
 FONT_SUFFIX="otf"
 FONT_S="${S}/font"
@@ -40,6 +56,10 @@ FONT_CONF=(
 	"${FONT_S}/10-powerline-symbols.conf"
 )
 
+python_test() {
+	PYTHON="${PYTHON}" tests/test.sh || die "Tests fail with ${EPYTHON}"
+}
+
 src_compile() {
 	distutils-r1_src_compile
 	if use doc ; then
diff --git a/setup.py b/setup.py
index 46c843a8..6c5b1b9e 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
 		'scripts/powerline',
 		],
 	keywords='',
-	packages=find_packages(exclude=('tests',)),
+	packages=find_packages(exclude=('tests', 'tests.*')),
 	include_package_data=True,
 	zip_safe=False,
 	install_requires=[],
diff --git a/tests/test.sh b/tests/test.sh
index 7a018357..5e7cdaf5 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
-if python -c 'import sys; sys.exit(1 * (sys.version_info >= (2, 7)))' ; then
+: ${PYTHON:=python}
+if ${PYTHON} -c 'import sys; sys.exit(1 * (sys.version_info >= (2, 7)))' ; then
 	# Python 2.6
 	export PYTHONPATH="${PYTHONPATH}:`realpath .`"
 	for file in tests/test_*.py ; do
-		if ! python $file ; then
+		if ! ${PYTHON} $file ; then
 			exit 1
 		fi
 	done
 else
-	python setup.py test
+	${PYTHON} setup.py test
 fi