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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 20 insertions, 24 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/Manifest b/dev-python/six/Manifest
index 9d0d3e207f34..fac18f842ff9 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -16,18 +16,18 @@ EBUILD six-1.3.0.ebuild 970 SHA256 051b42b8cc62f6123958f3eaf4feb4adbaadbfc4b6455
 EBUILD six-1.4.0.ebuild 977 SHA256 53c0443e5d32d9fcdbe9f93f88e9a06252c00cc499a6a87b9a57c1515514844f SHA512 6f4d9f56065b9c22d9265c8881f1b2628ca14d5c3e146d85d78c4dcde3cbf7092b52ac6eb89d58ec407369e4f3e9d84d2c7c31255e3d21a05e387555266fd651 WHIRLPOOL fc3a7d55bc22cbc9c14161c8960e22772f1b115709ac3feed2edd9b214b5e2b4596185042cfd94163fc4ed4ef3d21d1a23947bb1ef542a593605571ba3a59189
 EBUILD six-1.4.1.ebuild 993 SHA256 8ad50a98e4b6e3bab7c41a1240f796f1680d656d766fff2f90ee1edf54b52934 SHA512 27704493223142a99a68304667c1f7b442c98efd87efac44da1f1dfce35fb914be2a58925fda235f6f22eec6c591c1becf78c391af68e4f022262abf945517f1 WHIRLPOOL 63333e30cc80e326da99af72834f8407e601d8850007477ad51584233b5019e3ca34cfb1f5127497a1948edf7d24f730e9024d1c040a697619df7b86678e914d
 EBUILD six-1.5.2.ebuild 1039 SHA256 f484b476741bdcc593fd0f74b814f465844b29a265c3688ccec196d8032dfef6 SHA512 12aebd32ca67a91350e2365fa7a570b35c421b7d3ab86763506a9976302b4e3fc5f235118c5f27861acca9af71a39695034376019f2589eedfc74d32077bab48 WHIRLPOOL ea9af53d41ddf7f1999b33c35f23e06ed1dbf1f1d70dbf8e2fc6d37ebe59c53cba88c460581023cf34bcd61883f452eb266494b25fe444cc2bb9e79330c5283d
-EBUILD six-1.6.1.ebuild 1068 SHA256 32d5c4eae55d425c3439b6386c27abc5765d5a30432d0128516ab3841b3a63e3 SHA512 84b7956a0689ce3614230cb2f7189bdf968bbb821d8795be2f5160f684518a438f65698fed1ef16c58418c587028c103a9b34676d5109d1e24c3853130e9df9b WHIRLPOOL 3cb67e6d3b27d2fca9643b4df61ad8210c9811a31a92062e7eb1f478823af28b6179e89ab454d3244b03cf9a88dde5f951f0e23900ec041150141d17da1350ce
-EBUILD six-9999.ebuild 1213 SHA256 e5d3b67903a40fc2dcbad20b49f65980088e6231a2ab7f9add009c24a51bb59a SHA512 b5ebed4dbf63b7575c81ab5e83b21d7310fdc82745ead10680a757f45db5fc4796b87ce4ba1094b2fcee4b31186e7045c9adb0fc01262e7b5a5cd0eaea4eec3d WHIRLPOOL b77e518650b87e481573e91913fd6994fbaba4c69cac27dc484202cda00dc8b7f255a679c5757cf11e86c7219e2efe36975b0a3356f658b269d64b7a89af70cf
-MISC ChangeLog 4413 SHA256 2c614a59e1fadfecc030bd8df559e2b46316167fb03f716c513ced2572e5fee2 SHA512 1b6a988ef0f8eb2489c1df467cf9808a4fb4d2888933b2e62905e8cbe48e9c03edf84f7209816b193ab35c35150e0674a47587e73432fd32c5a4da5799203675 WHIRLPOOL 697082e6d9d4bf211d6d1a3aa62993552dc82260a6cd0b646e54a0b2d7505b865e841bd4839d61d7282187c6025cb244b500dc3cbdb297c2546dae32d0ff37d8
+EBUILD six-1.6.1.ebuild 1050 SHA256 40c7f9fd097c549e9b8f619289e110e9074dc6ba5a8d442459c27deda454de29 SHA512 69c83439db5d0d25301844cbb6a56530c9a1978fb30a730c82d3d69daa5b8ffc5dff77817da87328b6df40696ef6fd6ff9265baedccaf4a640292fb8bc7c51c3 WHIRLPOOL ed0c4daa8c7bd17cb760598587b1891f1872e17f06693a96afceb869ad492fba54bd571596c3253c3896d65c98527944b7e22a65e06fead79c7c6d2b9319876e
+EBUILD six-9999.ebuild 1098 SHA256 2cfb3e2b94766cde6419c87666adf64e19b3a0334daeff8d800b321f5cb37890 SHA512 ae97f115bc47789b1dfda7c7535b98b23b35ae7438cd9b590a93cac6849a8396eeef1c36cf74e46657e36d6a9d9f9af7549605155637553b1dd4108608652af2 WHIRLPOOL 16b165ec47af99d134c0acfdb1006d5b8cecf10338922f173999fa6903c395d214eca2e982c247daa1de262baae0a3f1b0279e13d1d3de7a8956504047d21cb4
+MISC ChangeLog 4571 SHA256 7dbbcde93eea409aea0f2072bf5d701d16bc73b2fc31256d996fb17416f07aef SHA512 184a0acb827520ea103a72f57838742019dae6bf3aabc304b04ea879a32ead035c8121d6cd67a7d37fef33e771936c874f9a12547b609755137376da8abd8c48 WHIRLPOOL fbb163f4f14f9405a16e6c3c80207a0ccca6f2a340aceaa42e790e5d61e278cefe6d2f453d6e13cfb53ddd8e32a65fbffa8bc881d300ee8ec6c3a11a2b4901f0
 MISC metadata.xml 226 SHA256 bdafefb27f29ded62ff07b71d48d72d5c385dcc4c0e9c95beed417b16edb07e0 SHA512 25f36880da8494a871b8cd71511742e64a43a9f2e5d34a76016d57d803be151446a3107391e54911303cfda7436398c6dec9fbbe0bec5abac98c11a21e1609e3 WHIRLPOOL 1637b7d2a45c8a664f1bfc565bbfe6942ca737c6801ef11baf9f303cf9e8a982e2875c9f88f235aebdf5d7f500504e6851f2d32585089dbd48a5e71a633d86c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTI+6SAAoJEEqz6FtPBkyj5BUH/2j4PJ7WSvsGYbdFI+oJMDzL
-e5KIblPVsoFYPL1y+1LhzjVUEavzdlX7a4vFr2ordHohM9/26jjHDaRhB8J1dLUZ
-Oh2qHKpTeiDyuLhO0Tx/XFvz+mtz4R5g9TBkC8OkHrP1OyeR9VV4Zpa37OKI9Mvr
-l9dOPB2ruazEs5wCs8FgsJLooyzhRIUFcY69rjE/T3roAHYoeOGizzxgzCX1zpaK
-+oQ2S6NkZrTb2MCLvEAtivD+laiIWAhtoRZpHVt+wL/UKnZbE/Hl3IMxtWLAxaXS
-fV2pTu5QoI6nvyTUYfbSB3dHB+8DKUOQdO9wjs2wX612HQpaAs9wnI1zipzypIU=
-=he15
+iQEcBAEBCAAGBQJTI/OYAAoJEEqz6FtPBkyjzuoIALmWqO0fsULIJq50Ps71Q7pn
+8t7nylya3iy0rp3qQRPjxU5bNeVaeGfKu8B34JjFqURHMwLp6ykXk1I2Dt+m9aBV
+qxjKd+hhPp0KKOKdG1WXjBeVpiucLwQRWsKLEGsW/gHvbmoy7l+zQdvllq1kyvXL
+FWbyddNHNodsipixzmta/PTrv/RDx617mDTfwzUJoTKnyDC68a0trRK1SKQftItZ
+9xj3lX7LewyvFmH5dzIfOTTd8cOPnFMU9w+lJ8SSiYLe4YI6XmhIPtNkgU7VtGOC
+qtf2iQRX3wrmMPQJW/dzl7ajRXq1fVfwG+XjP5zOW4gSewc4G6Qwy3eZOHK1Rr4=
+=fWVG
 -----END PGP SIGNATURE-----
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
 }