Version bump. Set SUPPORT_PYTHON_ABIS.

(Portage version: 14170-svn/cvs/Linux x86_64)

5 files changed, 22 insertions, 104 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/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() {