commit: c8c592bed3b413f7008e9ba3a55dad247e7571e6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 27 11:39:36 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Mar 27 11:39:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c592be
dev-python/httplib2: Remove redundant versions Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/httplib2/Manifest | 3 -- .../files/httplib2-0.11.3-use-system-cacerts.patch | 59 ---------------------- .../files/httplib2-use-system-cacerts.patch | 59 ---------------------- dev-python/httplib2/httplib2-0.10.3-r1.ebuild | 40 --------------- dev-python/httplib2/httplib2-0.11.3.ebuild | 40 --------------- dev-python/httplib2/httplib2-0.12.1.ebuild | 39 -------------- 6 files changed, 240 deletions(-) diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest index fae55daefd0..1ff320cbd08 100644 --- a/dev-python/httplib2/Manifest +++ b/dev-python/httplib2/Manifest @@ -1,5 +1,2 @@ -DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa -DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659 -DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25 DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83 DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb8642126994125595c344e19c2e0a430ca556a213938f5f9da1aea69f1cc30e1c89ccf2c64c2389641973f89aa8f4e SHA512 8724e5784990e7315762e5f8333197d6f6820aa6cc66aebbeb981ccedb57e35fa998e623d7e0cd8fcb18178895bc73b16bdf015c90d2adf208d6d5320f3551bb diff --git a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch deleted file mode 100644 index 8aace02c54d..00000000000 --- a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001 -From: Marc Deslauriers <[email protected]> -Date: Thu, 8 Oct 2015 12:15:44 -0700 -Subject: Use system ca certificates, not the bundled ones - -Forwarded: not-needed -Bug-Ubuntu: https://launchpad.net/bugs/882027 - -Patch-Name: use_system_cacerts.patch ---- - python2/httplib2/__init__.py | 5 ++--- - python3/httplib2/__init__.py | 5 ++--- - setup.py | 1 - - 3 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py -index 6fa3cc6..e996d01 100644 ---- a/python2/httplib2/__init__.py -+++ b/python2/httplib2/__init__.py -@@ -190,9 +190,8 @@ try: - import ca_certs_locater - CA_CERTS = ca_certs_locater.get() - except ImportError: -- # Default CA certificates file bundled with httplib2. -- CA_CERTS = os.path.join( -- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") -+ # Use system CA certificates -+ CA_CERTS = "/etc/ssl/certs/ca-certificates.crt" - - # Which headers are hop-by-hop headers by default - HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] -diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py -index 3ce019e..8383cc4 100644 ---- a/python3/httplib2/__init__.py -+++ b/python3/httplib2/__init__.py -@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5 - # Which headers are hop-by-hop headers by default - HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] - --# Default CA certificates file bundled with httplib2. --CA_CERTS = os.path.join( -- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") -+# Use system CA certificates -+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt" - - def _get_end2end_headers(response): - hopbyhop = list(HOP_BY_HOP) -diff --git a/setup.py b/setup.py -index fb00ed2..2c31f44 100755 ---- a/setup.py -+++ b/setup.py -@@ -58,7 +58,6 @@ - """, - package_dir=pkgdir, - packages=['httplib2'], -- package_data={'httplib2': ['*.txt']}, - classifiers=( - 'Development Status :: 4 - Beta', - 'Environment :: Web Environment', diff --git a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch deleted file mode 100644 index cff65bb75ea..00000000000 --- a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001 -From: Marc Deslauriers <[email protected]> -Date: Thu, 8 Oct 2015 12:15:44 -0700 -Subject: Use system ca certificates, not the bundled ones - -Forwarded: not-needed -Bug-Ubuntu: https://launchpad.net/bugs/882027 - -Patch-Name: use_system_cacerts.patch ---- - python2/httplib2/__init__.py | 5 ++--- - python3/httplib2/__init__.py | 5 ++--- - setup.py | 1 - - 3 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py -index 6fa3cc6..e996d01 100644 ---- a/python2/httplib2/__init__.py -+++ b/python2/httplib2/__init__.py -@@ -190,9 +190,8 @@ try: - import ca_certs_locater - CA_CERTS = ca_certs_locater.get() - except ImportError: -- # Default CA certificates file bundled with httplib2. -- CA_CERTS = os.path.join( -- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") -+ # Use system CA certificates -+ CA_CERTS = "/etc/ssl/certs/ca-certificates.crt" - - # Which headers are hop-by-hop headers by default - HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] -diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py -index 3ce019e..8383cc4 100644 ---- a/python3/httplib2/__init__.py -+++ b/python3/httplib2/__init__.py -@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5 - # Which headers are hop-by-hop headers by default - HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] - --# Default CA certificates file bundled with httplib2. --CA_CERTS = os.path.join( -- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") -+# Use system CA certificates -+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt" - - def _get_end2end_headers(response): - hopbyhop = list(HOP_BY_HOP) -diff --git a/setup.py b/setup.py -index fb00ed2..2c31f44 100755 ---- a/setup.py -+++ b/setup.py -@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou - """, - package_dir=pkgdir, - packages=['httplib2'], -- package_data={'httplib2': ['*.txt']}, - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: Web Environment', diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild deleted file mode 100644 index a3f238e82a2..00000000000 --- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_6 pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="A comprehensive HTTP client library" -HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="app-misc/ca-certificates" - -# tests connect to random remote sites -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch ) - -python_prepare_all() { - chmod o+r */*egg*/* || die - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} == python2.7 ]] ; then - cd python2 || die - else - cd python3 || die - fi - - "${PYTHON}" httplib2test.py || die -} diff --git a/dev-python/httplib2/httplib2-0.11.3.ebuild b/dev-python/httplib2/httplib2-0.11.3.ebuild deleted file mode 100644 index 1906a6e08e5..00000000000 --- a/dev-python/httplib2/httplib2-0.11.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="A comprehensive HTTP client library" -HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="app-misc/ca-certificates" - -# tests connect to random remote sites -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-0.11.3-use-system-cacerts.patch ) - -python_prepare_all() { - chmod o+r */*egg*/* || die - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then - cd python2 || die - else - cd python3 || die - fi - - "${PYTHON}" httplib2test.py || die -} diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild deleted file mode 100644 index 837a7480069..00000000000 --- a/dev-python/httplib2/httplib2-0.12.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="A comprehensive HTTP client library" -HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="app-misc/ca-certificates" - -# tests connect to random remote sites -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch ) - -python_prepare_all() { - chmod o+r */*egg*/* || die - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then - cd python2 || die - else - cd python3 || die - fi - - "${PYTHON}" httplib2test.py || die -}
