gentoo resync : 30.05.2020

5 files changed, 2 insertions, 64 deletions

diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 17784952810b..832ad0419b53 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,10 +1,7 @@
-AUX 2016.6.1-zoneinfo.patch 569 BLAKE2B a4cb4ae2bd6953f8f315bb0c444bd083d3431d85128fb9d0ab3c97ad3679114a5f0ce13afcde65070d8bad0fc586b893260b30ccfe793bba6be26f85e9e08b22 SHA512 d1b2bf717c8099eb5cfbe353d50eb034ed321303f6430c0f4183dd84a64780157615b29b7aaf7c04eb8fe69e48c039e479f22f70f713b2aa5e907ae371c8ba01
 AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
-AUX pytz-2009h-zoneinfo-noinstall.patch 957 BLAKE2B aec135326ab00e0287fc1c57ca745bc113ab8f0564d7328e82ed00cb024ad8a5008dcac4a7f580967672e996e861bc994fd307de7aee7e55f5e8623fe64844c5 SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446
-AUX pytz-2009j-zoneinfo.patch 651 BLAKE2B 9e0f5d4f037691ee02809ae46887d6f4f5a390e95f670d604a6525b9b68ba4b1743ed34a8c0c05b70f436e2023bc0c9326a6a9fa46ac3ce87eb9438adcdb60b2 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
 DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
 DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
 EBUILD pytz-2019.3.ebuild 998 BLAKE2B 2071e46018cffaea4fc2664b357e17ea49ad12b2f53cd63a6018be3a2fbe2bd32f9e8a159c417873bc665a3d0ce87b2e59bad2fda20ece4346c4e819a869670e SHA512 07a167855fd0791f67d1e364cf6596d1d9e9234f1b43d19ae1eb9fe2e58e1c62da0a0082d8c6a320a438d547e0676367a980e2e65574a919b58e62c495422a86
-EBUILD pytz-2020.1.ebuild 1007 BLAKE2B bcfe8b0478908624672dbcec92cc185c59b48a2cbd73f85d7909c2cca3ab75153628f3e833051a35ad6fd34f85fa0b017d5f0a3358b567b3a14c233f1eaeb179 SHA512 7f3dde466251e35230abae2c4b076a4f6afed116b5cefb5c0165c6888caf71ee3996ead73f23074a495002ab86b24e10ee73e954c1c8265dc3dd3b80413769c4
+EBUILD pytz-2020.1.ebuild 968 BLAKE2B 6114281f06cadf21ec2b1ec3b2aa57a4d62bafb6b7485d9938ee9597c24752fff87217c8c1ac62e6aacec111eb9709a57a89aba514596a7b36d237d37c912487 SHA512 e15faa300d483e9b783ca7db9f455eb97e6b358b861a5cbdf86733b9156af1a2b47290504add8403fd7093ecf28f7d307bdb769b3cda6c06a9e74e996865aae7
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/files/2016.6.1-zoneinfo.patch b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
deleted file mode 100644
index d8223da436cf..000000000000
--- a/dev-python/pytz/files/2016.6.1-zoneinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -81,8 +81,7 @@
-     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)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     if not os.path.exists(filename):
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
deleted file mode 100644
index 2e9709579883..000000000000
--- a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/files/pytz-2009j-zoneinfo.patch b/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
deleted file mode 100644
index ee05d9f5efa4..000000000000
--- a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use the system zoneinfo from sys-libs/timezone-data.
-
---- pytz/__init__.py
-+++ pytz/__init__.py
-@@ -54,8 +54,7 @@
-     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)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     if not os.path.exists(filename) and resource_stream is not None:
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index af515aa6eefa..1c553363fab1 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -18,7 +18,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
 DEPEND="${RDEPEND}
 	app-arch/unzip"