[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Aaron Bauman]

commit:     cb5cf2ce8ce40aa822738015d7c3b4e897c4788b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu May  2 17:38:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May  3 00:40:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5cf2ce

dev-python/pip: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11879
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-python/pip/files/pip-7.1.2-unbundle.patch | 34 ---------------------------
 1 file changed, 34 deletions(-)

diff --git a/dev-python/pip/files/pip-7.1.2-unbundle.patch b/dev-python/pip/files/pip-7.1.2-unbundle.patch
deleted file mode 100644
index 70adc20ead5..00000000000
--- a/dev-python/pip/files/pip-7.1.2-unbundle.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- pip/_vendor/__init__.py | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
-index ef8851d..349d022 100644
---- a/pip/_vendor/__init__.py
-+++ b/pip/_vendor/__init__.py
-@@ -14,7 +14,7 @@ import sys
- # Downstream redistributors which have debundled our dependencies should also
- # patch this value to be true. This will trigger the additional patching
- # to cause things like "six" to be available as pip.
--DEBUNDLED = False
-+DEBUNDLED = True
- 
- # By default, look in this directory for a bunch of .whl files which we will
- # add to the beginning of sys.path before attempting to import anything. This
-@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
- def vendored(modulename):
-     vendored_name = "{0}.{1}".format(__name__, modulename)
- 
--    try:
--        __import__(vendored_name, globals(), locals(), level=0)
--    except ImportError:
--        __import__(modulename, globals(), locals(), level=0)
--        sys.modules[vendored_name] = sys.modules[modulename]
--        base, head = vendored_name.rsplit(".", 1)
--        setattr(sys.modules[base], head, sys.modules[modulename])
-+    __import__(modulename, globals(), locals(), level=0)
-+    sys.modules[vendored_name] = sys.modules[modulename]
-+    base, head = vendored_name.rsplit(".", 1)
-+    setattr(sys.modules[base], head, sys.modules[modulename])
- 
- 
- # If we're operating in a debundled setup, then we want to go ahead and trigger