Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 44 insertions, 33 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index c0c42c4ba7de..4fde50b1ddd8 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.6 2010/07/10 18:54:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.7 2010/07/14 20:06:15 arfrever Exp $
+
+  14 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  bzr-2.1.2.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   10 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   bzr-2.0.1.ebuild:
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 92429d55894f..b911ab4931f9 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -10,6 +10,6 @@ DIST bzr-2.1.2.tar.gz 6824032 RMD160 1c31f50a8d6dda7cf475a76e6ba60aa2ab1705b2 SH
 EBUILD bzr-2.0.1.ebuild 3546 RMD160 f718e751e157f5b53ca82ac429aba09c21374f8f SHA1 68154bfbc75413d3a4b7df24a727160c83f3b72e SHA256 b94c608d42a995f790a66158e1c9b3332da20bc96fd896a107ba29ffe9fbabd5
 EBUILD bzr-2.0.4.ebuild 3625 RMD160 d6a5e5db333bc1ab56ed213f6d11b33d8d5a7a4b SHA1 21fb78d56fd81a02a2e7ebcdbdeb43fcf46d833f SHA256 f94dc99f6e448ca39ffe26addf77cc345e6e663344afac4a1a22c763f3828ae3
 EBUILD bzr-2.1.1.ebuild 3562 RMD160 17673681877a42f1639393f647df61c50ff685e5 SHA1 9e86fc53858f3b57cad5f18ed07c43aa9ccfa810 SHA256 d0dbd58807164c10de9e8d6de2765d1ef5992faab45cee6a54ea4bd0e07640b8
-EBUILD bzr-2.1.2.ebuild 3560 RMD160 19b0bd48a9af7b470470d5acaf67b312520ac7b8 SHA1 e6bcea3fa8669653a3e66024fa8dc83b022e9286 SHA256 e58da7652620a0ca71e2c5a82a3d44b1bf94ee8a01afc7fdbfc4277bfafbb8ee
-MISC ChangeLog 19732 RMD160 01f43696135519bd205c2fd81f2969a5c7fad5a0 SHA1 ad82645695bf879b5a75f13be5862414a2f6a8fe SHA256 8063f07eaa8fa4903a12fd64a0fc85e122d4b09c6cc142bacd99f1c1e11458e7
+EBUILD bzr-2.1.2.ebuild 3720 RMD160 86cce20ae3ee6f3e4c9347dc739976a10d2bb24c SHA1 e3cdb598580c1aa2223cac23db726f330b36b325 SHA256 0073320d798b52e58497ad403a82f46f2db3464bcfae317f6c5302250569aff0
+MISC ChangeLog 19853 RMD160 e3e15665fa5becf78c090ffc4cccc6315dcfcd2c SHA1 a486c272838ad15b6cb0860dacfbc2dbe0043778 SHA256 a849ceb7a0b2865b96f2edba3a7c18e48f7032c3ef9a0f21e50193f84b2ca350
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
diff --git a/dev-vcs/bzr/bzr-2.1.2.ebuild b/dev-vcs/bzr/bzr-2.1.2.ebuild
index e45ac29dbcfb..aa7837803e71 100644
--- a/dev-vcs/bzr/bzr-2.1.2.ebuild
+++ b/dev-vcs/bzr/bzr-2.1.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.1.2.ebuild,v 1.1 2010/06/23 09:43:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.1.2.ebuild,v 1.2 2010/07/14 20:06:15 arfrever Exp $
 
-EAPI=3
-
-PYTHON_DEPEND=2
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit bash-completion distutils elisp-common eutils versionator
 
@@ -22,9 +23,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="curl doc emacs +sftp test"
 
 # Disable until https://bugs.launchpad.net/bzr/+bug/392127 is fixed
-RESTRICT=test
+RESTRICT="test"
 
-RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
 	curl? ( dev-python/pycurl )
 	sftp? ( dev-python/paramiko )"
 
@@ -37,9 +38,12 @@ DEPEND="emacs? ( virtual/emacs )
 	)"
 
 S="${WORKDIR}/${MY_P}"
-PYTHON_MODNAME="bzrlib"
-SITEFILE=71bzr-gentoo.el
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
 DOCS="doc/*.txt"
+PYTHON_MODNAME="bzrlib"
+SITEFILE="71bzr-gentoo.el"
 
 src_prepare() {
 	distutils_src_prepare
@@ -60,8 +64,32 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/456471
+	skip_tests+="bzrlib.tests.blackbox.test_version.*|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	testing() {
+		LC_ALL="C" "$(PYTHON -A)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+	}
+	python_execute_function testing
+
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
+
 src_install() {
-	distutils_src_install --install-data "${EPREFIX}"/usr/share
+	distutils_src_install --install-data "${EPREFIX}/usr/share"
 
 	if use doc; then
 		docinto developers
@@ -104,24 +132,3 @@ pkg_postrm() {
 	distutils_pkg_postrm
 	use emacs && elisp-site-regen
 }
-
-src_test() {
-	export LC_ALL=C
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	#https://bugs.launchpad.net/bzr/+bug/456471
-	skip_tests+="bzrlib.tests.blackbox.test_version.*|"
-	# https://bugs.launchpad.net/bzr/+bug/392127
-	skip_tests+="test_http.*"
-	skip_tests+=")"
-	# Some tests expect the usual pyc compiling behaviour.
-	python_enable_pyc
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-		"$(PYTHON -A)" bzr --no-plugins selftest -x ${skip_tests} || die
-	else
-		"$(PYTHON -A)" bzr --no-plugins selftest || die
-	fi
-	# Just to make sure we don't hit any errors on later stages.
-	python_disable_pyc
-}