gentoo resync : 03.11.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index fb1a2a66e7e6..85fcdc16a497 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,7 +1,5 @@
-DIST os_vif-1.15.1.tar.gz 85731 BLAKE2B c0855be5204513fcb18c39341cae0a51ab6ad961d6a5f6d96988b14e43beddc4fa7f8c3e8a590eb5f657af8590603cc516a194af1c73234566047b8059cacfc1 SHA512 5fe7ba1bccba81e8b03884e951012f181c4b0cff433ff9211ce750868811ad4a3e5b1188396c466a286df6a9db824fd07a7abc62fda2c0c302d6d07108f419a8
 DIST os_vif-1.15.2.tar.gz 88591 BLAKE2B 0a272332b238590f9a0cb5a457babe8a26b97196370c0e0f4c1e4d89e814e424dcc5f0e2786cfed3729bb5608434507966ab22d9c68b90e7deef0767381a8cb0 SHA512 36d7ff16fa5b7cecf738d9e867657ce7ff416a514cde2796306d2e21a1ae1985528dfcecc95498a24fcfc16687cfdbc898550520ac6e17d202ea554e8d8c7b1c
 DIST os_vif-1.9.1.tar.gz 63535 BLAKE2B b4c017b129c2540794f85292341a165761d00439d24727fe2f421c96a7e5d6e79e8572a217064e01e62bb137f136fcfd1d51ff089c48026de82d91a8b9a22386 SHA512 d7aeec1bd277a91a1f4fbda69e5408f5648ad49ffac17d1ca54148ec30c31bd64639151988355395166747df91cd89cbed1863a2668a5bce89a10d2aea55c288
-EBUILD os-vif-1.15.1.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
-EBUILD os-vif-1.15.2.ebuild 1420 BLAKE2B 1d5eeadc98a27de20639ca046536de8622fa082d6c10e3916ffbf160ba0bf2c4f602e04fe5e43cc6b26ee48ae7cb1edc7ebb64dee00df638553f3a677e43ea40 SHA512 a3922882f31418a324d7c0ab4aa682012e978c3aea1dbff3b2104012e7f1a2421f3c89c72779ea4c7529cd787f8c96064377304b10c2918d78b96a88a7096e35
+EBUILD os-vif-1.15.2.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
 EBUILD os-vif-1.9.1.ebuild 1316 BLAKE2B fed08c77cb8740ab83da994b04d7f218cb8848c0e8e7d5635826b7cf56adf540823f96364685cd396649ca57b3ca9086fe1ee5bab466b448cd6617787415fb9f SHA512 50ebdb3012fb584797346da906f212011dc09a9d9cb11ea91df25daa60a446af246a9e5a6c7c4d3c4cc7b59cbe7c980a072c0e111f2c5ebf6fa9fcbe46bc7140
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.15.1.ebuild b/dev-python/os-vif/os-vif-1.15.1.ebuild
deleted file mode 100644
index f40aad0c51cd..000000000000
--- a/dev-python/os-vif/os-vif-1.15.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
-S="${WORKDIR}/os_vif-${PV}"
-
-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/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.12.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-vif/os-vif-1.15.2.ebuild b/dev-python/os-vif/os-vif-1.15.2.ebuild
index 4a5e87d488cf..f40aad0c51cd 100644
--- a/dev-python/os-vif/os-vif-1.15.2.ebuild
+++ b/dev-python/os-vif/os-vif-1.15.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]