Version bump. Set SUPPORT_PYTHON_ABIS.

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

6 files changed, 25 insertions, 112 deletions

diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog
index a375425fe825..902cd789f166 100644
--- a/dev-python/pytz/ChangeLog
+++ b/dev-python/pytz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pytz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.39 2009/08/09 13:43:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.40 2009/08/29 19:27:57 arfrever Exp $
+
+*pytz-2009l (29 Aug 2009)
+
+  29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pytz-2008i.ebuild, -files/pytz-2008i-zoneinfo.patch, -pytz-2009a.ebuild,
+  -pytz-2009g.ebuild, +pytz-2009l.ebuild:
+  Version bump. Set SUPPORT_PYTHON_ABIS.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> pytz-2009j.ebuild:
   ppc stable #278583
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 0db058d3ca90..c52b6e8476e8 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,12 +1,7 @@
-AUX pytz-2008i-zoneinfo.patch 981 RMD160 436f2b7ce0a3d9c4229eba1559145f7394b22a82 SHA1 a8a98ebd151b3cb9c44df124463b10f4d03b7a09 SHA256 53d7a12d4be7f7fbbd9dac74cad4833247161e7e70ad4f79855154c693095b19
 AUX pytz-2009j-zoneinfo.patch 651 RMD160 da9007028cebad9f951944c5fab52a15efb14b86 SHA1 b5c20b3687cfaf545595c915f4e4241385c664e0 SHA256 5d015c0857cfab9916bb2d3e7de00d12fee5721d5d3556eb5ad049cc350cfd60
-DIST pytz-2008i.tar.bz2 164460 RMD160 0d2cbd99b670026f26d0a05e3060db64fe70955a SHA1 8cdec1446cfa38cbe3da1990bb12f23d9249f9cc SHA256 e91ca1ff0f6b18035d819e3deacb64406ab0697b95c794ae234d175988b4918e
-DIST pytz-2009a.tar.bz2 168385 RMD160 40cb44c078a65c27c7de61e7e87b206fcc7906c9 SHA1 ce5cfd92da36b8598855035b558d0cca2336d6c5 SHA256 ea43a52cc55337c411947d488c200d7df5a36d803f67d8f7f9d14cb0f0874d13
-DIST pytz-2009g.tar.bz2 168184 RMD160 f38e044a3eb1ea1a023380ecfef2a9cd041b58d3 SHA1 9614d5686f7258075a61607d0216ccf985ab4e09 SHA256 11a43c091c01c8708bf36e88228ccf773ae8a0713c59f3745dd175a656511f97
 DIST pytz-2009j.tar.bz2 174868 RMD160 71ecabe353abef81acf0b5b3d864a947198a1c4f SHA1 55ea04f67e09dee70d0075fc040fb7a099ab9f88 SHA256 2aefcd1360891f2c496dd23f2e67d92798f18cf2c1b5c6cdbfdec52294859338
-EBUILD pytz-2008i.ebuild 881 RMD160 0f0669e5062f1b723f505fc74716596871487f94 SHA1 64cf04633c6b9a66280e497c4f70ac3ae0ecced2 SHA256 29cf8d59cd628b50f7aeef415b5a2773e4b9ee6e69f508c9396efd4267fc1026
-EBUILD pytz-2009a.ebuild 921 RMD160 1a1dcf6353d21484811f571b47e0762d51e3b0f3 SHA1 9fe1004e53c54b6f6fe23c802116fd7c70eadd1f SHA256 13aa3e87af7f8026ddae301373cdc9d4dec28cb9dc1266995b2fe53277c3bcaf
-EBUILD pytz-2009g.ebuild 910 RMD160 e6428766ab8387d7250a0c54bdca4c5f4bf08644 SHA1 a74f3850a643c895ceebaa53fc68f3fadbd67fb5 SHA256 33044e8e266552befe445b452ce770d28a1e7cb5b1c7ea0b4a8620e02f12a125
+DIST pytz-2009l.tar.bz2 174542 RMD160 08f4348bf040d3e0b77c8fe56f5388b286a7fe48 SHA1 8f1f8413165f85beb40e5881e11341eed4776319 SHA256 ead5a962cb873c8a76d8a872ee094ef54547e61baa28303091b90355073fc379
 EBUILD pytz-2009j.ebuild 926 RMD160 def5a61ff2f85443eda14cf6320cf634baa72bd6 SHA1 243afb1f3843d02f450d85a6dc34939b657d955c SHA256 6746b164ab7a9738ea09101270f8759010849380d85d97321beddb5a35375816
-MISC ChangeLog 4528 RMD160 bdad76ab9d0425205f9a40ee7dc0079977806a9b SHA1 19f909ce2c5e0412a50e65160dc3b74f7f7e3191 SHA256 96283fb33c00b08b7dd9ffb5f17c83b2669a3b4aab5c5823cf1fad02cf3b6723
+EBUILD pytz-2009l.ebuild 1047 RMD160 28b3dab53aa04bddfb5369e6fa3ce4fadcd2c0b8 SHA1 a013fa706eebeb22f95ef6c9b6d52aa75ba20f88 SHA256 99cd4ea323837a4244d158158a0ab96c6d0fba0a358b8d5d2e3437cfac265f8f
+MISC ChangeLog 4790 RMD160 83b5a914d72d4082cf1443f4a6ce57aa7fec8bb1 SHA1 477ab20217531d8dda3718233d4a3d0049887212 SHA256 31b95f811011c9391fe34fadcd0773b7d20270f690bb4c8f9bd0b4eccdcfb3ce
 MISC metadata.xml 583 RMD160 809658784b3765fb3546f30a528be6223c7c7c73 SHA1 0265f1fd2ddf4578853c012d1931a88f946a1dd3 SHA256 ea80947b9cd5bdc4e28d2ce0695f209a2b2dede1acfbdbfdb7eb2bd82645957d
diff --git a/dev-python/pytz/files/pytz-2008i-zoneinfo.patch b/dev-python/pytz/files/pytz-2008i-zoneinfo.patch
deleted file mode 100644
index 07f51b149365..000000000000
--- a/dev-python/pytz/files/pytz-2008i-zoneinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- python-tz-2008i.orig/pytz/__init__.py
-+++ python-tz-2008i/pytz/__init__.py
-@@ -49,15 +49,11 @@
- 
-     Uses the pkg_resources module if available.
-     """
--    if resource_stream is not None:
--        return resource_stream(__name__, 'zoneinfo/' + name)
--    else:
--        name_parts = name.lstrip('/').split('/')
--        for part in name_parts:
--            if part == os.path.pardir or os.path.sep in part:
--                raise ValueError('Bad path segment: %r' % part)
--        filename = os.path.join(os.path.dirname(__file__),
--                                'zoneinfo', *name_parts)
--        return open(filename, 'rb')
--
-+    # use the system zoninfo from timezone-data
-+    name_parts = name.lstrip('/').split('/')
-+    for part in name_parts:
-+        if part == os.path.pardir or os.path.sep in part:
-+            raise ValueError('Bad path segment: %r' % part)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-+    return open(filename, 'rb')
- 
diff --git a/dev-python/pytz/pytz-2008i.ebuild b/dev-python/pytz/pytz-2008i.ebuild
deleted file mode 100644
index d9174c136b9d..000000000000
--- a/dev-python/pytz/pytz-2008i.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2008i.ebuild,v 1.8 2009/06/09 15:49:03 armin76 Exp $
-
-NEED_PYTHON=2.3
-EAPI=2
-inherit eutils distutils
-
-DESCRIPTION="World Timezone Definitions for Python"
-HOMEPAGE="http://pytz.sourceforge.net/"
-SRC_URI="http://cheeseshop.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/timezone-data-${PV}"
-
-DOCS="CHANGES.txt"
-
-src_prepare() {
-	# use timezone-data zoneinfo
-	epatch "${FILESDIR}"/${P}-zoneinfo.patch
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" pytz/tests/test_tzinfo.py || die "test failed"
-}
-
-src_install() {
-	distutils_src_install
-	rm -rf "${D}"/usr/lib*/python*/site-packages/pytz/zoneinfo
-}
diff --git a/dev-python/pytz/pytz-2009g.ebuild b/dev-python/pytz/pytz-2009g.ebuild
deleted file mode 100644
index 6a00ebb352ee..000000000000
--- a/dev-python/pytz/pytz-2009g.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2009g.ebuild,v 1.9 2009/07/17 18:09:39 nixnut Exp $
-
-NEED_PYTHON=2.3
-EAPI=2
-
-inherit eutils distutils
-
-DESCRIPTION="World Timezone Definitions for Python"
-HOMEPAGE="http://pytz.sourceforge.net/"
-SRC_URI="http://cheeseshop.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/timezone-data-${PV}"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGES.txt"
-
-src_prepare() {
-	# use timezone-data zoneinfo
-	epatch "${FILESDIR}"/${PN}-2008i-zoneinfo.patch
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" pytz/tests/test_tzinfo.py || die "test failed"
-}
-
-src_install() {
-	distutils_src_install
-	rm -rf "${D}"/usr/lib*/python*/site-packages/pytz/zoneinfo
-}
diff --git a/dev-python/pytz/pytz-2009a.ebuild b/dev-python/pytz/pytz-2009l.ebuild
index 302ab1c5f884..9b0956614695 100644
--- a/dev-python/pytz/pytz-2009a.ebuild
+++ b/dev-python/pytz/pytz-2009l.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2009a.ebuild,v 1.5 2009/06/09 15:49:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2009l.ebuild,v 1.1 2009/08/29 19:27:57 arfrever Exp $
+
+EAPI="2"
+
+NEED_PYTHON="2.3"
+SUPPORT_PYTHON_ABIS="1"
 
-NEED_PYTHON=2.3
-EAPI=2
 inherit eutils distutils
 
 DESCRIPTION="World Timezone Definitions for Python"
-HOMEPAGE="http://pytz.sourceforge.net/"
+HOMEPAGE="http://pypi.python.org/pypi/pytz/ http://pytz.sourceforge.net/"
 SRC_URI="http://cheeseshop.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=sys-libs/timezone-data-${PV}"
+RDEPEND="dev-python/setuptools
+	>=sys-libs/timezone-data-${PV}"
 DEPEND="${RDEPEND}"
 
+RESTRICT_PYTHON_ABIS="3*"
+
 DOCS="CHANGES.txt"
 
 src_prepare() {
-	# use timezone-data zoneinfo
-	epatch "${FILESDIR}"/${PN}-2008i-zoneinfo.patch
+	# Use timezone-data zoneinfo.
+	epatch "${FILESDIR}/${PN}-2009j-zoneinfo.patch"
 }
 
 src_test() {