Set SUPPORT_PYTHON_ABIS (bug #329477).

Package-Manager: portage-2.2.0_alpha28_p7/cvs/Linux x86_64

9 files changed, 156 insertions, 46 deletions

diff --git a/dev-vcs/cvs2svn/ChangeLog b/dev-vcs/cvs2svn/ChangeLog
index 21c8ab98a5aa..6346629dd750 100644
--- a/dev-vcs/cvs2svn/ChangeLog
+++ b/dev-vcs/cvs2svn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/cvs2svn
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/ChangeLog,v 1.3 2010/06/22 18:43:50 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/ChangeLog,v 1.4 2011/03/25 21:25:47 arfrever Exp $
+
+  25 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cvs2svn-1.5.0.ebuild, cvs2svn-1.5.1.ebuild, cvs2svn-2.0.1.ebuild,
+  cvs2svn-2.1.0.ebuild, cvs2svn-2.1.1.ebuild, cvs2svn-2.2.0.ebuild,
+  cvs2svn-2.3.0.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #329477).
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   cvs2svn-1.5.0.ebuild, cvs2svn-1.5.1.ebuild, cvs2svn-2.0.1.ebuild,
diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest
index 930bc74c18d4..cfc5539de4c1 100644
--- a/dev-vcs/cvs2svn/Manifest
+++ b/dev-vcs/cvs2svn/Manifest
@@ -6,12 +6,12 @@ DIST cvs2svn-2.1.0.tar.gz 389401 RMD160 5e0056129f8bf6a33689ec5cd76ecfcefdec85d2
 DIST cvs2svn-2.1.1.tar.gz 389645 RMD160 a13171a2b53e4b8030e1bd5dabf305cac027a436 SHA1 e26bfcc59bb18159718bce7cbc01ad1c9bfa52e9 SHA256 bd724fb615a5ac1ea1f7aaa62cafad3404d82b9fd1922a1028b81ad0672f9f10
 DIST cvs2svn-2.2.0.tar.gz 411531 RMD160 25a6713516ef6bd13c7ed2f7f52427fba2572866 SHA1 88be25a4d2f2b75be0b89f94357fd52a7dd1fbe9 SHA256 372c57cfea369637cd49fd9d685d1ebaa2e84a9cf4ad301fcc63f9cb42161bea
 DIST cvs2svn-2.3.0.tar.gz 479373 RMD160 83440b4c152b8116b1e6706133c1919a0acfa4b9 SHA1 545237805ddb241054ba40b105b9c29b705539b8 SHA256 d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e
-EBUILD cvs2svn-1.5.0.ebuild 1033 RMD160 688e255e6600405ff95da3d5aec1bf1001a7eabf SHA1 df7b26537514027a21a95bd4ded03323ad6d9d96 SHA256 b66214dbeeffb906c262869a19f17e53a381f07dbaea24a8cbff362161558c04
-EBUILD cvs2svn-1.5.1.ebuild 1037 RMD160 649ead471254768a8802f4f1bfb1cc52514fb394 SHA1 c83d31e3677f0bf522a1ff82c3c4248dc6d0deb0 SHA256 0a96af423f9251c62353ed3bdbb4449d5b8241c57549356f9022be83c3705711
-EBUILD cvs2svn-2.0.1.ebuild 1037 RMD160 590ba2a285c634592d54090c82ad6fd2c802bdb5 SHA1 92bc1bac8f2e74e5ac5b27bd2546e72594d65cf4 SHA256 a94e99a256686c7a55b5a369fbc012c40818f93c0dc77f33a66d3eee1f8193da
-EBUILD cvs2svn-2.1.0.ebuild 987 RMD160 d0404f2b9ac154d73bf5eb8c011540b59a8c2dd3 SHA1 dd6751fe89ebc7dac3632f2ff5ddf8f9a4e1db36 SHA256 457d469fe783ba33b7a70b1336aee516b10f58296a251dc8b9b35eb304cf7df9
-EBUILD cvs2svn-2.1.1.ebuild 1024 RMD160 ecd0a729a4ff1646acc6c7d1a2fbbf4ddae32e37 SHA1 b8b7975fc517d0c66964a015093d5c2c256b704d SHA256 68edfeceda85dea86fa4085c770ae8aff9a6e6d95842d12ea9067edf76b59762
-EBUILD cvs2svn-2.2.0.ebuild 1283 RMD160 dd81e06a1c8cc0a081e716271f788bb800b9db43 SHA1 4bfc2fa78da4e3f1fcbee631c707d8bd145dc731 SHA256 2e1eb4e4cf832f07a2ff60ae1542879049889d5c89aac0ee81ed5ec0b643a7f4
-EBUILD cvs2svn-2.3.0.ebuild 1245 RMD160 c498014f337c19df82395763914e9e146a55b2cd SHA1 5077ad45773d3946a7a19df601ff8334f11a3180 SHA256 cace9ff2a83860215e3555a36d6b3319dc2dc33bf9d12261a4682e04515e4a98
-MISC ChangeLog 5140 RMD160 6129648b77f92156b6c3607e82ec8d7e227f547d SHA1 b97633270f3c94026c90ba491987522c9bed31f3 SHA256 67a9b65311725a03af36fc1e6c6fa5a7e3540415a01713750c28551baa86dda0
+EBUILD cvs2svn-1.5.0.ebuild 1282 RMD160 193b1e1c4bd1298b770b1852b54525ce67d8833c SHA1 0c075895eb608d198c9feecae1cbd9c3caaaec1d SHA256 a7b4fef5683ac30881b8303b626e6e5ccc420936b82d51826833e0f61e2f5735
+EBUILD cvs2svn-1.5.1.ebuild 1286 RMD160 bf08f5ae3f2f08fd6ab2c51c5d24b14251d38eaa SHA1 50ce579a470069bf64d641ffb76ae517c66f6ae3 SHA256 980c12dab49e02a59e9c93bc29c67e215a352ae9c9608b6e52626e1726c79be0
+EBUILD cvs2svn-2.0.1.ebuild 1286 RMD160 920d79a4e61e790d429b27115d933634a05a6a35 SHA1 adfb5c060f351c2d883fdfb498f97c7bc02a5e5c SHA256 749056314893ac88c7a140167212fb94817738f6893677e71f05aaef9097e7e8
+EBUILD cvs2svn-2.1.0.ebuild 1237 RMD160 28749b93bfe5db2cab22b5ac9c2adb7345523084 SHA1 f2858ab1b537f070512569b7ddb820af22877e38 SHA256 409df61a9fc224272a1bb3ab6d711db00e6723c73d41baa75e0eea789df37639
+EBUILD cvs2svn-2.1.1.ebuild 1274 RMD160 998b647f7f2083036606930145604cb8fd4e919e SHA1 f02a47f347b713bc4fe2e885050109e8ef903848 SHA256 84bd98b0bb486789c691ed752ecf3f7cd1af5ec3e7933a0739295cb73e430aff
+EBUILD cvs2svn-2.2.0.ebuild 1481 RMD160 a5a06546069b30fd8cc968fdeba30b7311bb82d5 SHA1 d120e9659b95d08fba8a9d5704575ebbb56946b9 SHA256 700e3e95aa3e44b8567d7adb389f89f8f1f6c3ee765bc7e81ace2af0c6815782
+EBUILD cvs2svn-2.3.0.ebuild 1478 RMD160 5145cfad734467d39c410bbadc15f2659c39fe47 SHA1 cbd2c3ce49df4d840c487a7a655a5140df5788ab SHA256 0f7f02fcdba38fe5db20ecfa944ccbb9b4ed7bc6b1b3be1c3469ce6c978da413
+MISC ChangeLog 5415 RMD160 f3012daa2c5aa27de8af1444ea6b18e10ae21fc8 SHA1 0c45b68331ff93ea0c92ffb7df55dda3ae7dac58 SHA256 f1c405fb7ea121c9516fedb075757a48bdc9496aab30585c4e21ba41b8a45fee
 MISC metadata.xml 405 RMD160 cf957e699dbaf1b34eb92d3ce40648c79110692a SHA1 724f7363b10ddf43dce0b82cfcef90de963c927b SHA256 76c0c7bb7f6a3b5fa5fdd9568f82879c8453758be6fe0fea415cfd0291eaaf1e
diff --git a/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild
index c93077988815..db38ac217dde 100644
--- a/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild,v 1.2 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.0.ebuild,v 1.3 2011/03/25 21:25:47 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -15,11 +20,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ~ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-		>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 		dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	distutils_src_install
 	insinto "/usr/share/${PN}"
@@ -28,6 +39,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  ${ROOT}usr/share/${PN}/"
 }
@@ -35,5 +47,9 @@ pkg_postinst() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild
index 254ec38845bf..e1d7f2e7aba0 100644
--- a/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild,v 1.2 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-1.5.1.ebuild,v 1.3 2011/03/25 21:25:47 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -15,11 +20,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-		>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 		dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	distutils_src_install
 	insinto "/usr/share/${PN}"
@@ -28,6 +39,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  ${ROOT}usr/share/${PN}/"
 }
@@ -35,5 +47,9 @@ pkg_postinst() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild
index 3fe8e946dfb6..aa3f244eb42f 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild,v 1.2 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.0.1.ebuild,v 1.3 2011/03/25 21:25:47 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -15,11 +20,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-		>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 		dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	distutils_src_install
 	insinto "/usr/share/${PN}"
@@ -28,6 +39,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  ${ROOT}usr/share/${PN}/"
 }
@@ -35,5 +47,9 @@ pkg_postinst() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild
index 375e4715b833..b9c498fa38d8 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild,v 1.2 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.0.ebuild,v 1.3 2011/03/25 21:25:47 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -15,11 +20,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-	>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 	dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	distutils_src_install
 	insinto "/usr/share/${PN}"
@@ -30,10 +41,15 @@ src_install() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  /usr/share/${PN}/"
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild
index 7ce77b2ec142..9bdce604e05f 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild,v 1.2 2010/06/22 18:43:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.1.1.ebuild,v 1.3 2011/03/25 21:25:47 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -15,11 +20,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-	>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 	dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	distutils_src_install
 	insinto "/usr/share/${PN}"
@@ -30,10 +41,15 @@ src_install() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  /usr/share/${PN}/"
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild
index 733cb813894b..b8a43204c7c0 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild,v 1.3 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.2.0.ebuild,v 1.4 2011/03/25 21:25:47 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2"
 PYTHON_USE_WITH_OR="berkdb gdbm"
 PYTHON_USE_WITH_OPT="test"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit eutils distutils
 
@@ -19,16 +22,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bazaar git test"
 
-DEPEND="dev-lang/python
-	>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 	bazaar? ( >=dev-vcs/bzr-1.13 )
 	git? ( >=dev-vcs/git-1.5.4.4 )
 	dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
 src_prepare() {
 	epatch "${FILESDIR}/2.2.0-deprecated-modules.patch"
 	distutils_src_prepare
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -41,10 +46,15 @@ src_install() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python -W ignore run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" -W ignore run-tests.py
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  /usr/share/${PN}/"
 }
diff --git a/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild
index 2da1b1eaa806..58d77fd6b3ef 100644
--- a/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild,v 1.3 2010/06/22 18:43:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2svn/cvs2svn-2.3.0.ebuild,v 1.4 2011/03/25 21:25:47 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2"
 PYTHON_USE_WITH_OR="berkdb gdbm"
 PYTHON_USE_WITH_OPT="test"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit eutils distutils
+inherit distutils
 
 FILEVER="46528"
 
@@ -19,13 +22,19 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bazaar git test"
 
-DEPEND="dev-lang/python
-	>=dev-vcs/subversion-1.0.9"
+DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
 	bazaar? ( >=dev-vcs/bzr-1.13 )
 	git? ( >=dev-vcs/git-1.5.4.4 )
 	dev-vcs/rcs"
 
+PYTHON_MODNAME="cvs2svn_lib cvs2svn_rcsparse"
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
 src_compile() {
 	distutils_src_compile
 	emake man
@@ -41,10 +50,15 @@ src_install() {
 src_test() {
 	# Need this because subversion is localized, but the tests aren't
 	export LC_ALL=C
-	python -W ignore run-tests.py || die "tests failed"
+
+	testing() {
+		"$(PYTHON)" -W ignore run-tests.py
+	}
+	python_execute_function testing
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	elog "Additional scripts and examples have been installed to:"
 	elog "  /usr/share/${PN}/"
 }