Drop python version specific sphinx use deps and update live ebuild.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 10 insertions, 14 deletions

diff --git a/dev-python/six/ChangeLog b/dev-python/six/ChangeLog
index a58b331d5043..4dfa7bf34305 100644
--- a/dev-python/six/ChangeLog
+++ b/dev-python/six/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/six
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.38 2014/03/15 06:09:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.39 2014/03/15 06:30:42 radhermit Exp $
+
+  15 Mar 2014; Tim Harder <radhermit@gentoo.org> six-1.6.1.ebuild,
+  six-9999.ebuild:
+  Drop python version specific sphinx use deps and update live ebuild.
 
 *six-1.6.1 (15 Mar 2014)
 
diff --git a/dev-python/six/six-1.6.1.ebuild b/dev-python/six/six-1.6.1.ebuild
index 33a731637399..a4090227c6d8 100644
--- a/dev-python/six/six-1.6.1.ebuild
+++ b/dev-python/six/six-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.6.1.ebuild,v 1.1 2014/03/15 06:09:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.6.1.ebuild,v 1.2 2014/03/15 06:30:42 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+DEPEND="doc? ( dev-python/sphinx )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.5.2-mapping.patch )
diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild
index 344f705bb9f7..edc882940eeb 100644
--- a/dev-python/six/six-9999.ebuild
+++ b/dev-python/six/six-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.7 2013/10/21 12:03:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.8 2014/03/15 06:30:42 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -30,23 +30,15 @@ SRC_URI=
 KEYWORDS=
 #endif
 
-python_prepare_all() {
-	# disable tests that require tkinter
-	sed -i -e "s/test_move_items/_&/" test_six.py || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	use doc && emake -C documentation html
 }
 
 python_test() {
-	py.test || die
+	py.test -v || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	use doc && local HTML_DOCS=( documentation/_build/html/ )
-
 	distutils-r1_python_install_all
 }