summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron W. Swenson <titanofold@gentoo.org>2018-05-18 06:07:58 -0400
committerAaron W. Swenson <titanofold@gentoo.org>2018-05-18 06:07:58 -0400
commit17d68571f1b02cd1bf6f3cfbaf1c466c04a1d68c (patch)
tree11ee9dacea5a92ac07c1613823df5e6c13fa038d /dev-python/pytz/files
parentdev-python/pyrsistent: Bump to 0.14.2 (diff)
downloadgentoo-17d68571f1b02cd1bf6f3cfbaf1c466c04a1d68c.tar.gz
gentoo-17d68571f1b02cd1bf6f3cfbaf1c466c04a1d68c.tar.bz2
gentoo-17d68571f1b02cd1bf6f3cfbaf1c466c04a1d68c.zip
dev-python/pytz: Bump to 2018.4
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-python/pytz/files')
-rw-r--r--dev-python/pytz/files/2018.4-zoneinfo.patch12
-rw-r--r--dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch18
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-python/pytz/files/2018.4-zoneinfo.patch b/dev-python/pytz/files/2018.4-zoneinfo.patch
new file mode 100644
index 000000000000..2eeeab416d7f
--- /dev/null
+++ b/dev-python/pytz/files/2018.4-zoneinfo.patch
@@ -0,0 +1,12 @@
+--- a/pytz/__init__.py
++++ b/pytz/__init__.py
+@@ -91,8 +91,7 @@
+ if zoneinfo_dir is not None:
+ filename = os.path.join(zoneinfo_dir, *name_parts)
+ else:
+- 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-2018.4-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
new file mode 100644
index 000000000000..9f8b93bf70a5
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2018.4-zoneinfo-noinstall.patch
@@ -0,0 +1,18 @@
+--- a/setup.py
++++ b/setup.py
+@@ -15,15 +15,8 @@
+ 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,