gentoo resync : 15.01.2020

4 files changed, 3 insertions, 129 deletions

diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index 9bf5ca8f7c75..346b48887852 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,7 +1,3 @@
-DIST pycadf-2.6.0.tar.gz 249411 BLAKE2B 7ddbbcb9355502910ba023589181cbf2d6a104454ca408b604eee031ce79c547213961d10bec4d891e8ddfb00ccacaf1dff1f5bb2646913e9c0bb79abfd4ae72 SHA512 a581b54a8dae088e015d639f14eb46b3c41bdbfdd55b671e79f34b7392af49e3e8dbb2fd85a43e5f8e010cbcdba1d9a330972b5cb6f7f2c5179c00b6f135b4ec
-DIST pycadf-2.7.0.tar.gz 248233 BLAKE2B b2258e0f2027811c35cfcf7063821bd41cc83291d5ace7969fcd48d2e76b4f1a24e8a09b60f996f2edc7e9c37c1578cda40bd2bbd0a1ecbfc889a1d9bbab6ca4 SHA512 093c633c82345154c45c7b8b3dd38ef8101fc6a6aa980a44fc69887409a8facd987a960f403150401a64f2186113bdf5e8c05a3996f3ca4c55f9dc40ab8bfa8d
 DIST pycadf-2.9.0.tar.gz 249992 BLAKE2B d6c1fd12991e24fa747e2f0ba35719faf6b4392334957ead977901f14c8cd98b26f1f93e4b866085e73b7009f66a1ce692e58e478ec501dd4fa988ebf11c2f5b SHA512 da94d778db2fa06b129ae5e85151e301eb68b9ca551fe33f86a9e627cf2c879c71451df140dddbc6d3dfcbac4b6939fce6748711549400713e96165b6673c356
-EBUILD pycadf-2.6.0.ebuild 1751 BLAKE2B ff62fdcb7be3bc803a7d9e62dc3cf0bd7a67ab48bf1015e0201a3de0e8e5ea4383bbc656ed1b14e041bd8824f1838a408f665f0cde07ffdf8cbf6eb940375f2c SHA512 680036823b959b07196fce2549bfbc1d17d18ae034c321917a8a742dd908dd4026ae1501f1d89d3b59edc298e04ba166ff1676243f6b8dac75b233c063646a88
-EBUILD pycadf-2.7.0.ebuild 1777 BLAKE2B a126136aa866c69f105034cf2772271e8b01f1cbaf7d89b734c63782ac0067b612ecb1b000c2eaba2addefebe29a009001af867307069a5e68b79c607fbbed8d SHA512 ca752bffb9b8b51786e111ac93f60c1433b02204ae5944b4ee7a8a3108c12c61634f2bee764a3406e01d95b9a7027a1fe43e9a0105e40b1ab8049bbd88ce8c4a
-EBUILD pycadf-2.9.0-r1.ebuild 1857 BLAKE2B 5e8403c53b9a4c6adbe300ab0759c52b0b44accf8c83c33da9a0040b2bcd5cbd3a20d32104bff8822e7244a58ae27f335005276dd1efd3c530a57c4def24cbec SHA512 bc6e95f23d0c901998f4ddb37c58b893d79eadcc8a14f8a4e6352cdf5695eff4fa1530d2844c0ffbbc23e8e2e198985aa1927bbcf7dd89ccb6d87df03623db04
+EBUILD pycadf-2.9.0-r1.ebuild 1845 BLAKE2B 334d4a07eafc927e5ac3a1ce1d7d83791e55be3f123390ef76aa533feae6b2f3fc05086a8029e242aaef9ea08333758aa468465bb8837404ab58a9691913b2aa SHA512 13d5755670962d08a5391af3c915e1efe04defcfe5c24c98f6457aa92e4b4faa7ab50d0138aae538e32d1ab22f410e2dd15ff5d0920902c505be1cfb8af5297c
 MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild
deleted file mode 100644
index 9892dce0aad1..000000000000
--- a/dev-python/pycadf/pycadf-2.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	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/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
deleted file mode 100644
index 0bba6096d5c4..000000000000
--- a/dev-python/pycadf/pycadf-2.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	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/pycadf/pycadf-2.9.0-r1.ebuild b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
index 1427cbb70aae..50d99eeffcd9 100644
--- a/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
+++ b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1