Set SUPPORT_PYTHON_ABIS. Delete "test" USE flag.

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

3 files changed, 29 insertions, 26 deletions

diff --git a/dev-python/pastescript/ChangeLog b/dev-python/pastescript/ChangeLog
index 3cf74a81b413..a83d44058eee 100644
--- a/dev-python/pastescript/ChangeLog
+++ b/dev-python/pastescript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pastescript
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.6 2009/04/26 09:53:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.7 2009/10/01 02:33:40 arfrever Exp $
+
+  01 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pastescript-1.7.3.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Delete "test" USE flag.
 
 *pastescript-1.7.3 (26 Apr 2009)
 
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index b9659ee20005..fac3d2da61f3 100644
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,6 +1,6 @@
 DIST PasteScript-1.6.2.tar.gz 116880 RMD160 547df2de1641069cc690181e5142310cd5c73f80 SHA1 239a3b2075ec81f33805c237d6c4c29ae71b3692 SHA256 3147f29f683c868db29958971a48443da6593c1df24ffa5579974f1542a1574c
 DIST PasteScript-1.7.3.tar.gz 127667 RMD160 e8e89b9e7c69231156f4208ea7cfefc92c6b22ab SHA1 32c007a1d0b0916c30d02dae188bb0fcd04d0326 SHA256 a695b38001721a8a8a128b8566aa15566cb526d13015caa12a32384902179a16
 EBUILD pastescript-1.6.2.ebuild 1568 RMD160 5d9fee023b3c1f23401b45b4c2148bc4556837a3 SHA1 dcd6a94902c694b9c81df82f540d845d8b5b2ca1 SHA256 f66eb2af76b4e8149eba7bca122004f1286ff39dc0d96d5d0ea0197731a7ff14
-EBUILD pastescript-1.7.3.ebuild 1568 RMD160 1ceb34e65d9e2c7fec4cb0c257e79412cef8a84c SHA1 4ff2b2dc94daba8d3678ed8975390db43174f07d SHA256 528cecb11ee5c441b11145c759881823cd19f5bfee255871d192bfe5d05d73e3
-MISC ChangeLog 1179 RMD160 28ebb796fece1b81f3944c8e8569b09dbd56c87e SHA1 82d646d55e1e43d6043a9661b93efa9b9175824c SHA256 346127b00f84f73b89ed9401225208b9a4f03240c1a61a9d7d0b0d5ff844c7e9
+EBUILD pastescript-1.7.3.ebuild 1349 RMD160 c6dc30fe0570240d5bf0c696d5b047ec8a568a45 SHA1 d457a38bd86439e5a94b36935d92f5a922707d0b SHA256 41bdebb9cbce26d54a516cae7fe5abd058aab6f072d6b67a31d66bcd9df497aa
+MISC ChangeLog 1333 RMD160 9274e840cc761befb65e084f6573ec8c1b76a99b SHA1 e228aeaef93f4134ceb82df0905b5b174cd8e16d SHA256 cb1cc73b5b1bb22a57bfbcf85c6b0aa948addfd326b45602a7d0eb723acfd768
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/pastescript/pastescript-1.7.3.ebuild b/dev-python/pastescript/pastescript-1.7.3.ebuild
index 6c1fe7bb7bb4..22181116d221 100644
--- a/dev-python/pastescript/pastescript-1.7.3.ebuild
+++ b/dev-python/pastescript/pastescript-1.7.3.ebuild
@@ -1,57 +1,56 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.1 2009/04/26 09:53:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.2 2009/10/01 02:33:40 arfrever Exp $
 
-NEED_PYTHON=2.4
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=PasteScript
-MY_P=${MY_PN}-${PV}
+MY_PN="PasteScript"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
 HOMEPAGE="http://pythonpaste.org/script/"
 SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc test"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+#IUSE="doc test"
 
 RDEPEND="dev-python/paste
 	dev-python/pastedeploy
 	dev-python/cheetah"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )
-	test? ( dev-python/nose )"
+	doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )"
+#	test? ( dev-python/nose )
+RESTRICT_PYTHON_ABIS="3.*"
 
-# The tests are currently broken, needs further investigation
-RESTRICT=test
+# Tests are broken.
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 PYTHON_MODNAME="paste/script"
 
 src_compile() {
 	distutils_src_compile
-	if use doc ; then
+	if use doc; then
 		einfo "Generating docs as requested..."
 		PYTHONPATH=. "${python}" setup.py pudge || die "generating docs failed"
 	fi
 }
 
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests-${PYTHON_ABI}
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install
 	use doc && dohtml -r docs/html/*
 }
-
-src_test() {
-	# Tests can't import paste from site-packages
-	# so we copy them over.
-	# The files that will be installed are already copied to build/lib
-	# so this shouldn't generate any collisions.
-	distutils_python_version
-	cp -pPR /usr/$(get_libdir)/python${PYVER}/site-packages/paste/* paste/
-
-	PYTHONPATH=. "${python}" setup.py nosetests || die "tests failed"
-}