public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/, dev-python/pip/
Date: Thu, 21 Jan 2016 11:43:53 +0000 (UTC)	[thread overview]
Message-ID: <1453376627.abf8d1cf02b68d82bc21e117442cede219f6d76f.jlec@gentoo> (raw)

commit:     abf8d1cf02b68d82bc21e117442cede219f6d76f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 11:43:40 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 11:43:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf8d1cf

dev-python/pip: Update unbundle patch

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/pip/files/pip-8.0.0-unbundle.patch      | 43 ++++++++++++++++++++++
 .../pip/{pip-8.0.0.ebuild => pip-8.0.0-r1.ebuild}  |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/dev-python/pip/files/pip-8.0.0-unbundle.patch b/dev-python/pip/files/pip-8.0.0-unbundle.patch
new file mode 100644
index 0000000..d508d51
--- /dev/null
+++ b/dev-python/pip/files/pip-8.0.0-unbundle.patch
@@ -0,0 +1,43 @@
+ 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/pip-8.0.0.ebuild b/dev-python/pip/pip-8.0.0-r1.ebuild
similarity index 97%
rename from dev-python/pip/pip-8.0.0.ebuild
rename to dev-python/pip/pip-8.0.0-r1.ebuild
index aeffddf..842b1a9 100644
--- a/dev-python/pip/pip-8.0.0.ebuild
+++ b/dev-python/pip/pip-8.0.0-r1.ebuild
@@ -42,7 +42,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-	"${FILESDIR}"/${PN}-7.1.2-unbundle.patch
+	"${FILESDIR}"/${P}-unbundle.patch
 	)
 
 python_prepare_all() {


             reply	other threads:[~2016-01-21 11:44 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-21 11:43 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-31 14:06 [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/, dev-python/pip/ Michał Górny
2025-03-10 10:03 Michał Górny
2025-03-01 11:57 Michał Górny
2025-02-18 10:30 Michał Górny
2025-01-04 19:08 Michał Górny
2024-02-20  9:09 Michał Górny
2024-01-17 17:11 Michał Górny
2023-11-25  6:45 Michał Górny
2022-08-30 19:01 Michał Górny
2022-07-29 11:43 Arthur Zamarin
2022-03-16  8:07 Michał Górny
2021-11-27 20:14 Michał Górny
2021-11-27 10:27 Michał Górny
2021-05-26  8:36 Michał Górny
2021-01-24 10:15 Michał Górny
2020-09-28 19:50 Michał Górny
2020-02-01  8:33 Michał Górny
2019-11-23  0:22 Patrick McLean
2019-10-22 20:38 Maxim Koltsov
2017-01-04  4:28 Mike Gilbert
2016-11-20 19:00 Sebastian Pipping
2015-08-24 10:12 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453376627.abf8d1cf02b68d82bc21e117442cede219f6d76f.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox