gentoo resync : 19.03.2019

4 files changed, 103 insertions, 1 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index ff2610c37bc6..72e4ad2f97da 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,6 +1,9 @@
-AUX cairocffi-0.8.0-tests.patch 751 BLAKE2B fa20431b8884762f5ebe25a59731743b8c2db1c0183eb8e425137b594fe35aeec095c85e643c35fbb3c41645b168c010dce7e0470d78c2cf07ca63ff2c52a340 SHA512 8e852c5769c726e85e8144c48fa78ba569d5c2e6d499bc92e37f5565dbebe6bcbc6e6a07ef3ecf8bf072a1fa2f83b614d01567ec198cfa86bf40a8b384462501
+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-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
 EBUILD cairocffi-0.8.0.ebuild 1269 BLAKE2B a772082b416ca70f3a45d9a82e512ab304068f9a2d479eda06c73ae395c3485c72ee557b0c241488f946ebf7838d0f62b32f7f502e8b286293e60af2cc120db8 SHA512 315cb28e0869b45d8c828424738624ddf16febbdd5aba4b582396a39c49259d1fc1a77f22f5d2d6047d03725b2f1661958978ea1d31d15ea7cf56805d5d73f37
 EBUILD cairocffi-0.9.0.ebuild 1240 BLAKE2B e30dc5e0e19c79c96a6714dd803bf4bd5d793a8947f610e886e4a6b218b93cc388a50e2394613ee798fb90207d5b08b7aeb902e31627cbeb8f7e1f51b9563582 SHA512 b9397ac911823afa6f31bf4fa0fb2316c9b5c917a839c6a6850cf47ef996b398b5ae135241ca4bff6914ba484731e275fc32c239182a70a01e53e8c23f2167f1
+EBUILD cairocffi-1.0.2.ebuild 1299 BLAKE2B 29a95524c5126bb623c9f27200f60b3fa2543244228921b62b1e6a0d284069a38abbaa7b48c1a044a9630b5c84ef8554fc4416f09a195e59f57693a4d0cd8071 SHA512 cbcf07a0d184403ce521bbf5c30a95459c926a01d3f13d947d32238766b23e5c32c2c76c52b053cf327acaed9c10a87dcf20e0c84c4b7e9d99b573d60e06d279
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.0.2.ebuild b/dev-python/cairocffi/cairocffi-1.0.2.ebuild
new file mode 100644
index 000000000000..84e56f6dcb7f
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-1.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,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"
+
+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=[xcb]
+	x11-libs/gdk-pixbuf[jpeg]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+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 || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch b/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
index 04839fd08efd..88ee2b0a0d5d 100644
--- a/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
+++ b/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
@@ -1,3 +1,5 @@
+Skip tests which interact with the root window due to permission failures.
+
 --- cairocffi-0.8.0/cairocffi/test_xcb.py
 +++ cairocffi-0.8.0/cairocffi/test_xcb.py
 @@ -118,14 +118,14 @@
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
new file mode 100644
index 000000000000..d6da32523d79
--- /dev/null
+++ b/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
@@ -0,0 +1,41 @@
+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]