gentoo resync : 21.12.2017

3 files changed, 2 insertions, 103 deletions

diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 7c8512284859..32d75b591fb4 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,7 +1,5 @@
 DIST oslo-utils-3.22.1.tar.gz 84249 BLAKE2B 83c322de4f299999656abc3917742385defe33852005431abe89541086fd339149d9aaa36964245b838251788b1068653d5643349b31ccabbf420a4f58d6aa5f SHA512 afb21f8267f815e192a667fec247ae2e0d8163d7872805d36c4399928b475e34790136810607e8706ea37e32eb31da2fdc2b9defb2e06f7ba0a7235b2de1abc9
-DIST oslo-utils-3.28.0.tar.gz 85122 BLAKE2B 46bd6c4319b33ff8959a486cbb1fd06900bfdb8ef61346c867d91b96188f99889036d756b93e0add7116ba5c7dafc42d2c30718c1120d25c79fa0477d2eaa66a SHA512 0206f4e0fcf0c3bdc46062a37e14e37d7a2d141665b7f1ff4c0d5966d04403dffba8814d216b3dc010d0e845c983f3335095c1dee0373b82150447c914f37fe4
 DIST oslo-utils-3.28.1.tar.gz 85889 BLAKE2B b789bcee79f30a59a178c51997b42bc63bc67b998aedf2972b7f01c098992236eb2535a4e7fc43cbde5888340b0b14930093b49142fc9434fa7ea0069733b7d7 SHA512 f46c097378af27b8b1e7c9ff0908e3077c19c819ca02a9c181a54fd77a62506668ca22b42d5127a9e49f62244d034b5cef0b7c8c751b55a651a6f46fff0b4c02
 EBUILD oslo-utils-3.22.1.ebuild 2692 BLAKE2B be65b7e52b65e0ecebb118b47018de878e6cfec1497e2cef586a64c159caf2edcc7bfce6e78028a80df658188d961fdee1f14c9b629cf8e9ab421a3a91d9d1a3 SHA512 be67e1492be16e46cdc3468a17b0f1445b841e1cef81dbf5133741645a3e9461d38cca6416cbc182c0428aff13f3db7d5c7fc1dcf375b22f1b4ad4e3558d6e3f
-EBUILD oslo-utils-3.28.0.ebuild 2891 BLAKE2B 9db2006946af29f5b94edd420ce646133b184d9198cc6c42d7ba45f75410d187600a6dc2aed6d0a5796c89c36842a8797ddce0bee3624b07e828ed8436ac0d50 SHA512 9ad7c2519645cea12503f583ad53ed19fdb96ef1e7984e9931b01db241206bc688be8f600d9998926b0671f4278d1cfe1be500400c4bbeebfab90ef3524721f4
-EBUILD oslo-utils-3.28.1.ebuild 2893 BLAKE2B 1e05188e379b2e91496458e1330286f4c956d7fb13853aaf8887d8011ee0046bb8ad76a05c73b9525e518b93b61989d809870e0e3c09937fa0a71b5dd0920662 SHA512 2e9da456cf9fd107b633eac2b1cb12d4ce631b99672aaac405cdeabe7c415514d1f1b20343657dfa1e0df7d3b3fbd7a44ec367ee025e15d83774a3b05a9c496c
+EBUILD oslo-utils-3.28.1.ebuild 2891 BLAKE2B 567b649091be48e947dc0c92e7880ed9182cf6c180d74b67597089e7d2eb621d28609db80130fa26c2ac67e403fb69e0206d497fba33fc572ea03c181f96fa34 SHA512 129aa2f0e3c5b65a69adb16a7518a264c9a24f516efa641e8cd9cbb1619b7119f1f8d6bedb8c9c547c9649bda705920d292b9c71293dedd6097c32eb58f4c224
 MISC metadata.xml 473 BLAKE2B e3b911c3e0e8d488eb537223f3423338abb8f8206f1d2e8c5a5260674f7815aad6ac497f519d1c3870b979c8ceb415df6882b55c5c13e5f28474e9ecba52a961 SHA512 17ac5a7dca516e43af1409f5800b112c829edb6550cbb7d91eb394e15cebceeff3c895a0250126cfc869f4ce0e1b05dd494ba614934ac06ed91402e3af048634
diff --git a/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild
deleted file mode 100644
index 06e1e03afcfa..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild
+++ /dev/null
@@ -1,99 +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 Utility 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? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.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}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	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-utils/oslo-utils-3.28.1.ebuild b/dev-python/oslo-utils/oslo-utils-3.28.1.ebuild
index 74c65f569666..80b3b8cbd1cf 100644
--- a/dev-python/oslo-utils/oslo-utils-3.28.1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.28.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}]