summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/pytz')
-rw-r--r--dev-python/pytz/files/2016.6.1-zoneinfo.patch12
-rw-r--r--dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch32
-rw-r--r--dev-python/pytz/files/pytz-2009j-zoneinfo.patch14
3 files changed, 0 insertions, 58 deletions
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