gentoo resync : 28.11.2020

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 548a5d01396b..c5321cca1606 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
 DIST oslo-cache-2.6.1.tar.gz 60918 BLAKE2B 89def6f66ccb68e8725571b4f9fcc8a98c8b18dbb23186b1ed3cc09ae02eb786608c744f6ea7022fd3a832d206fe75916f74f2c000125c853993dc95f13da8f3 SHA512 20696d9a9feda9368fc261ccc124ab825b85373b2716110dcab7101346467dbf4d9e8a48b689a76ca837a8c4e97d03476b3573623ac57602f5d0e558110dd551
-EBUILD oslo-cache-2.3.0.ebuild 1021 BLAKE2B 45dd67c0cd2d60b568c2c6d7168f797d38a80356f3c1be453a685ca5ec4f517dbf5358d8b867eeab1486c74522c09278e02e65c0e6a21c2e38ea35ed6c0c7cd9 SHA512 032d1738c469567db402750311e45fd5f1004ad6074457705ff24107f60124f604c1fb432953a5fd618727f502371c10a02415190db36e808086e52e1f66fb2b
-EBUILD oslo-cache-2.6.1.ebuild 942 BLAKE2B a30f43e6862181c387adad6c59e8f2c41bf6a8cb96b0ecaf4556a4dde09f81b41384cb4f72640a6229f1084982d42bb9e2498443c7b8b16dbe855f3e8f846b36 SHA512 f2aa6aa6f9bec4d740c18b5dbfc71930a1e78f81df0e33f8c3faa05f7440509e25857a7030cedb18a66367cebf09e80a4f68cb62d315cee5368ff42554ea85b1
+EBUILD oslo-cache-2.6.1.ebuild 940 BLAKE2B 87bb1e183405904a11a20bad21aec002f7154d8484ab94682774db93b03f770430897e49ecbfe1607297b93ab237703f7f9196be887ae8862e0500149feccd97 SHA512 704349278292d41da54107eaf34b0be260e3315b25d816876b3b17d1379025b80436e8b90af90b48fc07ce5b40ee4fc7c9c139fa330677c9932208fa92a0b462
 MISC metadata.xml 398 BLAKE2B f9997c49c6a17064ae392ff66df20172b131e2a6df98a2ad9e86aeb111d4cba231d553cf934f513d5dbe22da01e496083ea3baec31004c1058aad5722528199a SHA512 68cbe59a88b5df92314715c25ff263874fa64193da50899c89bf9f0df2f065769d75b643994b7c57101bb9847345758bb792a649d0f7fd53a06ae85de9161abd
diff --git a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
deleted file mode 100644
index d4994a79e4e3..000000000000
--- a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild b/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
index eee84e0c657c..09c1d3cf7387 100644
--- a/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]