gentoo resync : 05.02.2020

3 files changed, 5 insertions, 43 deletions

diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index deb8f2ae596c..11d69afdd48a 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,4 +1,3 @@
 DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
-EBUILD pastedeploy-2.0.1-r1.ebuild 1004 BLAKE2B 4f932dbc6510af32c43dd2779f7e262fbff8af850aef6828fcc91f8f5fe169a27e00e00c5feb2faa4a2b6d9c443a3e6d9fca7dff6669751fe9d31990aeeb4a4c SHA512 23af06109ce4ebef08d00ad5fabd77af4b203296d27d34b26bef9b304211dc775f8161c926be3bd981ea25f56ebd773b4eb333138effa862d7e6418a37ed8d11
-EBUILD pastedeploy-2.0.1.ebuild 1003 BLAKE2B fe0798d2471f2415e1c85136e67aeb20335aebbe4d4dbd8137bb237a26f7a95e57600773cb6286908d113bb15e38093151c616221d697a24a10ea3b1d7cc733a SHA512 008b1b9d597442d869c99f34019f7712376618f7da47b3e04950d096c90456152aff9ff0d1c1c449df3cd4cb15d781bd570529d017058e3c3568f5b6cdbd6f3f
+EBUILD pastedeploy-2.0.1-r1.ebuild 987 BLAKE2B 004c11d830002500b6436fcb19abc2c86e514230ea5c849b781c383e8a2f5939278462e2f8cef699ba95530d77f91d79be7539dde7545b6209d8745e79403e9b SHA512 a1755d09e9f587afe15c6cb55e11a03630607d8a7fe4849754c589640eb5ef73977396c14eb6092b87cf43870e4b4b4bfc77c1293675cf98abfa0d559e8d0e20
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
index d16669ada327..cf1492eec8ed 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -16,11 +18,10 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
deleted file mode 100644
index 4b495dbfbe60..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}