Merge branch 'next'

5 files changed, 5 insertions, 95 deletions

diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 3b7f2bfd956b..85bce29e6bbb 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,12 +1,8 @@
 AUX certifi-2018.4.16-use-system-cacerts.patch 314 BLAKE2B 30c9d53dba96f0062df843c98e507a477888a5d8d4de32fded32c9c6729c3e71690a1a1463372d991fbeb5135298a8fe308ab2ea10521e4a5408591eb1a336a6 SHA512 ff533ca05a736e35c1c567e0da6e79124bc7e070fa1db03fdcda6989df885a16568e4d0dffe07658480b1141dd1fc4c374230c46ce7d7b20e0ada82600ae9141
-DIST certifi-2018.10.15.tar.gz 145887 BLAKE2B 695b4236d67022f12639850fdcd169570330f9dd59aee165a39143d5dc5867b8685859bc48c8af07d41b7124970748ceb97cf1f7557563865e6b3293f668393b SHA512 3324ae6c4b99dda6f48aa9f0918fe045a19b19b26fcfdcca4be93ec967b9e4112d863c982686837b327f1663e308250d56ea337caeeeeb96579e08b20fca92df
-DIST certifi-2018.11.29.tar.gz 153772 BLAKE2B fb146409560beb85731b136541012f3f114a8e35c1b0ae9a9bac31d10642dc4ff3cad6a7e722e14e1d5092f9d4e3d7f5c4acb231edd2602d3452a6c9cebd323c SHA512 6a6bf1ff98caefcdbf78a8c83e11e155368bacdd806f0ae0c6afa8f513667df6598e594b3584de61acdca3d6049f4a776937f2aa8672b602bd6db7b737f6074e
 DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
-DIST certifi-2018.8.24.tar.gz 146866 BLAKE2B 92a609bffd777a624d18e612e2fa504b1cd4f0764f979d22bf6785158fb928d30984fba16b839f6b4066395dadcca485e6215c6f0b6b550d891673a79ea77c08 SHA512 bb0af24570dd4806bc80cd438cae42db82f820de815a6148b184f58c19cd91a03f9275815559817a84220dcbd7c87a4a7d12e35cf4a95a1dbad286a1dfecf907
 DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
-EBUILD certifi-2018.10.15.ebuild 1417 BLAKE2B b93161fce15a55cb9131c6c90b56981f7b82524deb0831ebbf00b2f05088db53894fca47b5fb3a11fe0099632ad447a8092fb67f2a74428ca8f8cab56c74aa5b SHA512 c82821bd3a079b417d5fcac7eadb0fac0b739468587109cdbbbbd2861cd39d002a0d80bd6deec8f1e1af1c2d977b5370e33eee93a30392f4353633734c934d96
-EBUILD certifi-2018.11.29.ebuild 1424 BLAKE2B 1e61f55b832357bfa38af6093dddce06dec6b1d39386300df8cc1578d865a9a85ff70cf59f862d93e5104a6748c083050d3629aeaeca9d43068f641a76a70989 SHA512 9d57eff51970edc246351178de3f4bedbbc0f1d936c3ef42895ec26735dfbdc41de342dea6da066ab82fbe149dcb7a47415725d016e1d15068163d8804f4c1b9
+DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
 EBUILD certifi-2018.4.16.ebuild 1416 BLAKE2B 48ac08224435ba34e10f7af84c882de4cd50bd7e24b0ca66ee83db9f2e8a955e2163ef1ef8d8dd90b9413a4447cf1c2d15cba9956c5d6e7a7e3d1a3d577e7dca SHA512 8c2ec3d4d0471359c79e47296eb66f7d0a40e06b79b582f276721bbeeb5dac35ab07c24fef472b54e435850350962d1d2e1c8dfd32711ef36311e6f51cc8bdcc
-EBUILD certifi-2018.8.24.ebuild 1429 BLAKE2B 462a10d705e5878059893d1ff0551790c00a70d67895451c91642d6bd1ce30d7708e3af5aa51b89418b969ed7e26377ba7369560da33af20f2c2c4da6f8e1fe8 SHA512 ea4b536af66ecd7a39fce8428cc78cacf1b55a183f822c7e83752e6baa5d0c78d52913255970fa8fb960dd501d967352b2dd372492daed35495eb558570182ae
-EBUILD certifi-2019.6.16.ebuild 1415 BLAKE2B e37e59485fc7509f9264a8bf51f41e6aa62c7392cb65f99b4b89c19fa4bc15b9d31ea2c4147c3492c2ea42f4fb7038620caad30dff68287964b99ca0f1d6472c SHA512 708beb10511cbbb20b5097abd4bc7827045f62e0007bc1295ce368e83866a01c0259ef646231fec9dbf1304fa399d4526795fc5702dd3f5f4063ec18acf72cb5
+EBUILD certifi-2019.6.16.ebuild 1410 BLAKE2B e3c21451c48553d9480abc4451e17edcad976810a47f291f8bf655a7d01e491bf96b0e434df0683204cb33a5c5d0b84aa394ec3d825b68a16a98d55f355f6c82 SHA512 d2316ba066d70812d94d979a8feb53e8975231d41edf9e6f0c956ef739d8993b3757b4b37799c73aed64da855e1aaf3d658889f7cce884cc65f0aca21d2da906
+EBUILD certifi-2019.9.11.ebuild 1422 BLAKE2B 4e09d24aaa4621b3d0d9f4f54728d753486d94d7c91dd63062574c16ea7d7b239948eac59edc6bbf3ea5ab9eaa8f21dc1cf270320d26322c2a5bbcd844eee675 SHA512 d3e2b72c3dd378edc5b3e5f99daa00bc1880de0f4a47845201a2d2ca9d119fc10088ba56d82c13ca5126da939cedf0d113d4980bdd476b00127826d1acd3fece
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.10.15.ebuild b/dev-python/certifi/certifi-2018.10.15.ebuild
deleted file mode 100644
index 8638a44f3fee..000000000000
--- a/dev-python/certifi/certifi-2018.10.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2018.8.24.ebuild b/dev-python/certifi/certifi-2018.8.24.ebuild
deleted file mode 100644
index d8e1f0a40140..000000000000
--- a/dev-python/certifi/certifi-2018.8.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1 versionator
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
index 50b26cdf12c1..afbbe02b3d32 100644
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/certifi/certifi-2018.11.29.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild
index 616a1c70cbfa..7c27b91e6562 100644
--- a/dev-python/certifi/certifi-2018.11.29.ebuild
+++ b/dev-python/certifi/certifi-2019.9.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1 prefix readme.gentoo-r1