gentoo Easter resync : 12.04.2020

5 files changed, 7 insertions, 41 deletions

diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 888355841e9e..b461efa9fe23 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,6 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
-DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679
 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
-EBUILD snakeoil-0.7.5.ebuild 985 BLAKE2B 40934f0dfb896cae019ed94c98a6ae9f2a321284969d4bdfea200514fbaaf0337cfc9e1240317e6cc95229f04937290777ba0572c11350944bb6acf23b3bf4dd SHA512 8f9e466d849edce6bab3f574cfdcadd8d56a6f68391d5c348d253ab87bd36d5a3225fce449e03e870991eb5dca833ffade08fc323a9811151afcc2bb71bf514e
-EBUILD snakeoil-0.8.7.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
-EBUILD snakeoil-0.8.8.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
-EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
+EBUILD snakeoil-0.7.5.ebuild 982 BLAKE2B fdc911db13df8633da6f10b45f5c7b07270de073fbc7c5a48319eae510051af9d27fa7ceb208a4db561e01a7d9d9e4d8bf60bc6a48770d8e3a9555f5dc316c92 SHA512 d2b0473d24a81442c947bd848b1283734024df1bcf5ebd95abeb23df595d31903b8764e1df9f221143dec3eb76324b099c97142dfe94ca922ceb2214f0bb56d5
+EBUILD snakeoil-0.8.8.ebuild 840 BLAKE2B 37a5357d317d02e5ca941b5f1fa83524e40c5c0ab2da722582ef5e716959185bd7191ef4ce11a161f9622a43cc0f37e3046a68e09d293be5fc684c0114066fe2 SHA512 45fec591e78b138139ee0ec7f8b9f0754f6927e128aee9dedbc914a769822384b3184561922e1031a75016661da3109ba50c586c7c773e33fd1a5e974807173b
+EBUILD snakeoil-9999.ebuild 849 BLAKE2B 55f284f67df24abbbc45339fe1b32cc060713861845a08aa578515ef1bc55edf37b8da958f78b17928bf754cfc1645d9c74514079cebb519027d70eff457ecd4 SHA512 754541ad9112e13548bd07e30df81ec5aeab889cab05471221c9587934e8becbaeae9dbb46771f3e6ca49c412fe6bc0ad266dc588f4d43a3e06a044976a7c5a9
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 739493a9ebf2..16d993d1aa5c 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.8.7.ebuild b/dev-python/snakeoil/snakeoil-0.8.7.ebuild
deleted file mode 100644
index 424cd085a42c..000000000000
--- a/dev-python/snakeoil/snakeoil-0.8.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
index 424cd085a42c..c762561aef96 100644
--- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index e073443aa4a6..1b7261487c4b 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi