gentoo resync : 25.04.2020

3 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index d47b4ee48e4c..6349aa9ed15a 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -2,10 +2,8 @@ AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8
 AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4089c4335cbc0cd5d655764682c7a28dbffdb66ea3bb4266782acb39e3e367dfe4f417d868ac32ea3acc85cdfe9991f41 SHA512 a34824aa886ef714464a727997b2226c8170fe1124c5f067ec881e35339a91c60da57505aa8bc551ccfe3ba6dddc59f27bdc79ec122c8fd36a6fbab06efefef5
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
-DIST cairocffi-1.0.2.tar.gz 68537 BLAKE2B ddaf20e0d878126c86b03aa87663391fad37386b8d2dae790e26c20b9050cd3bc36783a32a5c8ee99f64acb232701316bd8308be7327ce406cd49de4df3f92dc SHA512 0ae63be9d6ca4591d806e259ecb385086b053739de2e5098541078d4c142dd100b593a7712d5410a92ed7dbf6e9a7f7a5287f00425cd8d54ada421dae0cfd762
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
 EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
-EBUILD cairocffi-1.0.2-r1.ebuild 1180 BLAKE2B f87b6cbfd6d2d8ed340fffda39910fc9caf648626665f632f3bdb3560908cfa3fc5c366ddaa1768d36e1edb10565aa29eb851315e631d7e18a25368539ec0ac6 SHA512 f2deea39b685b62b64496a17bfc3f9a8a0a2f208cc03737fc2325fb1dfc08d892fcc11cd192d021e86ec7eae1a5b8c950da63c4ff31c2f3cc13dd2c6ccf047df
-EBUILD cairocffi-1.1.0.ebuild 1187 BLAKE2B 84ae7296bf3cdbbc360e6bd09e294c1b4f7ec65f32c2bbbc2a44b63666e27a6517dd4d99c3467cb900add69309a5d60226653e2e9c431f84ca814f2a57a1a49d SHA512 aaf7cbf363b83e0c4b3c15328d507bbb4e3f4dd99c15c814aa840ce4fb243ca1b221c55dbe08bed017138e2e2e9e42a98e99eefa8dcf01b566f6e6834d651433
+EBUILD cairocffi-1.1.0.ebuild 1186 BLAKE2B 7896f3801e24fdafd3e17333d96fcf4d80be02f023fb331d855ace8d66c1bd4f95a8533847e4afacb03e03325a7ddfde5c8457abd8a2069670f406534a4461b9 SHA512 f492f28424e0533681a19e2e50e7b39f54a5dbfb9203a66e1607179029003524f7d32ba43ec6bf655f821c71578530d249cc61f84df134a15d1cbc161748993d
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild b/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild
deleted file mode 100644
index e5bd3f05cf67..000000000000
--- a/dev-python/cairocffi/cairocffi-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-inherit distutils-r1 virtualx
-
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-	"${FILESDIR}"/${P}-test-deps.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	virtx py.test -v --pyargs cairocffi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
index 876f2e479102..457f63121118 100644
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"