gentoo resync : 14.07.2018

7 files changed, 0 insertions, 189 deletions

diff --git a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
deleted file mode 100644
index 776d395b7b94..000000000000
--- a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-10.0.1/src/pip/_internal/commands/install.py
-+++ pip-10.0.1/src/pip/_internal/commands/install.py
-@@ -202,6 +202,9 @@
-         if options.upgrade:

-             upgrade_strategy = options.upgrade_strategy

- 

-+        if not options.use_user_site and not options.target_dir and not options.root_path:

-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")

-+

-         if options.build_dir:

-             options.build_dir = os.path.abspath(options.build_dir)

- 

diff --git a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
deleted file mode 100644
index ad146dc1507f..000000000000
--- a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't check for new versions of pip.
-
---- pip-10.0.1/src/pip/_internal/basecommand.py
-+++ pip-10.0.1/src/pip/_internal/basecommand.py
-@@ -255,14 +255,6 @@
- 

-             return UNKNOWN_ERROR

-         finally:

--            # Check if we're using the latest version of pip available

--            if (not options.disable_pip_version_check and not

--                    getattr(options, "no_index", False)):

--                with self._build_session(

--                        options,

--                        retries=0,

--                        timeout=min(5, options.timeout)) as session:

--                    pip_version_check(session, options)

-             # Avoid leaking loggers

-             for handler in set(logging.root.handlers) - original_root_handlers:

-                 # this method benefit from the Logger class internal lock

diff --git a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch b/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
deleted file mode 100644
index a192c228a997..000000000000
--- a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't check PyPI for new versions of pip by default, updates will occur when
-new releases are added to the tree.
-
---- pip-6.0.2/pip/cmdoptions.py
-+++ pip-6.0.2/pip/cmdoptions.py
-@@ -404,7 +404,7 @@
-     "--disable-pip-version-check",
-     dest="disable_pip_version_check",
-     action="store_true",
--    default=False,
-+    default=True,
-     help="Don't periodically check PyPI to determine whether a new version "
-          "of pip is available for download.")
- 
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 70adc20ead53..000000000000
--- 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
diff --git a/dev-python/pip/files/pip-8.0.0-unbundle.patch b/dev-python/pip/files/pip-8.0.0-unbundle.patch
deleted file mode 100644
index d508d51ab4fc..000000000000
--- a/dev-python/pip/files/pip-8.0.0-unbundle.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- pip/_vendor/__init__.py | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
-index b09a7c3..b9fe6ee 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
-@@ -85,8 +82,6 @@ if DEBUNDLED:
-     vendored("requests.packages.urllib3.packages.ordered_dict")
-     vendored("requests.packages.urllib3.packages.six")
-     vendored("requests.packages.urllib3.packages.ssl_match_hostname")
--    vendored("requests.packages.urllib3.packages.ssl_match_hostname."
--             "_implementation")
-     vendored("requests.packages.urllib3.poolmanager")
-     vendored("requests.packages.urllib3.request")
-     vendored("requests.packages.urllib3.response")
diff --git a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch b/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
deleted file mode 100644
index 7334380c1e1d..000000000000
--- a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 890a1c26018752f2c57c7800968e4b8d1e0987f9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 20 Nov 2016 19:52:40 +0100
-Subject: [PATCH] Stop checking for new versions
-
----
- pip/basecommand.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/pip/basecommand.py b/pip/basecommand.py
-index 54c6706..3cffe86 100644
---- a/pip/basecommand.py
-+++ b/pip/basecommand.py
-@@ -241,15 +241,6 @@ class Command(object):
-             logger.critical('Exception:', exc_info=True)
- 
-             return UNKNOWN_ERROR
--        finally:
--            # Check if we're using the latest version of pip available
--            if (not options.disable_pip_version_check and not
--                    getattr(options, "no_index", False)):
--                with self._build_session(
--                        options,
--                        retries=0,
--                        timeout=min(5, options.timeout)) as session:
--                    pip_version_check(session)
- 
-         return SUCCESS
- 
--- 
-2.10.2
-
diff --git a/dev-python/pip/files/pip-disable-system-install.patch b/dev-python/pip/files/pip-disable-system-install.patch
deleted file mode 100644
index 9e572454315e..000000000000
--- a/dev-python/pip/files/pip-disable-system-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 27 Oct 2015 12:20:44 -0400
-Subject: [PATCH] install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
----
- pip/commands/install.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index 46cd9f2..36b72f2 100644
---- a/pip/commands/install.py
-+++ b/pip/commands/install.py
-@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand):
-             )
-             options.ignore_installed = True
- 
-+        if not options.use_user_site and not options.target_dir and not options.root_path:
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
- 
--- 
-2.6.2
-