Set SUPPORT_PYTHON_ABIS.

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

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 1727a33ffa11d9c161223358ec959b1ec66fdb3f..bcdfea5b1f9cbc45ec4584e18a3138a56c75833c 100644 (file)
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/cherrypy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.38 2009/11/26 17:25:22 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.39 2010/04/02 18:49:55 arfrever Exp $
+
+  02 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cherrypy-2.3.0.ebuild, cherrypy-3.1.2.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   26 Nov 2009; Raúl Porcel <armin76@gentoo.org> cherrypy-3.1.2.ebuild:
   ia64 stable wrt #294109

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 51829294712ff8ae1d0a8d75e9f18c05eb482315..8801465378d0c6f7427af510229d0be2ca6d052a 100644 (file)
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,6 +1,6 @@
 DIST CherryPy-2.3.0.tar.gz 241999 RMD160 4c95735b17d58c431f1dbf685500d2a1ca8e38d8 SHA1 067121c5f31442519ac07138ffe8af6f7c7465d2 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf
 DIST CherryPy-3.1.2.tar.gz 319196 RMD160 43a34bc7454da21b597c60124ff0fc61b8dc3e31 SHA1 a94aedfd0e675858dbcc32dd250c23d285ee9b88 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
-EBUILD cherrypy-2.3.0.ebuild 1211 RMD160 d8957e58708486fffd4e22d9a61ec2f9d09eeeef SHA1 c17ab1ca60eaddbc642e9ebcfaf5efc0c9e8022a SHA256 64d47afda4b7f1d2df728eb6369cb722650c500781965841aef6adaa9f65b332
-EBUILD cherrypy-3.1.2.ebuild 1010 RMD160 3485263778376d766447efc975b6cc9ae590c8a4 SHA1 b5bc2fb9c717f23c60525147c089e9d92d3ed54d SHA256 345d7acf26f98b4d284270ecb3e1e2b8ce0c9b8ca2158f9f154b56b8e991e42c
-MISC ChangeLog 6572 RMD160 c3c506ab93d0cfa68d96c0ae0e9663b15219129a SHA1 d92f5728f754d43a580a707325d446daf09df6ea SHA256 cd62c482211a160d12500971be32c9c6d277a309f321a52a3f1b92446b1a914a
+EBUILD cherrypy-2.3.0.ebuild 1361 RMD160 f976e6bb9aab70b433d2588aa2f7bbd2831cc079 SHA1 43a0efee3af44ce96b4d3420cb951c3c5bd02a33 SHA256 107bde8c7da0c67e992b59fcd1055e889b23ca97a3cf794fb93deb72693a1776
+EBUILD cherrypy-3.1.2.ebuild 1118 RMD160 ebba79b2b900970f1e3a34cadc02907d369ff37f SHA1 ebd43148290153c4e1f46a91c79cf29348ebb25b SHA256 c23675100b2385d4cd4f7835ef3b610f8a26ea81ad32cc37ca0e71fed8a06ea0
+MISC ChangeLog 6722 RMD160 7050026f633bf154cb4c2d9da909e55b65bacaec SHA1 72740037966acc41d3dbebb927217e79fdb4826f SHA256 bf646b0db8f036fd3a629db91c10d3ac0e2967f9048edb5fe0ac3ddd9afead66
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a

diff --git a/dev-python/cherrypy/cherrypy-2.3.0.ebuild b/dev-python/cherrypy/cherrypy-2.3.0.ebuild
index 695d96fe7cc65020ffea55f0a721607ed129147c..d61e2448153acaed407ef8019382d93fc82aca73 100644 (file)
--- a/dev-python/cherrypy/cherrypy-2.3.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-2.3.0.ebuild
@@ -1,35 +1,39 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v 1.2 2009/02/15 14:31:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v 1.3 2010/04/02 18:49:55 arfrever Exp $
 
-inherit eutils distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
 
-MY_P=CherryPy-${PV}
+inherit distutils eutils
+
+MY_P="CherryPy-${PV}"
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-IUSE="doc test"
+HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
+SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
+IUSE="doc test"
 
 DEPEND="dev-python/setuptools
        test? ( >=dev-python/webtest-1.0 )
        app-arch/unzip"
 RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       #Remove test_cache_filter, only works outside of portage
+src_prepare() {
+       # Remove test_cache_filter, only works outside of portage
        sed -i \
                -e '/raw_input/d' \
                -e "/'test_cache_filter',/d" \
                cherrypy/test/test.py || die "sed failed"
+
        sed -i \
                -e 's/"cherrypy.tutorial",//' \
                -e "/('cherrypy\/tutorial',/, /),/d" \
@@ -37,14 +41,18 @@ src_unpack() {
                setup.py || die "sed failed"
 }
 
+src_test() {
+       testing() {
+               PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" cherrypy/test/test.py
+       }
+       python_execute_function testing
+}
+
 src_install() {
        distutils_src_install
-       if use doc ; then
+
+       if use doc; then
                insinto /usr/share/doc/${PF}
                doins -r cherrypy/tutorial
        fi
 }
-
-src_test() {
-       PYTHONPATH=. "${python}" cherrypy/test/test.py || die "test failed"
-}

diff --git a/dev-python/cherrypy/cherrypy-3.1.2.ebuild b/dev-python/cherrypy/cherrypy-3.1.2.ebuild
index ef8966a9534909c01a1111c108303d99a590b615..c3d821b50b764c5a0ee3c75bec25495e6545ada7 100644 (file)
--- a/dev-python/cherrypy/cherrypy-3.1.2.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.1.2.ebuild
@@ -1,44 +1,49 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild,v 1.6 2009/11/26 17:25:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.1.2.ebuild,v 1.7 2010/04/02 18:49:55 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
-MY_P=CherryPy-${PV}
+MY_P="CherryPy-${PV}"
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
 HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
 SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
 
-IUSE="doc"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="BSD"
+IUSE="doc"
 
 DEPEND=""
 RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        sed -i \
                -e 's/"cherrypy.tutorial",//' \
                -e "/('cherrypy\/tutorial',/, /),/d" \
                setup.py || die "sed failed"
+}
 
+src_test() {
+       testing() {
+               PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" cherrypy/test/test.py --dumb
+       }
+       python_execute_function testing
 }
 
 src_install() {
        distutils_src_install
-       if use doc ; then
-               insinto "/usr/share/doc/${PF}"
+
+       if use doc; then
+               insinto /usr/share/doc/${PF}
                doins -r cherrypy/tutorial
        fi
 }
-
-src_test() {
-       PYTHONPATH=. "${python}" cherrypy/test/test.py --dumb || die "test failed"
-}