gentoo resync : 29.10.2017

3 files changed, 2 insertions, 78 deletions

diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index a7a3c0fb53de..bf85054eccbe 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,8 +1,6 @@
-DIST oslo-serialization-2.16.0.tar.gz 28204 SHA256 0ef8dfa735a42dcfd7d804c5b14576df92407f842d5e12c1fad7eb0889c444fc SHA512 d6612d99e05e3c634d8b2a2e37183884f7aeec3608080bc2bbfcd8e436a64a678e1bb294024ddec0d276fc216fa92a9117a63eb085bc110500e07f1db172e5b0 WHIRLPOOL 5d43524577569a2ee194bc92f387fad10bf15e6922fa315f9559d6a7a6ecba95dfd977f30e7a9086e6120e38fc56f83d37e64f25bc113b6f212f03753f355cbd
 DIST oslo-serialization-2.16.1.tar.gz 28733 SHA256 306d9982eae272fff05db7637971fd07d2b9b818306c9e3af87aea7f452b4844 SHA512 36e162c8f93d064d103052eb8295de7753ac9739f6c9c9f8d048090f5f2663f643f69507d9c47b9fd6142f5ba14d1eeb49120119cce5c6e60cbe09248e8f5a1d WHIRLPOOL 7cc84da7a5437b91c9f5cd5c3c3f7cb6c6e260cdc7dcceb78f98da7ec2f3af10c444fb76b9e4ff0ed07ddcb98e567c8c86f49fc2b6e3f3274f48d0f46236b2e6
 DIST oslo-serialization-2.20.0.tar.gz 28693 SHA256 fca6fbb350d560aab8a4fdc9a1128dac3b1d38b2fc9bf5ad22136ae090854802 SHA512 f15c55a28d1e99b4e01a579f6a3b20d260f8e911ea801b20b27acf3ce284a2bb0ef8a3fa6d6db2d5a094aea9efaa87308b1166ac23dab169209e06bb23d0880c WHIRLPOOL bd2d4fae43f685e2f307c944cce7b9cad21b571ef7bfe7419fba03bc912a2aaa9a1777292a53bcc518663d5b4ac05b3a1e144350d7acefa1657c0a15bad99af5
-EBUILD oslo-serialization-2.16.0.ebuild 1937 SHA256 58a5b66ee2a4a8e2af6650b676bcf4a0b3fe7026eb28f4308c0dc8c9761a46af SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e WHIRLPOOL 231853e5d196775f3f7059c362fcb40395a18656d3fa4cfbec2d95162abc059225f8a5f1a9bd62f8dd79ef8d2f5e11dec73631e1553738eaddccb1e4fd4d1e77
-EBUILD oslo-serialization-2.16.1.ebuild 1939 SHA256 36f91f8243164f0e869e5daaac9bcee02c5a15e2adb413fa0b63c0ac1b9fc0a9 SHA512 a8ca4ff1a708a175c8d4cfd7f2f92a823acbe0d809c20874beb2697cfed22082ea7f147b517fa280272576fb05ae7f3fb896249d42acd6c7f158cb52814f0148 WHIRLPOOL 9db7112f48284fff58e2354bfe64079ae38ee431f8cad7f2194cfa20fdfb58001372239363f946c460d578d6fad9038ae3d422c42fdd4e796b345862675c4a32
+EBUILD oslo-serialization-2.16.1.ebuild 1937 SHA256 58a5b66ee2a4a8e2af6650b676bcf4a0b3fe7026eb28f4308c0dc8c9761a46af SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e WHIRLPOOL 231853e5d196775f3f7059c362fcb40395a18656d3fa4cfbec2d95162abc059225f8a5f1a9bd62f8dd79ef8d2f5e11dec73631e1553738eaddccb1e4fd4d1e77
 EBUILD oslo-serialization-2.20.0.ebuild 2040 SHA256 067465a5b4194b3d0151c819dc91223e8629893100ae58ca8b04593cb3fcff6f SHA512 7557be8fb2e8c112ea12744a7aa3140f4634a33806efbc0726ada8b356c8648de5bee4697af0f50f72bfc5a39c793485dc4e0ea107eac31d4f71f15f54b1e3f2 WHIRLPOOL 9968b1f21051ab96fe290422a3a54835c4afb590583f1d5a6c54f38982fd5b10734a2af202fa55a4c1e29029494f3687c62f367d1e7e49001feabe40d96cedbf
 MISC ChangeLog 5721 SHA256 3c4fe97208a0b298fa2550afd1a94cbea5f8281fc84ca0cee4f4b82c294f079d SHA512 d07d92beb25594f326f3fc96f01d721f6acbff40c6e6d048904e8e99ec2c4e4c3569fa92472f0191c89f59f28ca2f369f54ef73a70cee5eac1eada156d8ea600 WHIRLPOOL 3298024431d56ae48be5669d0341a25f7fabf4f820528eb87e6db0894a68e64a9fe3d33eb0b98592037ee81472d3570b22ebb1ec5767072e10c7716566f98d0c
 MISC ChangeLog-2015 1824 SHA256 4ccec52a498894b723319998700c98afbc2b9d1a5cca4cc4d2c371bd2dc6cc37 SHA512 7eac3cfd9a784ef49fe8ddd47cab024cdb4bb59f6cf6f481140d29f349028689dd0b5bc115058256e0ea80406bea2800ff7bffe4bfe58bfb3e5c7f8443f7b263 WHIRLPOOL 2b9abf1853c5dc73ddad40bd4715b6a728c1cae649b3d9757dc1ad0e5eaf295a17210d57385009e9207916e57fbcbfd39466091069d5eb43a54aad37e2ea978a
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
deleted file mode 100644
index f9c7052e5501..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
+++ /dev/null
@@ -1,74 +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-1.8[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${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.18.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.16.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
index e98506682f1d..f9c7052e5501 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.16.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-1.8[${PYTHON_USEDEP}]"