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 07BE858973 for ; Thu, 21 Jan 2016 11:44:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ED7921C014; Thu, 21 Jan 2016 11:43:57 +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 0FD1B21C008 for ; Thu, 21 Jan 2016 11:43:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C666133E5E4 for ; Thu, 21 Jan 2016 11:43:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 721D71069 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.bbdfa5280566435e3d278731e2be8d8cc9d9e04e.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/requests/files/requests-2.9.1-system-packages.patch dev-python/requests/requests-2.9.1-r1.ebuild dev-python/requests/requests-2.9.1.ebuild X-VCS-Directories: dev-python/requests/files/ dev-python/requests/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: bbdfa5280566435e3d278731e2be8d8cc9d9e04e 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: 5619641a-de82-46a2-a889-b2bf17e95cd2 X-Archives-Hash: b285286b0a64a6c19b0398cf1ea6d9ea commit: bbdfa5280566435e3d278731e2be8d8cc9d9e04e Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 21 10:33:25 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=bbdfa528 dev-python/requests: Unbundle system libs Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> .../files/requests-2.9.1-system-packages.patch | 20 ++++++++++++++++++++ ...equests-2.9.1.ebuild => requests-2.9.1-r1.ebuild} | 12 ++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch new file mode 100644 index 0000000..f511d0d --- /dev/null +++ b/dev-python/requests/files/requests-2.9.1-system-packages.patch @@ -0,0 +1,20 @@ + setup.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/setup.py b/setup.py +index b7ed12b..1d5abe4 100755 +--- a/setup.py ++++ b/setup.py +@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish': + packages = [ + 'requests', + 'requests.packages', +- 'requests.packages.chardet', +- 'requests.packages.urllib3', +- 'requests.packages.urllib3.packages', +- 'requests.packages.urllib3.contrib', +- 'requests.packages.urllib3.util', +- 'requests.packages.urllib3.packages.ssl_match_hostname', + ] + + requires = [] diff --git a/dev-python/requests/requests-2.9.1.ebuild b/dev-python/requests/requests-2.9.1-r1.ebuild similarity index 82% rename from dev-python/requests/requests-2.9.1.ebuild rename to dev-python/requests/requests-2.9.1-r1.ebuild index 4d4a608..3228f55 100644 --- a/dev-python/requests/requests-2.9.1.ebuild +++ b/dev-python/requests/requests-2.9.1-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -18,7 +18,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" -# bundles dev-python/urllib3 snapshot RDEPEND=" app-misc/ca-certificates >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}] @@ -26,6 +25,7 @@ RDEPEND=" >=dev-python/py-1.4.30[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)] + dev-python/urllib3[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] @@ -39,13 +39,13 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch + "${FILESDIR}"/${P}-system-packages.patch "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch ) python_prepare_all() { - # use system chardet - rm -r requests/packages/chardet || die + # use system chardet & urllib3 + rm -r requests/packages/{chardet,urllib3} || die distutils-r1_python_prepare_all }