gentoo auto-resync : 19:11:2022 - 13:00:31

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 58f8e19c097a..2af6ff9a618e 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,6 +1,4 @@
 AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
-DIST pypiserver-1.5.0.gh.tar.gz 149963 BLAKE2B bfc0760982f97e93357702342eb5b1776f72c43e66742a8741ee2ba3109839006e99e49b65e04380097500c400e09bce77b74fc5f9072c7670349817ae3a73cb SHA512 c93e724a3aa6ec265d483c2989129292a05132d3d52db6d9b9c1429610ee23b56e106c9389bdfaad142f34071ee258bdd4291668c11f8bb412df043bf4555611
 DIST pypiserver-1.5.1.gh.tar.gz 150145 BLAKE2B 23ceba3064da4a0d7a19af0a48f370913948dd8cec101cdee43f59c78087b71adcb0fb3a494ca1a94cf3cc2c42751f8710f9cf9037401d73bec7f94f300dbf6b SHA512 35797c37ecfc2c7de21211c5c5f9c0edf98ba49e54fbee779099e411dde73377706aeddcd3dfb34c3ae2ef7d7f4ebf9146c3fb02b0778742d688f8ac17a64cfd
-EBUILD pypiserver-1.5.0-r2.ebuild 1769 BLAKE2B 59a0dbae7110b1979f31260f9425dfcdace440950a7980ae29c3f881d0abf14315f0e5e55867d0722e316619812d4fff2826042ea3b099911d035dc0454badf0 SHA512 943c7bb68b3b75e9f4b08291d4c37104b11ca155b0e4f492bf4076c2da3708d5d4f73a3c6604913eadcc41da8e8301e8a0df5282f8a931041901ef8b34e783a2
-EBUILD pypiserver-1.5.1.ebuild 1784 BLAKE2B 1352c62381edc8a7bbd3d2c71e8d435b8b8453cef4268529303d87376e4448b0ee1753312a172a2aaf0edf2535708ebbd0a63498cc1244cecdd884cfb641e9c7 SHA512 2f74cbba811498af482c0d6cc2ef2abe91459ab25687cf3afd927fd93fbe74c8e8e9e4f65e5cec502bbafd0ee1f40f1f3b8772f87ebd57a28aea1b735f6bcd34
+EBUILD pypiserver-1.5.1.ebuild 1776 BLAKE2B dd304915e2e2da8b7504e02afc9201c2cdf1a267c9ec5595458cff873da2ef4642584d6d16fe10d6d55f34e453a0a13bdb26a60f91f3dab0b22451005c19b5d9 SHA512 481899351666c0c9ed79bde2297229d4c14afcb29ac01d3a158f26bef1e90800d6f14d2491709ff69ddb057171aeb707b766867836ebef91122fea97ce1eefd6
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
deleted file mode 100644
index f62175c1fedc..000000000000
--- a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="
-	https://github.com/pypiserver/pypiserver/
-	https://pypi.org/project/pypiserver/
-"
-SRC_URI="
-	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
-"
-# NB: many test deps are optional/specific to tests we skip
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-bottle.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove bundled bottle (sic!)
-	rm pypiserver/bottle.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pipInstall_openOk
-		tests/test_server.py::test_pipInstall_authedOk
-		# TODO
-		tests/test_app.py::test_root_count
-		tests/test_server.py::test_pip_install_open_succeeds
-		tests/test_server.py::test_pip_install_authed_succeeds
-		# seems to rely on internal bottle details
-		tests/test_main.py::test_auto_servers
-	)
-
-	if ! has_version dev-python/twine; then
-		EPYTEST_DESELECT+=(
-			tests/test_server.py::test_twine_upload
-			tests/test_server.py::test_twine_register
-		)
-	fi
-
-	epytest tests
-}
diff --git a/dev-python/pypiserver/pypiserver-1.5.1.ebuild b/dev-python/pypiserver/pypiserver-1.5.1.ebuild
index 3796c36d2b11..f5a17201e7d2 100644
--- a/dev-python/pypiserver/pypiserver-1.5.1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/bottle[${PYTHON_USEDEP}]