gentoo resync : 15.09.2018

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 50e83d4bcc34..6c531fef1975 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,7 +1,5 @@
-DIST oslo.messaging-5.35.0.tar.gz 325918 BLAKE2B d219a630b0958930bdd84693f43030c34c7beddce42f017f7f5ffddf5a6530c59b3eb29c5110a468a4606715f766a62abe3bd2d77c79ce025beafee6f322321e SHA512 30989d9418d30570ce212110b263ac7227acc3d6cd05305f7df23844253a81265c76e3fd93228e13a25399f5188431fa2f959a2c15639162abb5297a6fb7d4a1
 DIST oslo.messaging-5.35.1.tar.gz 325408 BLAKE2B 89d16f094962d3603634a0925d0d2f569fcff0e59da7ca99462d0c0faad7fa47b0eade2b7c24b29585901c1d04bc6f4bf91ee04b4dfad0a63eb3100261e99e39 SHA512 0022b394812384d13189cab9eb99f45eae2a134e50a4d7ec2473ea35fc2712d2bf7c2b2dd71caa01a38dc47f7f9793130176cbd1afc041675ecb20282e1a653f
 DIST oslo.messaging-8.1.0.tar.gz 294743 BLAKE2B 3a3ef8b5ac254ed79ea0fd5851f7064623a2996a62f44e48000b9faad34ca13b5594b36bf3f2938f3f7b60c046d9b6fde7be08cf2b53664a58aebd0f854b443a SHA512 f4b2f0119d18e5e4bd6d4fdcdfd25d8c5b864d5bcbe7cc495950d94b3dd9bfc5fbd5b326b020a6f24050fc63b5884a768084a4512f8d1b73907fa9ef309968d7
-EBUILD oslo-messaging-5.35.0.ebuild 1994 BLAKE2B 4f27fd86da05b0d9850922ddf2224de33972cc3087841f31401b2bb30205ee42d8499b139fb09dc8fa2824e3bb7f39b74464bf34dc63a421719c977ba8c52a67 SHA512 60fc15a7d6f23ab1485d34412e6bd8408a03cd42d154adc2aabb90ce8cdc357994aa6241abff5ed28cb500d7037277c2c17a218dcea6edb9075bd77f5c69e90c
-EBUILD oslo-messaging-5.35.1.ebuild 1996 BLAKE2B 6f46ade1e7eb6014967fa2cc858ca52ff2c68b7e65513eb0f25ad610985a764a0ef66c549d48096264133b42e4352b95e02e521528c21c335a31a8e71b32595e SHA512 e8cd8d5590e97d2cf7b224df92f7742e3f077ca6bff93e6ef3521b2ec7aed19168f2af07112b90f7648055bd54e164b1c186dc18dd20bc3f88de86f936e412aa
+EBUILD oslo-messaging-5.35.1.ebuild 1994 BLAKE2B ecb9b4136c852224af543bd87dbbab446e29e44601d655a2de24b9b8e817df13a647e4dc2e30d02b1a3d5802a4cdf9dfd9f02890412d6e35f0adbe5dc5a11509 SHA512 cce69a82969b6b0ae8897a17b786e7934098955642cc20255ef60f7399e8a9cc35b1fdb8f9ca9ab847adad76888c827d9966c268b7e8b8e6873ab18cbc647a11
 EBUILD oslo-messaging-8.1.0.ebuild 1950 BLAKE2B 4d4f726d6788b9c41c4aac13e08c067a74ccad3707d7ba87fa6010069e8570126eeacf4ebe6ac413e66eb0815db6a24001fe22cb86de9b27332394a138564a73 SHA512 590db86f84c3318b2141b0b17f2ccf3a0010344a0b71f1d27790063e133981fc8b07188161769c5885d54ef4aaede01e3292358fa7f5d751611574b63867cbe6
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
deleted file mode 100644
index 374b9ef23af9..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.1.1[${PYTHON_USEDEP}]
-	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild
index 050f4f760c24..f12b4dbaf332 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"