gentoo resync : 15.01.2020

5 files changed, 9 insertions, 63 deletions

diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 0b56cb991068..8b7596403b9f 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,9 +1,7 @@
 DIST apache-libcloud-0.15.1.tar.bz2 570953 BLAKE2B 1baca706ac57d76baf4f83824ea0fccaccec51f38114a0103777e2965e67ad9cd96ad46459841ea702d72f8f0c3ce166037714d04f91c1f2369ddf6f455ffa63 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0
-DIST apache-libcloud-1.2.1.tar.bz2 992983 BLAKE2B e3caccd2814f3b25fa96fbc21972fb3694a6f5e55663564f712b98b64a60e577baf1da0295b914fef2440a461f6fa16f313e83bde252360ac6786995527afc04 SHA512 12e239f286d8eb523597488998582be02d6e8cd4e21a8fa7c639c829ba622833e4292ac4cd7cbc8b94670e19ec1711cb0032bc72433f421bf2ba2b8c70dcd954
 DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
-EBUILD libcloud-0.15.1.ebuild 1080 BLAKE2B c87b5c59425f109f412652199a464cc176658940e68cc2b38f48fb793166715c38158c4af3be8c76df153b5e7e612191b0d8d45b6170ef73aa00f1a855a95e08 SHA512 a8f1143398829e69c58d95c44fc82b251ae4254c5e9a279ad5b2a88f6b0ddf37deb12655f93b9487f96c709418885c55d9c3d707c46f4db7c03e94730ab5497e
-EBUILD libcloud-1.2.1.ebuild 1187 BLAKE2B 13ec3629d6eceb6e82ff1fac334ed053cb315e5800a96bf6a6d8d1b0cdb3a3719c271cde00f4e34bf5000fd4919536b460019ce3399ba50ffa9025ae1411fff4 SHA512 a62bde97ff32b76ba4bb906c6ff09c7c99229fbb405212cd36911606c4e52659005ce0c3857f905dc99ddbfb4d818a5e6da0682a5b1ac42fb9c4c2c14c9e327a
-EBUILD libcloud-1.5.0.ebuild 1196 BLAKE2B 30b3c2186b10677cffbf533aee0ca4302972869461f91124554543b186fec0e0a24ac8ba8bda165d48afecddbe00483c0ed8b4512cbec7443de98a667b463b6c SHA512 0a7969ece9813f7745333700d38b4b1eccaca0e1c57cb7790180083dd48b16b261a0dace517c973e791eb7a1887115181ba552be74fd5a5056f3cb21e2107ea0
-EBUILD libcloud-2.3.0.ebuild 1130 BLAKE2B 55e82d20d35ba07f89c2d2d6cc3f1cd7452cb1827ba087076c30b9f14ad07a533e80cc557322f55479036ef6d51a771f89d7d850fc12dd1350706bb1f2a6ea08 SHA512 12b4762b3c669dfdccf7822052e5dd3c67b46104e81c8804263a121f355bec0c474b6f67fa3b001bf1b999404a24ca21930b71380e1d577f977c48d13ce9f114
+EBUILD libcloud-0.15.1.ebuild 1075 BLAKE2B da3023b3fe0e174b2fc961d86a4b7d9dc870f279529535182611faf1a26fa9b1dc1186004f8f4a0877e551d7c4cb275e4684141c0d4a5e19e024e10e1c20a6ab SHA512 42a700c8d8a09bd2181b92171ee3dc2a03bd01a6d8d3d540a5f8ea2d5742db8171523f00f7d4e0fb9527cd8e37eefd00cbd52c909fbea9c101e79c6769f4b69d
+EBUILD libcloud-1.5.0.ebuild 1187 BLAKE2B 2afa7994050a018e93da85e466ea22b281892597af2ad4321b219bc2e89306661f8d81d00099e99401c0f51df6d8b9d852ded8ea728d3c62380430834c9f4b15 SHA512 ff99dd7e6bb56d3367a25053e049fc2f2ec4b20315261c0177303291f8b83618ed112ab7d7339bedf8b506856a6c25999724af1ce8f19622ab146916c0523588
+EBUILD libcloud-2.3.0.ebuild 1121 BLAKE2B 08ebcb2209e2e016ff68a4920bbf18f5fe218a06c61dfa938460e546cc831effde93f96b2d0153a7bc62606e144684c03f8c0202d522f9f44d1aef4f08724057 SHA512 245ae052132f8fa13ab57e5f2cc829b6f68ae29f258dabd06b18d4d5e50497d170120d4bf3bf0367b0fa15bf85a65a0855ac615db2fe6a068e0fe8a7258ebab3
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-0.15.1.ebuild b/dev-python/libcloud/libcloud-0.15.1.ebuild
index c0a45ec8a3f5..6011542de4df 100644
--- a/dev-python/libcloud/libcloud-0.15.1.ebuild
+++ b/dev-python/libcloud/libcloud-0.15.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild
deleted file mode 100644
index a76153688bd8..000000000000
--- a/dev-python/libcloud/libcloud-1.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="http://libcloud.apache.org/index.html"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples
-		mv example_*.py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
index ab9abff3992f..f178e88a1351 100644
--- a/dev-python/libcloud/libcloud-1.5.0.ebuild
+++ b/dev-python/libcloud/libcloud-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 # py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index 2f396c21fbd6..7cfaa7b14210 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1