gentoo resync : 15.01.2020

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 87257a4c3282..0942db995cb6 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -1,5 +1,3 @@
-DIST fudge-0.9.6.tar.gz 81653 BLAKE2B 106a0c774f9eb2f90beabfa1d84f55febaafa6c6e650b8d194464d9b7bdcf3b3ed18b943d0b7cad143f87febc75047d956d66521675c1f917f7835bf8585edd2 SHA512 69b2fa5bdd678779c0a8d9863a67e1e6724828720d2764f9f8958bc3598dcf39b22f9827efccb03014961d27d6e214c2125f639bab200b63c824c2306e3bb617
 DIST fudge-1.1.0.tar.gz 86418 BLAKE2B 3264b693bb8d4e8a0849c480b48ee79e4e99a88a819f94bfab9c098fd8ccef1171f3f0a8ca7632f29b2c22998d0847e53fcc613bbdf8ac4c1fe33aeae406997c SHA512 061d9303d28509d4e22eb2036d041359f872be85911dd85bb16e4d13bfc1cf27637f8206f215f4a37d63108ab2500d2af3f6a1a3e206fe461ead9163e0519417
-EBUILD fudge-0.9.6-r1.ebuild 935 BLAKE2B 0a847cd2435da507645be194c6808977d23ce8e2719758ca1ca84eae98e894c87700e2da12145456752fb148a8564e6d4b5e599512e3c2df64a8f8c864dfe32e SHA512 27ad709e73f64c99fd1fcf20fda6338efa2f0b1f16ecc7de98e0c45a47bfb4f2bf9e24bad4585af6b3323c96de560134b20c4c3ddb7b03292589ec44f114b6c2
-EBUILD fudge-1.1.0.ebuild 894 BLAKE2B 1a894099892ae2757d114453c1cc06fbe2abf91eaf80c130302e109e470a26d9a0d1bec084f9eb431f3d3d6430508ede8f14977cc6fbf6f9f48f0c8431be0605 SHA512 bc0cb8a1905913f8403a0160308f3f80de0a9fd707643bec0b1f172a7bac08f19e0be2cd4b0480a02ef6530f757dfe7ed3415a94287e6745fbaac79f35b713d7
+EBUILD fudge-1.1.0.ebuild 879 BLAKE2B 366f9dd0c6d672c0410e5505b27081e399b6f0bcb3016de994d5cbdb5818971eebfc676f3335512f245300cb48fde58215223d5052b643ad3b9d873e12927633 SHA512 c5c4b698897d22ed243731e9fe1f70b4f25450c6db38f5ac76b01fcccd37f0161fca128a3da4458b588b0cf11a10cb5c75a4ae6987f901642b3040b6a4947a5e
 MISC metadata.xml 308 BLAKE2B 515b12cd0857952a40c85fdb530340408506cdc4b33f54609b1489fd9ca458f8ee25d195f7cf3b151ca2d219451766714406d7788d7fabc718d2f0f234e5e588 SHA512 b453f365fc5bb8e91cf95982d92096d7f952f4d4cdef59ec1cc41e53a6e2e4861d815db845174952791a1ff67007c8c076151b2a12a1730d3ea03471cab02c56
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
deleted file mode 100644
index 91e4234c05d9..000000000000
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	find -name "._*" -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
index ccacd3ce7396..95bdaf07f19e 100644
--- a/dev-python/fudge/fudge-1.1.0.ebuild
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1