From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E60EF58973 for ; Thu, 21 Jan 2016 11:44:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07A7221C01F; Thu, 21 Jan 2016 11:44:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9815F21C01F for ; Thu, 21 Jan 2016 11:43:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC04F33E5E4 for ; Thu, 21 Jan 2016 11:43:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCDBD10B8 for ; Thu, 21 Jan 2016 11:43:53 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1453376627.abf8d1cf02b68d82bc21e117442cede219f6d76f.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/, dev-python/pip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pip/files/pip-8.0.0-unbundle.patch dev-python/pip/pip-8.0.0-r1.ebuild dev-python/pip/pip-8.0.0.ebuild X-VCS-Directories: dev-python/pip/files/ dev-python/pip/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: abf8d1cf02b68d82bc21e117442cede219f6d76f X-VCS-Branch: master Date: Thu, 21 Jan 2016 11:43:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 827b254c-3581-4d12-a01b-e71bc31e3317 X-Archives-Hash: 61d08ccb87070619900db1dd40a05458 commit: abf8d1cf02b68d82bc21e117442cede219f6d76f Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 21 11:43:40 2016 +0000 Commit: Justin Lecher gentoo 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 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() {