gentoo resync : 28.11.2020

3 files changed, 2 insertions, 40 deletions

diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index ca35ba5d6770..88dae69b8b4b 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
 DIST oslo-upgradecheck-1.1.1.tar.gz 15096 BLAKE2B 7aac69c8078d8f6e89c16801fc61bf9d44811b2333ed67d4f2b8a9e432dd8ecb1f90010b796965e838267991a16c0f5b19f25afc98cbb6458906e3af656f91da SHA512 89b7fca8a95195081e83b336d3e55a9c67802ff3b88fbb5849afa7c7424212c03c3a96a916a6a62bcab18ac002f73ab7a4dcc92859e6bcc9b4002798756040b2
-EBUILD oslo-upgradecheck-1.0.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
-EBUILD oslo-upgradecheck-1.1.1.ebuild 849 BLAKE2B c9ccf5d0da426671ba3e529c15d93e068fae99e5008decf0b3e04e2e9cb301018ffdb2ec4ad74b0d2c79268cc51f072185598213a8c97a032e18cd9f4e828295 SHA512 1a2d107d6c8b4ae951ca1d62402228e634313b72a0b1b21cb309f6aa313829ee68f06a10f3793bb936ddf16039c3481c5d72f887b3e9c2903b707e26c7d387b7
+EBUILD oslo-upgradecheck-1.1.1.ebuild 847 BLAKE2B 2a1fd7d99fb4d2cbf5d572a257d063876873f0fc29bdd48d47ba23798a2925e4edc8d8e29e25d4c5d09a3e01c4111ab5511cb7efe0238c0c676f54a53b3bdeaa SHA512 fc86fe7b414798b57ef6cf94644ae676f84e79afe5cb31027c307ff76f06ace0acd1d12c9e131f8d48e8c9c3463826d3c773dee6fbd4bb179b053e8f689f3409
 MISC metadata.xml 397 BLAKE2B 50bee461fdbd803e7600a18b7a1ddcf073c2bc5eaf7d457b0d7d7cabc7e7e5b53da4875b1729aa9331699cf152eb0796af280297179f0daa1ed9d84fc1176998 SHA512 3620622e7c922e821acfc45d9cc1d7344eb65fdfb184e6588a00e4e0e2e1a9810637e45be997135f45d572dc417bc96c45dad2480ae1110dbe99d7d67df6af05
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
deleted file mode 100644
index ff64429a1ec8..000000000000
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +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 i18n library"
-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"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
index a20e0f654a7a..7ead889a6e84 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]