gentoo resync : 04.07.2020

3 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index a0a706525d1e..d659b4b1c958 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
 DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
-EBUILD oslo-serialization-2.28.2.ebuild 2076 BLAKE2B f06a95e8223ad64c4056587654ef214a73363437e0772f18f42cc6e0f6defa38feedb97840e1c8052ada654aaa88e053c6504daba9ba37c04aa43e48515b3121 SHA512 a8d776dbe338b0aa799db28d0701b073aa78239b666afbfdad1634c8a02c679c6d94b326afd5c54d29dbd0f2f1376deba2d3fb4573794a8987dd591329937640
-EBUILD oslo-serialization-3.1.1.ebuild 1003 BLAKE2B 638027c5c6ba4eb54763df3d126e915c412b132246ba622ec57e145bf214ccec16c55202c0fe05ff5ed883069ff69a7b0b60cd4ae9124e567f715f94f61293f1 SHA512 f720ee345e5937028fff4c2dc7fc1d3c5f5a4e34e8d6a580c2605301663e0918982d18922f37799d424712ec7ff1ac9afe0fb1f8c1646520c4ce04ecfd6c49b4
+EBUILD oslo-serialization-3.1.1.ebuild 1001 BLAKE2B b04a38f4b4bbf4f26be99061028e362a26c3c42562ad2f855c6eb783f3d0565e4e9f2e3f0ede72c863fa161b476ab241d03d245f84c28d33ee17fd135118fc42 SHA512 b33faa3d60129eb361d2d751fc91fcc39b6d3838f1808143e331ac11b0644b16cfde3b24960a21223bdf961d98a84ef45a741455290352f4e2fe5cd3a740e02a
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
deleted file mode 100644
index 0179307703c9..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ /dev/null
@@ -1,77 +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 Serialization 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="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
index 2b721387653a..f5f4d9cb8de3 100644
--- a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]