gentoo resync : 18.12.2020

4 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 9ac5d91dfcb1..630f3b86d726 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,7 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
-AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4089c4335cbc0cd5d655764682c7a28dbffdb66ea3bb4266782acb39e3e367dfe4f417d868ac32ea3acc85cdfe9991f41 SHA512 a34824aa886ef714464a727997b2226c8170fe1124c5f067ec881e35339a91c60da57505aa8bc551ccfe3ba6dddc59f27bdc79ec122c8fd36a6fbab06efefef5
-DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
-EBUILD cairocffi-1.2.0.ebuild 898 BLAKE2B 483ef93a9b4682c99dc68a4adebda0290e95dc796888d5815d18917c0c871a7e224df87697acebded2f7f96b3d96650a0bc237bae1a5e4c500018a23f65980a3 SHA512 b7f14467d263f8d72aed1c170b07eb3b6ad574b3f113680e9809670cc1be89b099b2fa5dfb0d4c07d68f09b92ee7a56eec2c3cb8790d17d01402584c162a2721
+EBUILD cairocffi-1.2.0.ebuild 897 BLAKE2B 9390d3115ffa3c8c9e6e50220973ac67f3412a25eee05138115f286f55f875e46eb2417979b5cebf1cf4e02301d04d2fc32738cd9dc60ab634f46d3af1e8e06b SHA512 9f061d2ca184ff7455ba05e0ea788107ef59ec4038370a0347c2119adc0e68ad42aa13415483d41bd8e3037d53e3ace126cf3b2f58e40b2120ffc46dcc0ea34c
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
deleted file mode 100644
index 29fbbca716f4..000000000000
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-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]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-	"${FILESDIR}"/${PN}-1.0.2-test-deps.patch
-)
-
-python_test() {
-	virtx pytest -vv --pyargs cairocffi
-}
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 904fb171ce2d..c8e301e9018c 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch b/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
deleted file mode 100644
index d6da32523d79..000000000000
--- a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove unnecessary test deps.
-
---- cairocffi-1.0.2/setup.cfg
-+++ cairocffi-1.0.2/setup.cfg
-@@ -36,16 +36,10 @@
- packages = find:
- setup_requires = 
- 	cffi >= 1.1.0
--	pytest-runner
- 	setuptools
- install_requires = 
- 	cffi >= 1.1.0
- 	setuptools >= 39.2.0
--tests_require = 
--	pytest-cov
--	pytest-flake8
--	pytest-isort
--	pytest-runner
- python_requires = >= 3.5
- 
- [options.package_data]
-@@ -58,11 +52,6 @@
- doc = 
- 	sphinx
- 	sphinx_rtd_theme
--test = 
--	pytest-runner
--	pytest-cov
--	pytest-flake8
--	pytest-isort
- xcb = 
- 	xcffib >= 0.3.2
- 
-@@ -74,7 +63,6 @@
- test = pytest
- 
- [tool:pytest]
--addopts = --flake8 --isort
- norecursedirs = build dist .cache .eggs .git
- 
- [flake8]