Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-14007-svn/cvs/Linux x86_64

3 files changed, 31 insertions, 14 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 09600e97c95e..a518fb640726 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.23 2009/08/09 16:38:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.24 2009/08/12 02:03:49 arfrever Exp $
+
+  12 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sphinx-0.6.2.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   09 Aug 2009; Raúl Porcel <armin76@gentoo.org> sphinx-0.6.1-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #278978
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 379e1114ff32..feae37bcd30c 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -4,6 +4,6 @@ DIST Sphinx-0.6.2.tar.gz 961608 RMD160 fc893d0cfcc4c006952c706165246268da3c51d4
 EBUILD sphinx-0.5.2.ebuild 1117 RMD160 9c4382f06629a961ddd99fcd12ec4f9a7751fb81 SHA1 6fac41f32326c020adf795310b21434ad003a13c SHA256 f8d0355339124fe13b27e60ae460ef14535579bd35b44b755beb3cf9e28b32e5
 EBUILD sphinx-0.6.1-r1.ebuild 1656 RMD160 85f389425807dfe67b83882c40ce30d16033c219 SHA1 6371293fa42a8182b588c2e3600026b3b67106a9 SHA256 f91570b234e56db7e909738cb00b8855f95bea4514a96610579c8e3e922ceca6
 EBUILD sphinx-0.6.1.ebuild 1104 RMD160 07d51df989751705d6285775aea53c51dbfd5009 SHA1 2d4da3345ae2a8f17279366794d8272a4f944086 SHA256 c63cbed14c3a39a3eb7478eb05ac153aae468ba4072af82253ab74bce7e375b4
-EBUILD sphinx-0.6.2.ebuild 1657 RMD160 c8af1ee1677214d33b987653a08ed5af5843a195 SHA1 db5d0df2535451494957f3d9cb6137d6fe2e5402 SHA256 1e4fef7b87beca9750e8f72fcb938531d2b71b03618741ab1833867e1b591f96
-MISC ChangeLog 3276 RMD160 697ac77bab0f6281eba5626e5cd5003d7c963622 SHA1 5b22c89086d10c4fe41c4efa3780822ef629afa6 SHA256 1093fcab3e44f5f795c20901f4eaddb4bed8dbcd05bf64e59867d31322c9efa5
+EBUILD sphinx-0.6.2.ebuild 2025 RMD160 492da9e5e91b946768bf11e748e8e8fea69f7db7 SHA1 3bd3ddbd196b7cfdef7f67b2c78b4868aaf75b11 SHA256 33dc227177c7ba2cba7bdf8ad041cb227a7b1d9cd924081e4a95e09f8e572aeb
+MISC ChangeLog 3401 RMD160 cf0954fd27f3e347400a68844c845ae295051c29 SHA1 c40686e384cfa4488a9cf634070c664fee2bdf90 SHA256 7eda6a78809d17b310b917de88f2820ee715b6aea54e816d7f1ef888765c9ef9
 MISC metadata.xml 351 RMD160 a039846d5551a68ce6babb384726d5f2aed7ed48 SHA1 4827404c8a432524f89c5c6882c8f723d9ceee23 SHA256 c3304c774eac6a8ed5a1dbfd42c2e52540cfd76aa441ac4be4b94240410bd4dd
diff --git a/dev-python/sphinx/sphinx-0.6.2.ebuild b/dev-python/sphinx/sphinx-0.6.2.ebuild
index f1cbe1ad2548..521440fa305e 100644
--- a/dev-python/sphinx/sphinx-0.6.2.ebuild
+++ b/dev-python/sphinx/sphinx-0.6.2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-0.6.2.ebuild,v 1.3 2009/07/15 03:12:08 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-0.6.2.ebuild,v 1.4 2009/08/12 02:03:49 arfrever Exp $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
 inherit distutils
 
 MY_PN="Sphinx"
@@ -24,13 +26,15 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools
 	test? ( dev-python/nose )"
 
+RESTRICT_PYTHON_ABIS="3*"
+
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	DOCS="CHANGES"
 	distutils_src_compile
 
-	if use doc ; then
+	if use doc; then
 		cd doc
 		PYTHONPATH="../" emake \
 			SPHINXBUILD="${python} ../sphinx-build.py" \
@@ -38,28 +42,37 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install
 
-	if use doc ; then
+	if use doc; then
 		dohtml -A txt -r doc/_build/html/* || die
 	fi
 }
 
-src_test() {
-	PYTHONPATH="./build/lib" nosetests || die "Tests failed"
-}
-
 pkg_postinst() {
 	distutils_pkg_postinst
 
 	# Generating the Grammar pickle to avoid on the fly generation causing sandbox violations (bug #266015)
-	"${python}" \
-		-c "from sphinx.pycode.pgen2.driver import load_grammar ; load_grammar('${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/sphinx/pycode/Grammar.txt')" \
-		|| die "generating grammar pickle failed"
+	generation_of_grammar_pickle() {
+		"$(PYTHON)" -c "from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${ROOT}$(python_get_sitedir)/sphinx/pycode/Grammar.txt')" \
+		|| die "Generation of grammar pickle failed"
+	}
+	python_execute_function --action-message 'Generation of Grammar pickle with Python ${PYTHON_ABI}...' generation_of_grammar_pickle
 }
 
 pkg_postrm() {
-	rm "${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/sphinx/pycode"/Grammar*.pickle
 	distutils_pkg_postrm
+
+	deletion_of_grammar_pickle() {
+		rm "${ROOT}$(python_get_sitedir)/sphinx/pycode"/Grammar*.pickle
+	}
+	python_execute_function --action-message 'Deletion of Grammar pickle with Python ${PYTHON_ABI}...' deletion_of_grammar_pickle
 }