Improved 'variation on the theme' to build docs avoiding use of die with python3, prompted by Arfrever wrt initial Bug #445688

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 22 insertions, 28 deletions

diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index f579905d598f..0bb155ff0b9a 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/kombu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.12 2012/12/08 13:04:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.13 2012/12/10 12:20:04 idella4 Exp $
+
+  11 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
+  Improved 'variation on the theme' to build docs avoiding use of die with
+  python3, prompted by Arfrever wrt initial Bug #445688
 
   09 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
   USE doc with python3 set to die due to inability of py3 to build docs, fixed
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 513f0e14a5ed..887b8f6c024a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -5,15 +5,15 @@ AUX kombu-2.1.1-add-assertIsInstance-with-unittest.patch 467 SHA256 a38902c382db
 DIST kombu-2.4.10.tar.gz 291204 SHA256 211cb68b133578338aac0990d31d9255ed54b5f1861fb2cd54c1bb28bdbc8a6e SHA512 e2d10d2d3c13072b079e29f12094b9a88e55f58e1368da1ebc0eedface3c1e0bdd5d3d7ac00469027051b61c3285a30f7b6d47a0fe8345d8bf04cb2a7b1f8748 WHIRLPOOL 6e4324dbabc1a61c7f4596e6bd54d750fc6f39f28e364c13213f130149a070153bd36fd76e2fef3ceaea4ded4cd79b3cc1c3708a2da20be4c5f1d06a2fa3bc6c
 DIST kombu-2.4.8.tar.gz 290975 SHA256 c6613158dcb21d630300dbb53fb76dabdc28c21ba2b13386ce39fda136c5907e SHA512 cc340c14e7d081ebfb59c439db39b13aeceb62e803c8738072e4626ee8f23cf1ea73e012f25dd972b11a06520b86831261ace8ff878b0a1ee8e905e3f3f9f5a0 WHIRLPOOL c7a41aea5e99ed4a8f33fb620e8ff177b764484112b1c7ad980f7cb8bcc8bffe8c1a6df5ea7a904e7135e9c53e5ae3393b3591d0056bbf930c6b74e05fffa698
 DIST kombu-2.4.9.tar.gz 291187 SHA256 94ee2160adbc377fccfa9dc156056103ba566536b831e75c9569815b9f4a9598 SHA512 695aa7750542136227f00e39713de24397ad58279c510afd49070ae1f3d1fec470a64abe8bf67be75800c70ba03adeb40c6cf1f9e412434e4d039eb51acb3e6f WHIRLPOOL a66e5638fcd9404fbe95f282b68ada58e19b509f0240592b10ffcea369839dd4417bd7be3297a94174119c7758c93317f60c7f0c054fc80f376170dac1c8fae3
-EBUILD kombu-2.4.10.ebuild 1966 SHA256 fad3303eb76881e79511fe31787f925f415e26a365b34f200f207192d94eccca SHA512 e026e7b4da5dcec11d31bb1de95e0512abfbbf49c741f7542dea587d51e6231daa58e26d227394f4dde5cc99c88feeffdce477dfa74a352cbf37392970ff538f WHIRLPOOL 26a71860f1d6d04ab681f8b087befb8cf003fff15033deb67bfa456afc125067d0b59f774e0875dbd1f86894b2cf69ed53dc51bef3b5fddc519a1b0e22054d57
+EBUILD kombu-2.4.10.ebuild 1720 SHA256 fa00cafaa8d5cfa94c8a991bdd77b38e36670a60137f96bb13c4e9f031e29159 SHA512 8db903eba7b3be1be001b605858b4408aa738a98887de846a9bca1b70af5a66c7ac6dea06c1de8caee93980ecf0f00b39ee9afd12e438ade5d6d27a1d015ec47 WHIRLPOOL c0fadd802acc644e970fd1129b1f11ff18285722e99521a93c91702c0c8af3ae2f483b7f8f34260de6e7f3dd5ccf46ec2ac254836f6bb5c128a45cc4804af15b
 EBUILD kombu-2.4.8.ebuild 1550 SHA256 7febe50e5f3bf05afc03218a4ccdce0b488bf99ac41b46b8f51ff3f7c379e48f SHA512 45946f459a395f1887ed16d6d6db64440d451a0a2658b64b58947164c295c75803ca92fbb2f7da3012fdac9de0b8fa0f8ea61e7e54fe0553ff518873ae215cf4 WHIRLPOOL 0f2978bb43f5cf045bdff362504e022f70810ec40f44ff3cfdf7119f23772645cdd78cde9f20fab59fd8d6ebf2ddbd4bc60f1306ca2ce09d7b8643ef637dcff3
 EBUILD kombu-2.4.9.ebuild 1427 SHA256 85c3134b7d24b3a3196ae2649b02648633dbc2ca99bd8c4a916b2aa028f98c99 SHA512 35beb98476c9770cadff72427f8a34c3301b8731cc4abb40386f2a87520793ac366df5921c7db57500dc2193e3c0b4129a44223dd99aa9ceb5bce20c70de08ee WHIRLPOOL 70b6aafdc4410b4bfbe6ddf39c51fdb9a71dd5e0664c0f1fdfa1c9ff0f87379a08f5f234a8338a34ab0a9882aa370e7f3bb3e7a6d12c45c7f7ffe6e77b633178
-MISC ChangeLog 2034 SHA256 c6c57f0ff1175fe8c54fffc4958fa9929f30884b6d765d42911ffdf4c0f9387a SHA512 5c1d6ad509a067fefd475659a0daca7715b3e11191df598d20fe305bfc924046fcde188087de236b24249c6b78b413dfb054994485bc274d2fe1defb1d369497 WHIRLPOOL 7e2d09116f300ba3cd42a26b6ec29f610e17faafc09ec3d92949c6692b4bccc77b910ab75c036381826d6217aec2371cd523b147380471e1ab63aed2d8067a87
+MISC ChangeLog 2235 SHA256 fd61fe5ffa44f44c197de6c98faa52785d691147e3571ef40f6b3b31447b4a0c SHA512 736d93102fb4d33e446cde31f4cef0a4665ffe27acdd043f63d757b6362f16f565a947a6c7fe0e6221ce8645464d144dd35f74f34b2b24e8c29459e9dbf6d284 WHIRLPOOL 65b54acb1526617bcc9430ccbe9ab852d0bd5beca9a9b6f143f91283bcaa033402588306f53e7347b70d5d875f80edc2b29cf4a98f9d8c0a9e0b2ac4fa7a0fe3
 MISC metadata.xml 374 SHA256 d9e8e1c0078fef43de27867f490457b1e43953d73e38c5bfcada7b798b754463 SHA512 001b8178c44cb7f838331829e77cbabfa0cecdabe8d84e5dcf240e3ed27eceb19e47685e99a9301848d315666ba7238f8990dbb1067f731e9dceeaa2a6608220 WHIRLPOOL 27a4d2e6d310f811a892367f109aed7a9f4ca0f052161956ec6d1eef3570f31d30fd4aabe2b16bae2ede04a081273cb8c1f07bb96f361f9afcea9b6875242b62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDEG98ACgkQso7CE7gHKw2oOACeIhqoVC5PtKtc+6uXiaoxVct2
-Q9MAnRirQM7NHLTLwbElr9wwychaiYwQ
-=kWxO
+iEYEAREIAAYFAlDGtHUACgkQso7CE7gHKw0iYQCeNYpHU/+8L7VtYR/AZX1Nh8Xc
+fqYAoIxo5a3WVOIuX7r9Cru5woQjmNQ/
+=sJgL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/kombu-2.4.10.ebuild b/dev-python/kombu/kombu-2.4.10.ebuild
index a0cdca3efc84..742d23922761 100644
--- a/dev-python/kombu/kombu-2.4.10.ebuild
+++ b/dev-python/kombu/kombu-2.4.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.2 2012/12/08 13:04:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.3 2012/12/10 12:20:04 idella4 Exp $
 
 EAPI="4"
 
 PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
 PYTHON_DEPEND="*:2.7"
-RESTRICT_PYTHON_ABIS="2.[4-6]"
+RESTRICT_PYTHON_ABIS="2.[56]"
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="nosetests"
 
@@ -38,29 +38,19 @@ DEPEND="${RDEPEND}
 	dev-python/couchdb-python )
 	dev-python/setuptools"
 
-src_prepare() {
-	CheckDoc() {
-	if [[ "$(python_get_version  --major)" == '3' ]] && use doc; then
-		eerror ""
-		eerror "Python3 ***CANNOT*** build the docs for this package"
-		error "due to a dependency on django, which does not support python3"
-		eerror "Docs can be built effectively with python2."
-		eerror "Prepend with USE_PYTHON=2.7 and recommence emerge"
-		eerror ""
-		die
-	fi
-	}
-	python_execute_function CheckDoc
-	distutils_src_prepare
-}
-
 src_compile() {
 	distutils_src_compile
 
-	makedocs() {
-		PYTHONPATH="${S}" emake -C docs html
-	}
-	use doc && python_execute_function makedocs
+	local SPHINXBUILD
+	if use doc; then
+		if python2.7 -c "import django.conf" &> /dev/null; then
+			SPHINXBUILD="sphinx-build-2.7"
+		else
+			die "kombu docs failed installation"
+		fi
+		einfo "building docs for kombu with python2.7"
+		PYTHONPATH="${S}" emake -C docs html SPHINXBUILD="${SPHINXBUILD}"
+	fi
 }
 
 src_test() {