Support installation for multiple Python ABIs (bug #329489).

Package-Manager: portage-2.2_rc86_p7/cvs/Linux x86_64

4 files changed, 48 insertions, 30 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 0fcbd26c0fa2..54a0a3894594 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.21 2010/08/26 17:24:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.22 2010/09/24 14:36:29 arfrever Exp $
+
+  24 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mercurial-1.6.3.ebuild, mercurial-9999.ebuild:
+  Support installation for multiple Python ABIs (bug #329489).
 
 *mercurial-1.6.3 (26 Aug 2010)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 4119ffa32371..e50392cb238f 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -13,8 +13,8 @@ EBUILD mercurial-1.5.3.ebuild 3506 RMD160 9dcd66d8ef6d6f4a8aacda0bb9e0675f6a45ca
 EBUILD mercurial-1.5.4.ebuild 3506 RMD160 0d1e5fc1f557aec21137732d5db34e3e081bbaee SHA1 4c39cabd321a0ab9e3045d69bc03aeffb24238d8 SHA256 18c993c2f88f2b7a56f6221f9c161bda57980bf459700c8d86c97e3457acd522
 EBUILD mercurial-1.5.ebuild 3355 RMD160 4efa3563786f0c9e9d2f34f4dbbddd28207f219b SHA1 f88b5abbc1c06077d25d9acdba6c026d846104fd SHA256 6acb4c5ba85b12ca5b7ec736990eae0e1297ef27a7cc5193639fb070c38cf761
 EBUILD mercurial-1.6.1.ebuild 3501 RMD160 94acc6cceca8f2c9be19d8a83e924b6cf768e902 SHA1 8f4f605409d70a6cc0c5bab467e4156ada15c563 SHA256 655e877ba4f51995836680e7d5df8becf1a8939e0f0a26ab839daa76f3a99df3
-EBUILD mercurial-1.6.3.ebuild 3505 RMD160 a3f2a4b679c18922da747cf1299e1608b4736583 SHA1 77285fde84d53d4f5704ad3e77668dc4d32b52d4 SHA256 316c5e6220c78eabacb1e7e8cdb0cfeefbfa8dc637f97a402ff022492221a582
+EBUILD mercurial-1.6.3.ebuild 3582 RMD160 1e215a94e15d0514fc8b40aea0c9863d6b239af5 SHA1 b353dc55fa574f6c9aa3b071c938e2c6de2c360c SHA256 e59e5a74cb34b63ad64eb242fce42fa624ead80acf52125b626dd8ccf450cf5c
 EBUILD mercurial-1.6.ebuild 3504 RMD160 f9c606c4b87bec1e920f3a2510b5b9cf88ceef11 SHA1 66f741df9f6a2aa0bc31d73c4256c0a2ed735e26 SHA256 206058382e77ac56af2b70dd7c4bdd104b1b1a5b1262b0371799147dd7979dc5
-EBUILD mercurial-9999.ebuild 3345 RMD160 19935d4e95741ca014228b6c6008097a12a14e41 SHA1 d7a1e15c8581bc9d0bb4d5d8db9f1dd63f5a325c SHA256 c650c3561f179b59acc8f578fed0e7036ffc6424643bb54102c7b31f6dde6069
-MISC ChangeLog 21021 RMD160 f4a7d20435c367626a128af240536341c39c9aa7 SHA1 1f30e89952761ce3940f26f75ba41d0cf40cda47 SHA256 6093ec234275030d46204a4c6bea64a87d854434b5f7911db12d67708f7c6661
+EBUILD mercurial-9999.ebuild 3421 RMD160 b93eaf88664183417a1b207b553bf5ca3157e841 SHA1 b1a09a868e56485752a1bcd700cfc1b0a3d168f2 SHA256 0ff8778b1173adce3ef287da0291120f5c0766509e376037dad946f7bc036f5a
+MISC ChangeLog 21212 RMD160 1d633213f9134a5c8cec17569be4c1da2c143f40 SHA1 51b2c35cd5bfe56f6876a47bc67192c9c328eb87 SHA256 fc5ad534506baee02b5479bf86ad34ba85437aaea933d6ea29793001cb83f31c
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
diff --git a/dev-vcs/mercurial/mercurial-1.6.3.ebuild b/dev-vcs/mercurial/mercurial-1.6.3.ebuild
index e076c13b7867..08a864c9a205 100644
--- a/dev-vcs/mercurial/mercurial-1.6.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.6.3.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.6.3.ebuild,v 1.1 2010/08/26 17:24:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.6.3.ebuild,v 1.2 2010/09/24 14:36:29 arfrever Exp $
 
 EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit bash-completion elisp-common flag-o-matic eutils distutils
+inherit bash-completion elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -15,23 +19,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk zsh-completion"
 
-CDEPEND=">=dev-lang/python-2.4[threads]"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
+RDEPEND="bugzilla? ( dev-python/mysql-python )
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
 	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
+DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
 		dev-python/pygments )"
 
+PYTHON_CFLAGS=(
+	"2.* + -fno-strict-aliasing"
+	"* - -ftracer -ftree-vectorize"
+)
+
 PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
 src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
 	distutils_src_compile
 
 	if use emacs; then
@@ -99,10 +103,13 @@ src_test() {
 		rm -f test-journal-exists
 		rm -f test-repair-strip
 	fi
-	local testdir="${T}/tests"
-	rm -rf "${testdir}"
-	einfo "Running Mercurial tests ..."
-	python run-tests.py -j4 --tmpdir="${testdir}" || die "test failed"
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}"
+		"$(PYTHON)" run-tests.py -j4 --tmpdir="${testdir}"
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index b1fd5a46fa58..c0ee0ea2bc7b 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.6 2010/06/22 18:49:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.7 2010/09/24 14:36:29 arfrever Exp $
 
 EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit bash-completion elisp-common flag-o-matic eutils distutils mercurial
+inherit bash-completion elisp-common eutils distutils mercurial
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -15,26 +19,26 @@ SLOT="0"
 KEYWORDS=""
 IUSE="bugzilla emacs gpg test tk zsh-completion"
 
-CDEPEND=">=dev-lang/python-2.4[threads]"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
+RDEPEND="bugzilla? ( dev-python/mysql-python )
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
 	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
+DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
 		dev-python/pygments )
 	app-text/asciidoc"
 
 S="${WORKDIR}/hg"
 
+PYTHON_CFLAGS=(
+	"2.* + -fno-strict-aliasing"
+	"* - -ftracer -ftree-vectorize"
+)
+
 PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
 src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
 	distutils_src_compile
 
 	if use emacs; then
@@ -103,10 +107,13 @@ src_test() {
 		rm -f test-journal-exists
 		rm -f test-repair-strip
 	fi
-	local testdir="${T}/tests"
-	rm -rf "${testdir}"
-	einfo "Running Mercurial tests ..."
-	python run-tests.py --tmpdir="${testdir}" || die "test failed"
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}"
+		"$(PYTHON)" run-tests.py -j4 --tmpdir="${testdir}"
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {