gentoo Easter resync : 12.04.2020

7 files changed, 4 insertions, 198 deletions

diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 5b7e2bbb3ae5..d43449dbcc41 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,11 +1,3 @@
-DIST service_identity-14.0.0.tar.gz 26033 BLAKE2B 1cc3e0f686f79abb903a2b06e429e4f5db96719a670b371ea98a7bb52269387fb2c1beb1fcfacdc278ee628bc445a7d2879526174f3111ab874c002d2248430b SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2
-DIST service_identity-16.0.0.tar.gz 30270 BLAKE2B ced67dc2be04db57d79c60f4fa0e330b09ec1315986206911b807b65a7b97e313ea376de74501e938aa77f2e02a693669539f899de8ec817848b24c0c03f42dd SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae
-DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d8caf59ad2d5d8734b7a8c65100fdeca81a0261e8c88d21b7c91bbd42fc1e271bd4440826254003eaedac17f66c09312a9f15b SHA512 3824cb473420a5ce6779fd35ff931189ed68286ad1f7f2936e3253a785cd76a77bbb95210a4a5fde1b1ef0c8d9c762b8e89ab44dce60ee43e34b2553ab78b5aa
-DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
-EBUILD service_identity-14.0.0.ebuild 1177 BLAKE2B daa2f1ad55727b05477d68db3612429d200d22dfc51747cf896124e59bf2cbe2c2d9b3adff748b95962016ab1062570ef29af630a57a6a5ced076ae1d42b6c48 SHA512 ec584370e306e0157e25c3e6912bd7063ecd5a95041c5d3e1cd7345df99b1bb9943c21de130b36cd1fe7403684a8b4f8969793ded5518a4cbd6045c8758e0bbd
-EBUILD service_identity-16.0.0.ebuild 1170 BLAKE2B 5b76ac4a371590b2de894bac64d117c87648ede075eb25fc08f5849da5e693d66b0300220140f28aaaa862f0799c61be7dc7e07b7f532e47dd70d482f7e0a598 SHA512 5639f1bbaf0032f9a2d1e707e3c46d1f2b90af4e08e40b2e48c73103fa27ec2caa9e3b05be974178aa126a37483a5565384d2208852305f8c4c15b0a45b838e4
-EBUILD service_identity-17.0.0-r1.ebuild 1252 BLAKE2B e3abd5d96ba0c1dc3a8070d9416da58dbb6e1585c3e6f9b9227daf57746afad604a6abb9160f93e0bcd989fd8e349df04f5db09da6a5b70da5fb0ea981dba298 SHA512 b15fed2694253b5e2d43a0b07a42d13ebfcf5a37acf9ac3c747f042043b3e10054c66d8cfa6469a8978699406004852b6d5008271442ee02d9d524ac7ada5459
-EBUILD service_identity-17.0.0.ebuild 1247 BLAKE2B bad11e134bab2c5246ba0ce5f2d0e47143cf06972f570fa5045f7fa533b7d5a86708cf6f4b30f25f429eaa0ea49fe31de3f855ae9f91043215f3bd61bb6a1ad2 SHA512 03b3ee881961fd2b4a83a80dc1866aa6bd7d1a8fa0b6b9d1326ee8e8d4a4f7041f345b82b12166f43c46671b48267881695bf0999cdc28405e3b7cd4b01df433
-EBUILD service_identity-18.1.0.ebuild 871 BLAKE2B 3a51d1055e89dcf4ec6f74f52c07fd7e4db0c8875e20f2bc073906d082ed9b91536fcbbfc742c03eefb831a2e86b77a6a0bb39bea14b1b3bc9f77db05b005ed2 SHA512 fa5420331a5c48a9295cd47865cd7e09b2ee9eff8353f78ffb4e1e9b11a98b392f04559d24eb2b2638efdd7047843af56a5e9e3d7ec57345acec7de015aa8bae
-MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
+EBUILD service_identity-18.1.0.ebuild 867 BLAKE2B 534b5bfd92cfa7cb33e915e8d43b51200da86fd63539b16b71b08d9c85eecc69b77aa6aa262a73407f1768bd1f55d400ab70c3540baf9241f3ea6e27a124a67d SHA512 dde6fa1b72e7950bc5ec5407c42ac9d8ad08ce3db3b3c95322401357b2e8b2c0c0b31c1c735613e866d68c5d5fd54a34b1850e06bf57570a04bde26f0fe31ad5
+MISC metadata.xml 417 BLAKE2B 756a633325c85cd35b7f10932f339fb309cad72766c32d8af26e6cd05004c163cf1349ccc61f8657d1d19728bc375f937ddf951243d775cb91dc3ec01881093c SHA512 26f165fd38aa65dd4c4d7c705b3db4e7e8bb1ddb8f7d326d1f4403c2bcb7820a9ff12d000675444fcd945201ad0176b34a695222f04ef6c0c803ff36da771870
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index 108fa4e34557..6bd4e3786bdb 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">service_identity</remote-id>
     <remote-id type="github">pyca/service_identity</remote-id>
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
deleted file mode 100644
index 69089f8ba92a..000000000000
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
-	>=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
deleted file mode 100644
index 123eb891786c..000000000000
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
deleted file mode 100644
index 6ff7ef93ef52..000000000000
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="https://github.com/pyca/service_identity/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
deleted file mode 100644
index 754c443ca025..000000000000
--- a/dev-python/service_identity/service_identity-17.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# tests not included in this release
-RESTRICT="test"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index 5b7bde943c63..f4ca5e5ac70c 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: upstream made pyopenssl optional
 RDEPEND="