gentoo resync : 12.05.2022

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index e8dce6b3b928..ad6ba47b6bce 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,4 +1,3 @@
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
-EBUILD paste-3.5.0-r1.ebuild 846 BLAKE2B 90fbc461f37bab13fba40290c44f632c2eefc32fa674516f2f79894c1f5c288d6b9b5e03e8d21df070ae427e14c976c71b3419b8aa91767460dff41d210e7574 SHA512 09b85ef41758cbecdbbcdc1ba621ae554c8d8e9d616fa7527df2d03ec4cfe0d997cfab14901d976ca9c47fdffa55acc1f49bda5b3ba737427b0308e0565e4666
-EBUILD paste-3.5.0.ebuild 1087 BLAKE2B 5442735272dcd193c3c2161b0eb9b5d02b1a2e44c0ee82307321907c6e391fcc6744b5d25c36eb771a4de8f7d04bffb7e27327100f59e0f105057c50202a5a7d SHA512 8179d789a0a6f1d2b00e843fb3044d3ebdecdfebc420519049ebb710be6e5bcf9446353d40cccb8e39a147b40015e2381736fcd5039db9e95ba4c6811bf5fc3d
+EBUILD paste-3.5.0-r2.ebuild 874 BLAKE2B 7d1f864fff2172f8eedcc0ff1fee7e5698bb9c8557fb7eb91f8d954c56c75a1f9cdf5dc0d1dd368d2af58e516d1a9e0776bb17766d448bbcfd46822c2e07d5ed SHA512 ce749ba7ac3a459437214488a8c5f9e69c8dc01ac14ecded235738fbfae872e0a4d2e022b9109f980d4ffb460a6748a02f24332f8230bc803676371988db92b8
 MISC metadata.xml 628 BLAKE2B 96690448ed95a0b6794142c3641a2e5baa5618926df08f8b25850f67cbd05fdf8ec165f7b7db421d2b96b156fb1f7ce123388d7d70769e777acde6d15c88b955 SHA512 a33c225ca164a23e44820e92bc94cff49383bf792c91e8d432f9bc0a0de537b0e4b01a1b99097df1d2e8984554b78be5101db556e1c37e00e9b5002d0729e6b9
diff --git a/dev-python/paste/paste-3.5.0-r1.ebuild b/dev-python/paste/paste-3.5.0-r2.ebuild
index 243ab2deafcf..98ae3580d026 100644
--- a/dev-python/paste/paste-3.5.0-r1.ebuild
+++ b/dev-python/paste/paste-3.5.0-r2.ebuild
@@ -16,10 +16,11 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-paste
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
deleted file mode 100644
index ca4614a321c6..000000000000
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# TODO: 'Address already in use'
-	sed -e 's:test_address_family_v4:_&:' \
-		-i tests/test_httpserver.py || die
-
-	# Remove a test that runs against the paste website.
-	rm tests/test_proxy.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name '*.pth' -delete || die
-}