gentoo resync : 21.12.2017

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 45c0e4dcbeb5..13287dad7439 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,7 +1,5 @@
 DIST oslo-serialization-2.16.1.tar.gz 28733 BLAKE2B 7c2b776d1fc9ac249ca6200e13356984fbabaf66fc9f6f3d0418a39b213f4b67550cbad505508582f3a002a3e65d5ce031184404df697f152c627021b15d93b2 SHA512 36e162c8f93d064d103052eb8295de7753ac9739f6c9c9f8d048090f5f2663f643f69507d9c47b9fd6142f5ba14d1eeb49120119cce5c6e60cbe09248e8f5a1d
-DIST oslo-serialization-2.20.0.tar.gz 28693 BLAKE2B 15ee750a2a4407bc652c7899a8c2dbf3ac5cd57c27f76bac0a70e7303269f41e19fd893880c32ae94b3bc1ddc9d88776d59b92a83c30dc74945faf5c53bce66e SHA512 f15c55a28d1e99b4e01a579f6a3b20d260f8e911ea801b20b27acf3ce284a2bb0ef8a3fa6d6db2d5a094aea9efaa87308b1166ac23dab169209e06bb23d0880c
 DIST oslo-serialization-2.20.1.tar.gz 28701 BLAKE2B c854f6add39d7a995469faeccb9da63f12741b529143fb5d6e796b7534c58c1cc509ac18b8fac5ca73d4114c80558c42452acd6f4ce896e564d8074140b75c2c SHA512 4844544df91a529744cb8e869592e77fd9bb8bd26ff7b13ee4a37d9b9c31c181205663f98ee4795cb0e593b029744293aa029cc5ffa67851f4a27d27a6cae298
 EBUILD oslo-serialization-2.16.1.ebuild 1937 BLAKE2B 6bc59ae526e9e3d0059fd0b13c4b08b14d5aa854d09bc7ddfa55816d3a5c191a0c9c0bb6ad23dc9f6f6cdafb863c807ad118169a283019fd6834f0163c40125f SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e
-EBUILD oslo-serialization-2.20.0.ebuild 2040 BLAKE2B 99fc7a71eff56ade23a6fb8ffbbcba1eb7f1dc003e44f7cdd8a4adc5789671d188bd32a309268935de0808a7644e6091696d920f413b48fc226a09979fc447ee SHA512 7557be8fb2e8c112ea12744a7aa3140f4634a33806efbc0726ada8b356c8648de5bee4697af0f50f72bfc5a39c793485dc4e0ea107eac31d4f71f15f54b1e3f2
-EBUILD oslo-serialization-2.20.1.ebuild 2042 BLAKE2B f7fd332dd115cbf4e7ca359e47270f5b00caf3facff5303b6a10a7f4b079f5a05b10912f66038b89bae2bf8ffdc46131d6000e789cd6c2c02512ceec4fec823c SHA512 234447e68348eadf61d857cab5594a04e017710647cc75275a11e1806de0eba9540d15af2cca2ac39e7c95b25e9eaa2e012773a778c9f1d1dde2d3ddeac8c2df
+EBUILD oslo-serialization-2.20.1.ebuild 2040 BLAKE2B ee5499b2a8801af8608153998641b6bcbed64735f51461bde750f4c6842625c1e1c48d02972db31853720477ba150e48ec97384259530ebf54f68fb6e9c940df SHA512 27e2caa11cdddce256e2f2daaede5c408a88831ddbb0b3ec107f9a65b5648da79576a64220f3a4adf60ea3157a2c0bb837780626e1933058f5465fa42d115be4
 MISC metadata.xml 481 BLAKE2B 90f53fcdeb1a61f964745333fd7edd154ee61b05382b6c0a1aa54e78d7486cdce6757fc54c01a1ba2c7d9362f0ddf1045bf77dcc76036b995b1e0f0ed8e9b7c7 SHA512 41eb0d120210769caf9bc59d2ca53d136ec6dafb8e4eeb0dff126eacee1029d49ce18d85b6b19749a590579f63ffffe4c9d69919443c59c36b133d60629a6815
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild
deleted file mode 100644
index 2d9c60b98a5f..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-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"
-
-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? (
-		virtual/python-ipaddress[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	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-2.20.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.20.1.ebuild
index 4a9c7ed9a47d..aef5577f97d6 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.20.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]