gentoo resync : 21.12.2017

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 0735cd6cd49d..5621635ea3b6 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.log-3.20.1.tar.gz 69615 BLAKE2B 60c8c37274d71ff80e80e406eadaf7b9d9ca3d0faf16ca51b196440e444410fce36d8f98a2d57e80b73167d77b6a6c0fdc986fe2bd3c88808ea1b856508a9ac5 SHA512 9f802251177a8a822f5944729ac226e226cf7dbe94b9d5b4e5eedb7c64f6968a35810cc288b774085f16f77eaffabf752636bc51c52d50e87cc2840b76076f13
-DIST oslo.log-3.30.0.tar.gz 78044 BLAKE2B 9bc476496ccba0358d07435af5a3e1e46fba780918305253180915ce1e0a392e3f5e2673c0fc4495f6980b6b384ccaa3564f55e7fc02acc4478ba8445894e3b9 SHA512 bdfd1ea1e8995b986c252680c26fd7be31ad820532f84fab893758782321be326ce32d063f1e413aaa4609f84fa15de18a0b460bb7c90954567f7a386ef9ff20
 DIST oslo.log-3.30.1.tar.gz 78884 BLAKE2B d45e6d2e02877f9d913e449d8f4cd08e271712e96faf1d47ea534319f3af073e122d2910977b8cfe28f683786bf645beb335fc6d5d0400058e11a8a31941a769 SHA512 0a53a3228ccb00a58c02577ec391ada064c17999d51fcd3e6471a46d601473c5ab5686cfd61d11ebb33a594dd5845317920fdce3ca48283a39dec28f1a23b795
 EBUILD oslo-log-3.20.1.ebuild 1954 BLAKE2B e20b053aa60a6b28a1c625426421ec0fca33068566acdccc103e90f0dea015422f3547df670770e089a5b56b6974bf5d812b16b3cb82abdfd79f8ab9ec992edc SHA512 0f4ef9b2b23af2273b2d47fc54a77c6eb058c1adbac7f8f231afeba187898d1a34ea29d79dd271932f50e45ae506eac8a039b41a41f38098a11de4c80907f8f1
-EBUILD oslo-log-3.30.0.ebuild 2209 BLAKE2B 2b9947268fc3766938d2f13daf4c71177274d8541e98a749025335ca0222908eb2fc2ab0bb448365e1a431a7b60b7772328cd1782e3ba60058e5f78b4469adb5 SHA512 48c0e92c51f7cfad8a7c5218b7a75d9f4ce9c9854bd5653dbac85f722aa190069c51077f02f8a1671b0e81a4ef33da6ba1c82d10349f1222f32cda5f206aa462
-EBUILD oslo-log-3.30.1.ebuild 2211 BLAKE2B 49e78b6c6a2588062981f74fa81dd08fc7b7c35c791f01950160e2368473e4c76230672f8282f5c59e42d378b639bf47660844cd77bfde81d0ee33a2b76b46f4 SHA512 dd05325174b78bcb09ffd84169f98aed9f97ed60d1bee513d6248c7b5960e465c136a1f5a0ee41b7283e91a22ada5ecf1a4c783520440d39fc66a3b1306616b3
+EBUILD oslo-log-3.30.1.ebuild 2209 BLAKE2B b5323391e0c490ff5b3e1230a6df69a26f45a9e9caf759ff03a6b8f9ef623b261bde98dc90c0a577a30e9f419999b4403fc3dfebb3080d9b3b6a6f994649cbbb SHA512 50ad442ad63f6a9f10cc9770ab8b4b89486420d21d7f6fdb3370287ad6d33279d676a377a55b6c7e9ea1a9f5b20d7c44ed2201c821caae3ad31b0487921cba5d
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.30.0.ebuild b/dev-python/oslo-log/oslo-log-3.30.0.ebuild
deleted file mode 100644
index 41ea105dace5..000000000000
--- a/dev-python/oslo-log/oslo-log-3.30.0.ebuild
+++ /dev/null
@@ -1,63 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.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/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=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/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=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}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-3.30.1.ebuild b/dev-python/oslo-log/oslo-log-3.30.1.ebuild
index 58f754efa339..e81f7dc5e4f6 100644
--- a/dev-python/oslo-log/oslo-log-3.30.1.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.30.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]