gentoo resync : 23.09.2020

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index b51fb209e72c..df596527581b 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,3 @@
-DIST apache-libcloud-3.0.0.tar.bz2 1609684 BLAKE2B cac9f42a2e73c8903d9b29c8e39d0d16d56138adbe2bdf60abb52c02fbd41f8fbe063238a09ce27b2b921eb082a82881f31211dbcb864e183c3f582fdb75858a SHA512 17569ce820fc5bc792a23636c8d2cc2067059425217b9b0dd90fcba40a5f347dca66531201c458b12d61caf3854355b6a7dca7efc17b05fbab364c8d2bdc2405
 DIST apache-libcloud-3.1.0.tar.bz2 1613381 BLAKE2B afc607a76ff3cd24961cfaf916b5813cd59e84d523f9a642bb8222d889abb44d6357d230b001ae03a0b021160384d6c6d8420e85825aa8d84f7619e900c4c9b0 SHA512 ef2fc4754281adc336d656d3a707710feae0f6c22f33156830dd0b299d06fbf9b890817f68192106320944f851265c39f175b5fae5f85053706ec2f0ccd04bf1
-EBUILD libcloud-3.0.0.ebuild 1073 BLAKE2B 51e7a9ce37b08669d3ca78abaca3f7f910e9bc2db73520fdc097cddeb8d296b3ff8656fdcbfbc5470d2c7a085bb2c442589fb633a17d984e6691b4aaef26c3ab SHA512 0b5c838bd97e5dd2ad2c949e1b1c4f6bd1c1935b3f2f3132e7dd8fd58727733c91ffd260d6f0f1e5be4d4570fa7159b80149827f217632fc78120c77359f350c
-EBUILD libcloud-3.1.0.ebuild 1065 BLAKE2B 913749dff780009479ac94edda7c0c973506407be82f2c6f5941f71ac7cc7c8c101f7ccbc51aa75491182d784370acf5e43106fc49119546be4a9ea907dfe0ed SHA512 12905cd077a7d2ad01b2c7051fa747f537e391dda7bd3f9ad2a1810dfa0cec21904f2aabf4a8c6f5283354b2027d9d3500dd882bdac29d76ae8e381058063535
+EBUILD libcloud-3.1.0.ebuild 1063 BLAKE2B 9aaca27dd26b15f7cef25ae713c073b78e50d99346f9156ae9b4005fcd4d6f36ee1ff46759fb0a9842e6a7e401db7ccd1a41a8fb5e7fde958832b627ac4c6aee SHA512 3ef38255de3fc860c09984ea54ad6a3a61272543f8a55553dfe649e2db22af8bd3988ed5411b0b793841df82ebd61ca83d811eeba20068be9b5a7872931a79b8
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/dev-python/libcloud/libcloud-3.0.0.ebuild b/dev-python/libcloud/libcloud-3.0.0.ebuild
deleted file mode 100644
index 65e69f26ce57..000000000000
--- a/dev-python/libcloud/libcloud-3.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-
-"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/apache-${P}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-3.1.0.ebuild b/dev-python/libcloud/libcloud-3.1.0.ebuild
index 8e3ceab26aa6..ec64c11de676 100644
--- a/dev-python/libcloud/libcloud-3.1.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"