Version bump. Use timezone from sys-libs/timezone-data now

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 81 insertions, 3 deletions

diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog
index 3e1e1da4afd1..29dfa37218ff 100644
--- a/dev-python/pytz/ChangeLog
+++ b/dev-python/pytz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pytz
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.15 2008/07/25 19:08:47 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.16 2009/01/14 16:54:04 bicatali Exp $
+
+*pytz-2008i (14 Jan 2009)
+
+  14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pytz-2008i-zoneinfo.patch, +pytz-2008i.ebuild:
+  Version bump. Use timezone from sys-libs/timezone-data now
 
   25 Jul 2008; Friedrich Oslage <bluebird@gentoo.org> pytz-2008a.ebuild:
   Add ~sparc keyword, bug #232008
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index bf2b09e7c3e4..61acb0fc0cfe 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pytz-2008i-zoneinfo.patch 981 RMD160 436f2b7ce0a3d9c4229eba1559145f7394b22a82 SHA1 a8a98ebd151b3cb9c44df124463b10f4d03b7a09 SHA256 53d7a12d4be7f7fbbd9dac74cad4833247161e7e70ad4f79855154c693095b19
 DIST pytz-2005m.tar.bz2 108528 RMD160 8be07f9e3ad727c1da88a13ade23f213b0e3e937 SHA1 0aaf17b4d0b3f348456d16ee9d71f0f6362a0513 SHA256 2ea1011c94d6e23f2ed47cbd794474bdb60bf663e39b1aa90172ddc7baec808f
 DIST pytz-2007f.tar.bz2 160649 RMD160 3d1139dfe3f7858994e4c6f3fdb2c657c5546f23 SHA1 19d1461c174c2b6599b23af03fbc6b0d7229f3c9 SHA256 7856c314b47b306cea691e3d527405db429b29f2a2c5a3253ef2a48d982be59d
 DIST pytz-2008a.tar.bz2 162798 RMD160 3e92d532d5cba2e46cc278d803a3d4424d47ef38 SHA1 06174dfdfb234836a12711b0defdfd0e6a518905 SHA256 fbacf8b636c503430be88c1df54e5ec69339d574f969cf4d5f927823c661d553
+DIST pytz-2008i.tar.bz2 164460 RMD160 0d2cbd99b670026f26d0a05e3060db64fe70955a SHA1 8cdec1446cfa38cbe3da1990bb12f23d9249f9cc SHA256 e91ca1ff0f6b18035d819e3deacb64406ab0697b95c794ae234d175988b4918e
 EBUILD pytz-2005m.ebuild 618 RMD160 37a0bcdc9c95754b2fd95c6da3b940768b2b9e5d SHA1 44077089e7bd0a331e1f4ec043853d074c67e7bb SHA256 598fc65b539a7c2b3be3e1838b5b70696c98546e9c0a835049536fb163adcf95
 EBUILD pytz-2007f.ebuild 652 RMD160 a2ece1fa2c5078109697c9c63423f441a6530195 SHA1 a3474c944e5a49d916fd22a8d95f8c8a0ca2295b SHA256 50e4eea2c0e1e4cd74a3ef294e566ed2480c5526ecc3fdbf3832a5198dd61c71
 EBUILD pytz-2008a.ebuild 659 RMD160 46da315206fab79934c3ec9452eed3e0b11f3a44 SHA1 b1f8be7a6b5b1df51a399be916f1c7e592b5486f SHA256 412ca79ae1b7040bf129401588adb9945ca09044ca1b73e754abda6facd5980f
-MISC ChangeLog 1844 RMD160 0a2e7c52e2791ecbb88fca15abaf13a50d8a8588 SHA1 c1d58abaad82048569406560589789dfdb824edc SHA256 276bbe14401151522ba252d0ce964c377f02706347ce4c82b129da2e37bed134
+EBUILD pytz-2008i.ebuild 866 RMD160 40bbb754bb14d684a2b92481da4480f68aa1b166 SHA1 085b9094bc3761e58259ce11e5514c073c8cec9b SHA256 2dfc01834e730b3bd196ae78f6925ddd872cda8f0820a05a3d31e23142327cf1
+MISC ChangeLog 2044 RMD160 368a6ca3e2b3fc5599fc52a2edfdba507fdd78b3 SHA1 b02beb8df08c053c5ba693739f7ac07f172f196c SHA256 9ba08e3e57d5c840a5d1cb9c74974f12e4c45a84961f86b2f52d52f1201857c2
 MISC metadata.xml 583 RMD160 809658784b3765fb3546f30a528be6223c7c7c73 SHA1 0265f1fd2ddf4578853c012d1931a88f946a1dd3 SHA256 ea80947b9cd5bdc4e28d2ce0695f209a2b2dede1acfbdbfdb7eb2bd82645957d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkluGLYACgkQ1ycZbhPLE2AjWwCeOmS0PtRE+7DXB8WKFILfW7Rb
+E2oAoI7oTKTj/N7swaUwIrioMJFIuct+
+=JFEl
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pytz/files/pytz-2008i-zoneinfo.patch b/dev-python/pytz/files/pytz-2008i-zoneinfo.patch
new file mode 100644
index 000000000000..07f51b149365
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2008i-zoneinfo.patch
@@ -0,0 +1,25 @@
+--- 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
new file mode 100644
index 000000000000..bb3551d41af6
--- /dev/null
+++ b/dev-python/pytz/pytz-2008i.ebuild
@@ -0,0 +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-2008i.ebuild,v 1.1 2009/01/14 16:54:04 bicatali 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="~amd64 ~ia64 ~ppc ~ppc64 ~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
+}