8 files changed, 10 insertions, 212 deletions
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index f7d795f40f69..0f01e2a4ce8c 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,12 +1,6 @@
-AUX httplib2-0.11.3-use-system-cacerts.patch 2252 BLAKE2B 37cc1122f0f7859f4f26af03d45ed67202ecdecbb19b3a513dca8c723c490c17392c719bcac0937c2c52ba30238ac193b477b2bf8bb4dc84cff0ac1a364c9759 SHA512 a8a34d77dba477ae30bfcdf38544c09006e409ab9a7cd8419d4f3a061199eb53b96df13175e32e87085ee75cd7c1d403c1aa6f3929ddce301b4927bfc9eac543
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
-AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d7efe2ae587808c7d9ce23ad0f8b507f51751054cd7079bfca55f9b3496b4806180f28da9acf0dd812ff16f14d9bb03749e7 SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f
-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
-EBUILD httplib2-0.10.3-r1.ebuild 927 BLAKE2B a5bef5238db60e8b25093665a402cf24041babc69a8617402df8ec3cbe580ed975895c26aa4afe23f5fbb6b856f504baf2a0fe6a9eb73fcdb6038b05dc17609f SHA512 d2160672a075ab0aab798ecb3a272ffd1142338c651f413b742cf51fd616fa6f5b5372bf605455a5b8fdb54ff557aa83266f8d8dc0fada2cb92ca8b1272cd8b9
-EBUILD httplib2-0.11.3.ebuild 954 BLAKE2B 94dc30544e82c5e7e5444545861d2170722d72804dcf338cd214b05938077dda1bb034502f4e3a1f28261b68612935e8db9ace4209b50f6353f4ad6ffe528a4d SHA512 852d8ded1441461dab19cc6e7118ddfc90709b8bc8f31f6015aad4dee9a33e1947d2751fef051799b619d8ffd1a43ad21343992e20feec767a9c8569d12f0d14
-EBUILD httplib2-0.12.1.ebuild 946 BLAKE2B 642862f0dab7bb7de1d245a70763b7d74d7cd222265a70efd79ef87a24044587d6397f31593651376040c27d0a6128a2687c9117cb0c1f45e763ce324d1fbba8 SHA512 1b4f45ac272eb7a21d16729ab2ee0ac0c7ebceaf55ace475d6ff066e3a2517fe40f657a1ef052eba5109b00c7ee93af2d8c70831ca512a0db852bfc1da686aef
-EBUILD httplib2-0.13.0.ebuild 956 BLAKE2B 619e9f0f2a2965dc81313a3a3719f19162f38e1c60211a7c79757a5a50b620b1f41a38e3beaa8fb70c2f665d58f13e51e68d6e6a71293c575d9e991a515bd5c1 SHA512 2470c3a9bb9ff4ad9de12b05f0a1b4881a8eb690c91f8c37027b0cf5d3e1ce46f54423993055c6f285ddc40bd4d28faa7f23bce7af23f6afe054fc882944d16d
-MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
+DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb8642126994125595c344e19c2e0a430ca556a213938f5f9da1aea69f1cc30e1c89ccf2c64c2389641973f89aa8f4e SHA512 8724e5784990e7315762e5f8333197d6f6820aa6cc66aebbeb981ccedb57e35fa998e623d7e0cd8fcb18178895bc73b16bdf015c90d2adf208d6d5320f3551bb
+EBUILD httplib2-0.13.0.ebuild 950 BLAKE2B 405c5eb3ccd397910dbc997d7ae3652a238465ef9d54dc2b99b762981e4a61aa878c2f89dcf8d8ac99650f51dc59be64d27ac283a1936d53b95353124b7181f1 SHA512 cc67cc96ab139db8fd445edb429c47a8b891c1fbd2558b6718387181752ce27617f3f18cc661d20bd80aaf376e9c95062552f24269e1dbbee8bafb2f9de20a7c
+EBUILD httplib2-0.17.0.ebuild 923 BLAKE2B 603b57487fb24e9f70bd4bbbec7ad2094298bdfe6404eeaea152377076898cfffad2203e4de758a18c44b91728e8c025102bd50880165893bc3490edf3d832b6 SHA512 07dd1892b78409715b982cf4c1e45773486d8e4bd6842781e533d2ba9c7ffa2b28e4fe030c7f080c6cd59f2202d1eb8c5ae1ae3d35e6b95c8fa021719b03d58b
+MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
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 8aace02c54d4..000000000000
--- 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 <marc.deslauriers@canonical.com>
-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 cff65bb75ea5..000000000000
--- 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 <marc.deslauriers@canonical.com>
-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 a3f238e82a27..000000000000
--- 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 1906a6e08e54..000000000000
--- 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.13.0.ebuild b/dev-python/httplib2/httplib2-0.13.0.ebuild
index 52e96383798e..dde741a044dc 100644
--- a/dev-python/httplib2/httplib2-0.13.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.13.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.17.0.ebuild
index 837a7480069c..d11a844dc7d8 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.17.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -12,10 +13,10 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=""
 RDEPEND="app-misc/ca-certificates"
 
 # tests connect to random remote sites
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index a3e1442dc0b5..0dbf79fc1c56 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="google-code">httplib2</remote-id>
     <remote-id type="pypi">httplib2</remote-id>