gentoo resync : 06.04.2022

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 31377d867271..db3cbb9d1b3d 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,4 +1,3 @@
 DIST diskcache-5.4.0.gh.tar.gz 653968 BLAKE2B 765f0d8d9c4b3a8bf9e4c52b3b931867dc0b92aa7b891d6d64cbfe9e7ff491662a1fa2f0af776f9b3dcc4b441f50b68dc009a29e9b0d37f99add9033f4fb94d8 SHA512 cc15ff0b06b2a5708692f50e185699bd53e60408cef25053bcb5aaffec2795dd53c3bfe4b131a47f68c43388927ecc034c43233c38494cb2f6e40636344270fc
-EBUILD diskcache-5.4.0-r1.ebuild 931 BLAKE2B 1e6a9706363ba4cefaf547abf2f74e756a5d6a817ca475418752ea7462e1812e2d870d5399541a7d20cc519c66c6abe2ae60f799e3c2e88bd4c2bd6e62200754 SHA512 64014f02af783f86a0564e0d428fc19ef6c6c57b5ee744e6a1d6c03d5f2775156cbeaabf2f3e24b2cce16ea666a3605b629133312c475b4e689b642f38deadd0
-EBUILD diskcache-5.4.0.ebuild 885 BLAKE2B dae18c65738660b24ef67eda072cdc0d282e1cf9c2a6bb0098765f00590f76f9d7b890463345643810e7cb9bd5c0c58b617ed5d210ed48ad3c3bfeef9bbe14db SHA512 c767a20dd918b0946db2269c02258228ed265d7a74af9dcbc2d5677dbbf003d5aff6ff1f11e8f0cf8c89f0425ab64fc8f2ccab323b440fe34eb0d995ec374939
+EBUILD diskcache-5.4.0-r1.ebuild 923 BLAKE2B be8673e54e05e87d090488309df4c6f24c50d9379c5a3615b41718102679a0b061510dbcb6b9efac4d5740fa949222e89a0dfc2f8f345db8336ac39a73f73c8a SHA512 3be8289c6c4b5333cd59842d686614bafa5c60fffe2b3e5302a2060c2a3d2c2bffb3cdcbe691ef922b78ad69bddcdeabae474fe73bb1a93c44c9e5afce039e80
 MISC metadata.xml 417 BLAKE2B ea6f6d25bf863d8be1af817e00d06d668672ddb5cdd938f0bb1a0e92712bdf116540c36014778a160be6ec6144db406f1a1f0d804c3218e38b8bbfc7c1456cc9 SHA512 c5812352980d74ddadbe2192c2c724369ae37d2d0c3d6018220d2ab0bf07559e569af816f3503b8db825a7689cca7a340adc4bd3d1bd73893446a41a7bfb6882
diff --git a/dev-python/diskcache/diskcache-5.4.0-r1.ebuild b/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
index 76a1c5fc6504..41c26e65f9d8 100644
--- a/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/diskcache/diskcache-5.4.0.ebuild b/dev-python/diskcache/diskcache-5.4.0.ebuild
deleted file mode 100644
index 42daaf56c9bb..000000000000
--- a/dev-python/diskcache/diskcache-5.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
-	https://github.com/grantjenks/python-diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="
-	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/python-diskcache-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		>=dev-python/django-3.2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove dep on pytest-xdist and pytest-cov
-	sed -i -e '/-n auto/d' -e '/--cov/d' tox.ini || die
-
-	distutils-r1_src_prepare
-}