gentoo resync : 15.12.2019

4 files changed, 40 insertions, 7 deletions

diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index de5d3e515785..12fa353af49d 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,8 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 DIST snakeoil-0.8.3.tar.gz 297775 BLAKE2B b08c2c1bfea98e391b1da59ba0fd28e2187a83291c9c665f1394ed2b985b959ff5f5328db6a379d0d29e0fd86c82f965c40280f38ef5064727d4d9b173905c42 SHA512 d17a410f1684bb0398a115bbe6539895ea84a2ff7a1f3d05a66937f5f83783f2c503e985839d26f03565e960040a10e1985c43bb7376feda7c088ae279838be9
-EBUILD snakeoil-0.7.5.ebuild 961 BLAKE2B dfa8bdee5204a242d8445a7f73b11735c31334a368b4afb22ed04112ed5f6aad2aeef2cce592b3a18664308c9d2db05e6ead41ca9a780f8af8dbaf0d2f794263 SHA512 29daf7bf4ff953e2e3f2533528de2daf343ce355338a209a37ff396cb80ff375ca2428eb8a2e093cbe582bdd6b2f7f05c9b31a7d9b348326a99e0602073c478f
+DIST snakeoil-0.8.4.tar.gz 297551 BLAKE2B 1c79805c65a9bec5f392e7c43dd36a9d085fb4f58371137e6fe1a5a72fd57b665c69f534175fef76aae3ae185a85343115671acdd58d214733c5b057468c8e54 SHA512 7a074d37b8a14260a0123acb63d16a2c004ec59a132ecccf3f528cac754e02661b766b0169646c8cc7743d7401160b3d7d469806e3da5b055d2352edb8bcdc68
+EBUILD snakeoil-0.7.5.ebuild 988 BLAKE2B e8c19ea871c3b1cb50e0d88e6b4f479d051e97e4242c14599ed797504b6bb0f97442e18c10f94a2912e108834ce2fbde7919036c74f4f63e0b89bea3b2b72341 SHA512 aa3363f6683756af247abe3332fbc2415d4fd86e79d6cc906baed190a8442ea949ccac5d49e8229c42dcbb95ff886357cfde09ecf7d181d10a611c02bdc17217
 EBUILD snakeoil-0.8.3.ebuild 896 BLAKE2B b6f652353377722aee74310e2a06ddea5b3c2ab7b819a0a30d5630420249464885f80df21325def8ec9e8a3213a79cb9a3fe4c5f2364cfd0cb8f80d08d44c369 SHA512 4b07fcaae6a30f4a37d4761e7e39c6c90370a05321c26acb43f2452feace12e297b5c04145c9aa872bc9f9af70056e9d9af5d6192f52c5d48c51292179c11944
-EBUILD snakeoil-9999.ebuild 896 BLAKE2B b6f652353377722aee74310e2a06ddea5b3c2ab7b819a0a30d5630420249464885f80df21325def8ec9e8a3213a79cb9a3fe4c5f2364cfd0cb8f80d08d44c369 SHA512 4b07fcaae6a30f4a37d4761e7e39c6c90370a05321c26acb43f2452feace12e297b5c04145c9aa872bc9f9af70056e9d9af5d6192f52c5d48c51292179c11944
+EBUILD snakeoil-0.8.4.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
+EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index fa95be1778c4..5a750a275945 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/snakeoil"
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/snakeoil/snakeoil-0.8.4.ebuild b/dev-python/snakeoil/snakeoil-0.8.4.ebuild
new file mode 100644
index 000000000000..e073443aa4a6
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 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-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 186d88f724ac..e073443aa4a6 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -23,10 +23,8 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 [[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
 
 python_test() {