summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/distlib/distlib-0.2.2.ebuild1
-rw-r--r--dev-python/distlib/files/distlib-0.2.2-unbundle.patch35
2 files changed, 35 insertions, 1 deletions
diff --git a/dev-python/distlib/distlib-0.2.2.ebuild b/dev-python/distlib/distlib-0.2.2.ebuild
index b5fbc3e43f58..81a6691f0877 100644
--- a/dev-python/distlib/distlib-0.2.2.ebuild
+++ b/dev-python/distlib/distlib-0.2.2.ebuild
@@ -20,7 +20,6 @@ IUSE=""
PATCHES=(
"${FILESDIR}"/${P}-unbundle.patch
- "${FILESDIR}"/${P}-online.patch
)
python_prepare_all() {
diff --git a/dev-python/distlib/files/distlib-0.2.2-unbundle.patch b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
new file mode 100644
index 000000000000..5ee912905602
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
@@ -0,0 +1,35 @@
+--- distlib-0.1.9/distlib/compat.py.orig 2014-06-06 09:58:21.317560756 +0200
++++ distlib-0.1.9/distlib/compat.py 2014-06-06 09:58:29.955611427 +0200
+@@ -17,7 +17,7 @@ if sys.version_info[0] < 3:
+ from types import FileType as file_type
+ import __builtin__ as builtins
+ import ConfigParser as configparser
+- from ._backport import shutil
++ import shutil
+ from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
+ from urllib import (urlretrieve, quote as _quote, unquote, url2pathname,
+ pathname2url, ContentTooShortError, splittype)
+@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover
+ try:
+ import sysconfig
+ except ImportError: # pragma: no cover
+- from ._backport import sysconfig
++ import sysconfig
+
+ try:
+ callable = callable
+--- distlib-0.1.9/setup.py.orig 2014-06-06 10:19:13.971997156 +0200
++++ distlib-0.1.9/setup.py 2014-06-06 10:19:20.012034150 +0200
+@@ -62,12 +62,7 @@ distutils.core.setup(
+ platforms='any',
+ packages=[
+ 'distlib',
+- 'distlib._backport',
+ ],
+- package_data={
+- 'distlib._backport': ['sysconfig.cfg'],
+- 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
+- },
+ cmdclass={
+ 'test': TestCommand,
+ },