Migrate to distutils-r1 and clean up.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 85 insertions, 10 deletions

diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog
index ff7b3f838e26..756440fff192 100644
--- a/dev-python/pytz/ChangeLog
+++ b/dev-python/pytz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pytz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.130 2012/11/03 00:58:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.131 2012/12/19 18:32:31 mgorny Exp $
+
+*pytz-2012h-r1 (19 Dec 2012)
+
+  19 Dec 2012; Michał Górny <mgorny@gentoo.org>
+  +files/pytz-2009h-zoneinfo-noinstall.patch, +pytz-2012h-r1.ebuild:
+  Migrate to distutils-r1 and clean up.
 
 *pytz-2012h (03 Nov 2012)
 
@@ -481,4 +487,3 @@
   24 Nov 2005; Marien Zwart <marienz@gentoo.org> +metadata.xml,
   +pytz-2005m.ebuild:
   New ebuild, based on an ebuild from André Malo <nd@perlig.de> (bug #111513)
-
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 988e1506f790..47513655c0dc 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pytz-2009h-zoneinfo-noinstall.patch 957 SHA256 4f25eeb077fa14f8423b6742de8276b5153f75d97b0f979556cf634a56e4946a SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446 WHIRLPOOL c1a1861f88ee5be2851e4e8a12f1df0c6beac05af1888527d1120ee9a67c3155b4ad5e0d9d3436e46cc6f027f079cf66135422f9576a333801e7597983cfc575
 AUX pytz-2009j-zoneinfo.patch 651 SHA256 5d015c0857cfab9916bb2d3e7de00d12fee5721d5d3556eb5ad049cc350cfd60 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038 WHIRLPOOL c5a4565934dae7fd7b9501ff84c72e0707a52bb73c45f8d525da5477995ed226c693c1962b8219aaf964bd69c84df573d520049d8049013b17c694e1a2cece1c
 DIST pytz-2011e.tar.bz2 178708 SHA256 91edff39fdd2d37a039fe989dad7b91e84e8b976294bf3e13ba5bc313784f9d0 SHA512 11e223be6feacdba5040b8092570ed5cc86d13403438ae3f194fb6242e66805c1cb058901cba3bb62e53b4a0356cad9571cee0c35e01115b137cd1085be2e4bb WHIRLPOOL 32aa5586773ca585332b4d147c7c8d85e1cd46ef6ae36249bec7e17dd121ca03c98472b5038bc5e266bbe9271a116d32d70725f60669d14580ee1fb0ad7590fc
 DIST pytz-2012c.tar.bz2 166864 SHA256 16060ed95f992e3629ce98a5dca5c32c732377ce792f9764f407be7100a9deb1 SHA512 8d142b811c5781e48a66efecb400b9b89fa6e321bc8f4303a29f5b8b3e53b0b5ea54ceb4d639ca612ff0ecd0d44f83010d9988f88aceea8c5805b72252861554 WHIRLPOOL bf1156576e19cd37c7e0336875e5f4003fe1e0e41b0d8f4a6dbd03bb678a34e2ce6260177c4300d6b4ce9bdb186d99dbcc546d90b61117ce91e2e71ae1c0ad0b
@@ -13,17 +14,16 @@ EBUILD pytz-2012c.ebuild 1181 SHA256 6b30023c98ef88739685117d8d14054248d4a3dd1c8
 EBUILD pytz-2012d.ebuild 1194 SHA256 f391ed6708ab2f00e88c2761fb6a68649434d1728c4b8f7eb60915cbba0f4571 SHA512 b4b675f545dd330b5a47a926b5804877800719d7a9c0b9ff8706764a2e6dc8a361c19acf61c660ffec55ce35c2db04a5dbaadf58eb3a49054d5fd1e3eb6a26ab WHIRLPOOL 4a125f3e3b412e76a2a9bf9ed88a5521305b58d12730781ba3612056c1fd255b652af4f42e5ab3add8a29a5e6629727a00bcf2605ebf461c77406a2cd14adb31
 EBUILD pytz-2012f.ebuild 1194 SHA256 432583f8bcf268d1f27fb355831a799fd1d3b292c164a2ec75ff0a0c94912ce4 SHA512 e65572351e99ffe79070f926481f6ba9643abbb3f9f25e6adb15ba49913677d368ddfcb22e96beb221884b19ee08a936f7e8ba42dd36502aacc07f77eb45e36b WHIRLPOOL 01b9d6a535261f991d61cc2bec34124e01d1b1fc0971de109a5cc396e24f67d020d1fa03ebcb37c3aff3c657a26e7efb1256aa278f5881c372531706678f5787
 EBUILD pytz-2012g.ebuild 1194 SHA256 a01fc581149f0b3fa8255287548952a128b95ce529e4dbfd6b1a838dcfe22b0d SHA512 33eeead0d67f6d20b06b54c1b20791973b94da6ed4162b936a0d1e05f234a578f1eb07f88bab080cba96a5aeab0cc9a1459df9e401c3a7feb375f8954b0cf3b2 WHIRLPOOL 5ed33e844914d7d7bde74b7169e0e3f9225087beb887243cb73524343b8bb7c749f8c045e42190c6c6bbde2f5b988b420cdc9c5008f4fd9242f2692452853c19
+EBUILD pytz-2012h-r1.ebuild 1106 SHA256 54d79a0789e6a82aa50006732eaff87c765159185591a1d1816fb8820b7995ea SHA512 1c67f55d7298baea813e3d468d4700c06e4e6ec692457fdc618ae6c4b33ce4fe33ca97eb1018d2069bb6ff01e7207caab5fc0e795e130630a3183b9118e0f9ad WHIRLPOOL 256bae30ffb03f6f71664f6a8d883ee5d8dd8e0a54ea9528c3f0795035c45b2a82a1fbfdb10b6cc1859f42c9b1efc7e98cf7f531718265900c94b28902fdd4af
 EBUILD pytz-2012h.ebuild 1194 SHA256 5df63d2bb65e65fd18d2e8663e618a23ecaafb62b9ae413b6becc80b8f3fbc38 SHA512 945302706921204966e608757df272cb14ef579725b03accc58df8596142bbfa756ad40b5ae6dd8eeaa4b2221fbb428f93917328a740c93103f14c1085c38346 WHIRLPOOL 152295351660794d9d1bec76cfb25f3fa11c98a067749d7d8998e6b83a6b689f7400a68d8607f8bd630e16bbc49400f44213aec048635e02db64e63006e0fd83
-MISC ChangeLog 14998 SHA256 dc8d78ea27b64b652d4d1bbc22a919e32cc7f67c7fb39413018071992a0a0507 SHA512 2ad4b6c58ec6ab504f76c76abf11525534c3e673156be48e397ad467755f153db92d26d828f750f840945d3557c80aaa24f9d37c1f8390a4e13aa7b90ef3042b WHIRLPOOL 1f091b44462526ddaeabba3e4e3d0d0c59c9966e97cc83d9c0b4b18429fd2f2a48d789f8cf76ce8d7383e4f5ad74249f484da56c667e3f8bd82cd1a206fa0721
+MISC ChangeLog 15184 SHA256 e52e4748f67ea9bfaaec967127ee40219eae73f61dc3a46a6317f6d2d12691cd SHA512 4ed0ec2753fdd404dd0e735faaa74262096da4a04518a2faacbb53ef96cf8f4efae0bca8e1d0f42edb77e18101b7873cc81d62079ece7cba053a619ce1906040 WHIRLPOOL acafbe32a2d4664e6d7f7376594f1cd4bb8f6bf989f4f7ac5771bce77d3089a1036d797588c95dc71bd05879cf53b7f7097b377ad06102bfef6fa3cc2b450658
 MISC metadata.xml 644 SHA256 7bf019d6462264cdc14a7c5cb19743e5d6481578f425399068578e6ecd61a931 SHA512 de7744a23a4c213b18c09d43b05387a6f4accac8fd28d2bb283e8d374bd26c8069697067869ce4997621815c319da650f82808c7cd77411855ab0f22a264fadd WHIRLPOOL ff73840c348cf6d40b031523119cb9ffcdbe9c6697101899a50144e203da46d5b008cf6da2be9c7bc00e5ce843be09530201a6ca9ddef753b6ad3ea8e781e910
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQlGw1AAoJEEqz6FtPBkyjpu0H/iPckE1opQdEsMB6hKZ7upmz
-gdfzFLXzNLjTpxdiIrLXZrHr24xTSbkV3ap6xBnDD5Lqe51pNsPFDF8XlMVUhRIb
-3f+2KFgNFmHJMU2S6GYLS/WW8bPfRkb5drLlAFw4kQEB69LLtazqztAWCrX9v3pi
-TnFACBMU5nKHw1x/fOhIQeSTfRLxAzaEPUHlbffCfDyUGruUcEH96AdPZmhLCvz9
-uFm56PEZJEIJ8CTG0k2n9AsLZhzXAnrnjY9frAW4ao/UwxMH1xSzf8NUiz/8b/OA
-jQ3GEvZ1DmTUik00BsOvaMFfToJtso97mvwrgCZZH64OO4zDMtoP/TF+edL9df8=
-=h9J1
+iJwEAQEIAAYFAlDSCEkACgkQfXuS5UK5QB3X+gP/TTXxUjLCcOkwWBesBSYI0f0U
+iOmu8pZ49Z21+NlNax23dj6CrTwsOWn68tdJ2vIUYJ1nJibhCT6KF+4M22F31Bky
+Z0OwQSulo+AUYfqsHiRVkdgvzIck9SyMIJ1+0fE3EDV/d6d9wtGMABrYKE9mEdHo
+YXDmyPhBZWOndDCzeoU=
+=bdMt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
new file mode 100644
index 000000000000..2e9709579883
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
@@ -0,0 +1,32 @@
+From e43745593e4627de8027587cb3b4a465c93fa0b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Dec 2012 19:22:29 +0100
+Subject: [PATCH] Do not install zoneinfo files.
+
+---
+ setup.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c8152d5..8f13279 100644
+--- a/setup.py
++++ b/setup.py
+@@ -13,15 +13,8 @@ me = 'Stuart Bishop'
+ memail = 'stuart@stuartbishop.net'
+ packages = ['pytz']
+ resources = ['zone.tab', 'locales/pytz.pot']
+-for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
+-    # remove the 'pytz' part of the path
+-    basepath = dirpath.split(os.path.sep, 1)[1]
+-    resources.extend([os.path.join(basepath, filename)
+-                     for filename in filenames])
+ package_data = {'pytz': resources}
+ 
+-assert len(resources) > 10, 'zoneinfo files not found!'
+-
+ setup (
+     name='pytz',
+     version=pytz.VERSION,
+-- 
+1.8.0.2
+
diff --git a/dev-python/pytz/pytz-2012h-r1.ebuild b/dev-python/pytz/pytz-2012h-r1.ebuild
new file mode 100644
index 000000000000..b990f091732b
--- /dev/null
+++ b/dev-python/pytz/pytz-2012h-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012h-r1.ebuild,v 1.1 2012/12/19 18:32:31 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pypi.python.org/pypi/pytz http://pytz.sourceforge.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/timezone-data-${PV}"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES.txt )
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}/${PN}-2009j-zoneinfo.patch"
+	# ...and do not install a copy of it.
+	"${FILESDIR}/${PN}-2009h-zoneinfo-noinstall.patch"
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py
+}
+
+python_install() {
+	distutils-r1_python_install
+}