gentoo resync : 31.01.2018

4 files changed, 2 insertions, 95 deletions

diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index d22ffbc74c43..ee0023252f95 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,7 +1,3 @@
-DIST os-brick-1.11.0.tar.gz 140220 BLAKE2B b67dd7222f16136f561caaba3344b2e721a1038afd39e1786a22541bfa42ca137ed60411d4a161aa57e1467b3451a92a3b3d3b05c025ab797fce2dac63345e9e SHA512 69eeaa6b1fec9732e07ad2527fec2e624ed352bc18fe6d96546e787869d3d388113bea378e64a1d346be2dcd93eb8f69f94655f0fa8d9230fa8fc8e9a1e48847
-DIST os-brick-1.15.4.tar.gz 161212 BLAKE2B ffe1fb1965b097a2ceff19dccbc473e79692d700a57024b38b93b16eb12e727755236b3914efcb656b6cbee5fc4c31ec2d2588182391bd84dd2e47980906c067 SHA512 9e13e1d562eb62ef393c531dff27d7d2623f9843deb991fb1be74a42bb5e558875d7195c1499f147426734bad3c4b3907c65f036ffa65f23ab6585d206bed696
 DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353c033affd9834294c4d505a0d9e580f0f829a5e5c96fdb53f1cf2a29ba63ded6fbba4ae662a5dad0d20fdf98356b SHA512 c73c0f227e68aeba80b6b5687fc876e7dfe3ba36a800b7241ed08a0f189e0a57adfdf3b3e1f63230514ddac848be84e1f05e6be6aa0f50412695c6d37124717d
-EBUILD os-brick-1.11.0.ebuild 1407 BLAKE2B 09f0d998a887f252a7207453c4e8f5c86ee6ffb2b4b504a4fb8972c197c7a381b37b0ce2a3fe98970f243fc36f0cf3e8c50cf7d9cda1cd898dbc0850ae1b2d16 SHA512 b4d4f88a23981167a261796ac783333b15ad3462f735b30d76e2d6c6505a57bc4f79cc817b32750a14de6cd2a7480b294f9efb530508a11ae7aa95e3fb9814f1
-EBUILD os-brick-1.15.4.ebuild 1636 BLAKE2B 193234b7ef8f9c843b0f188350ad153e346868d4fae17b3969711e2caaa919f6457e0ecea218cea2ce61d253db39738bbe738c3e7b9a53a502875abe76cc08b1 SHA512 126de6913d114e6b0c103716489c5931ba2b3fb7475dedc5687e30416a425b40111539a08a90c1583e21807fdfd668a13d4a67eda1e0fb787c4458a7f2d3538c
-EBUILD os-brick-1.15.5.ebuild 1638 BLAKE2B 00a1fdeab7dec59cb42345ca78eac409ec7c8c891971cf5fcdaca9845e33d13445e75d996933206590138e0df023d7dd05a469d635fd92376e710ef0eeabf189 SHA512 ba312e2bf07612d2d5075013d6a044468591dcf9c9f15841f35a33ba65d28c17e9813c949ed27059f1a53b9b5c7c31f4c377027d0393ae78376c30439b179d86
+EBUILD os-brick-1.15.5.ebuild 1636 BLAKE2B efa6611d1e5a4aff93de21ac1620ae1197cb4f279c364d3f0fc0f7938fa5039b460eafa99894003d49a82dafd75fd0bcfe34ad7f2f412e67fd78278ae8fb2151 SHA512 f2f08b712035ef08499f19d4ee4526d6549faa0a0826d9398a8ea67985cca6d570c84d2ac667a279bb411301f33e1082180fa19e71c2c65c7aee2cb0ce0daeb5
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-1.11.0.ebuild b/dev-python/os-brick/os-brick-1.11.0.ebuild
deleted file mode 100644
index a0d100a46f60..000000000000
--- a/dev-python/os-brick/os-brick-1.11.0.ebuild
+++ /dev/null
@@ -1,42 +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 Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-1.15.4.ebuild b/dev-python/os-brick/os-brick-1.15.4.ebuild
deleted file mode 100644
index 1fbb3de64b65..000000000000
--- a/dev-python/os-brick/os-brick-1.15.4.ebuild
+++ /dev/null
@@ -1,47 +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 Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-1.15.5.ebuild b/dev-python/os-brick/os-brick-1.15.5.ebuild
index d9c9a8407b0b..b24043bb0104 100644
--- a/dev-python/os-brick/os-brick-1.15.5.ebuild
+++ b/dev-python/os-brick/os-brick-1.15.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]