gentoo resync : 18.11.2018

3 files changed, 8 insertions, 73 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index b3417f790195..9ad6898f9ad2 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,8 +1,7 @@
-AUX cairocffi-0.7.1-test.patch 2041 BLAKE2B 5541ba69e75d5cc0270a27e19a29683bad83db8adbacf4bb4d26b7d25ea89aec1486541ddd91f7880afbff505e64266de6fafed1ba466e0bbf1e1c1abdba895f SHA512 b9191efa17f28becb4bf1f296b80bbd63d024c80d01e4211b334953272bf27e6029bcd113c0adc17d77bf27a31b609fe51b5b9374158d6a10763a9235e57a3a0
 AUX cairocffi-0.8.0-tests.patch 751 BLAKE2B fa20431b8884762f5ebe25a59731743b8c2db1c0183eb8e425137b594fe35aeec095c85e643c35fbb3c41645b168c010dce7e0470d78c2cf07ca63ff2c52a340 SHA512 8e852c5769c726e85e8144c48fa78ba569d5c2e6d499bc92e37f5565dbebe6bcbc6e6a07ef3ecf8bf072a1fa2f83b614d01567ec198cfa86bf40a8b384462501
 AUX mapping.patch 426 BLAKE2B 9c432bd2278bfc1ea996f99f6abb07635223350bb6f1fd305d28adcb9477b0efe880f83f76c3b12cb6e0a4dd14f5e05dc69672a41da33ae89f5836c2fc360e27 SHA512 ba09a19ff80b14275db9bcec51a372779adb6b2d969a9c07c11d9ba23de094460f2a84a837add9cb1f77084e0cfb791437fcf6c9bb67ea3958d2a006969b6d2c
-DIST cairocffi-0.7.2.tar.gz 75337 BLAKE2B 9405eb6bafd0a83be2e2ae566eb9893a87bb8066c24885c955038f27357cc92e89e58998e16b2ec662559eebea6240e2e5c699d00e595fa13952e07f0264c9d2 SHA512 a4b5798ee713a8847ebd21ef328b3e0a94403ce1e80ac108f6d8e4abffbf96551542bb5c848550d82bcebb3d9f645c90ea87fc3eb254bd8e9d57b6a55db76de1
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
-EBUILD cairocffi-0.7.2.ebuild 1357 BLAKE2B 9e57404454c2f10d5181436ac3971cef418746f67b162dac182768615713e0c1edaf3da2d9329aa0502f5f296ba3131c953a4da4058249202e41ca9d1a10c315 SHA512 aeb5df8305885f8ef3cdd129da957c5adc8776d113003d5cc248663a971d08f693bd675b3da85c057ae5ad6f54ee9e1498b499a9e6e4bd74da2d7e60300d4949
+DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 EBUILD cairocffi-0.8.0.ebuild 1270 BLAKE2B 5dc63dc5cbf1058ae8556004325a009483e9604194f77be0416e3299dc08b6cc0713b47a23398509fb865c917c3d5cc624406baa125d81b1bc989910b29bd2f9 SHA512 a25d469817a6bec7bafcc1736da49c11d0a226780a7f1630151fc180d539afc70c0d7b0e532628861dd5a874a7c6a90a9104baf7dc82352a73b558bd58dfec9b
+EBUILD cairocffi-0.9.0.ebuild 1238 BLAKE2B ce2828c89a2b9433d4cb83c7fc6a4df6922581b60b5ed702ac885ba861eb9df2e2e06c93b070d152176e899b5997c24a53a1e3a2c61afc5f3b97244e71711376 SHA512 22de34736fec679b1f327af6fa35db32a35516fe3f352701d128e85f1d8f9a42685e28586c93f4da06736306ebb8a919e94299b199da46501f3a8c88f5af9a3e
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
index 25ff30599269..7291340fb126 100644
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 MY_PN="${PN}"
 MY_P="${MY_PN}-${PV}"
@@ -16,13 +16,13 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+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=
+	x11-libs/cairo:0=[xcb]
 	x11-libs/gdk-pixbuf[jpeg]
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
@@ -35,12 +35,6 @@ DEPEND="
 	)
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
-PATCHES=(
-	# Intersphinx cause the usual d'loading of objects.inv from TWO online sites
-	 "${FILESDIR}"/mapping.patch
-	 "${FILESDIR}"/${PN}-0.7.1-test.patch
-	 )
-
 S="${WORKDIR}/${MY_P}"
 
 python_compile_all() {
@@ -48,7 +42,7 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
+	virtx py.test -v --pyargs cairocffi -o addopts= || die "testsuite failed under ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
deleted file mode 100644
index b5a2b4530fb8..000000000000
--- a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- cairocffi/test_cairo.py |  3 +--
- cairocffi/test_xcb.py   | 13 +++++++------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py
-index 6b19ee1..542103d 100644
---- a/cairocffi/test_cairo.py
-+++ b/cairocffi/test_cairo.py
-@@ -1049,7 +1049,7 @@ def test_font_options():
-     options_1.merge(options_2)
-     assert options_2 == options_1
- 
--
-+#@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
- def test_glyphs():
-     surface = ImageSurface(cairocffi.FORMAT_ARGB32, 100, 20)
-     context = Context(surface)
-@@ -1064,7 +1064,6 @@ def test_glyphs():
-     assert 5 == x1 < x2 < x3
-     assert clusters == [(2, 1), (1, 1), (1, 1)]
-     assert is_backwards == 0
--    assert font.glyph_extents(glyphs) == font.text_extents(text)
-     assert font.glyph_extents(glyphs) == context.glyph_extents(glyphs)
- 
-     assert context.copy_path() == []
-diff --git a/cairocffi/test_xcb.py b/cairocffi/test_xcb.py
-index c8a6e70..0c6bab9 100644
---- a/cairocffi/test_xcb.py
-+++ b/cairocffi/test_xcb.py
-@@ -118,14 +118,14 @@ def test_xcb_pixmap(xcb_conn):
-     gc = create_gc(xcb_conn)
- 
-     # create XCB surface on pixmap
--    root_visual = find_root_visual(xcb_conn)
--    surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
--    assert surface
-+    # root_visual = find_root_visual(xcb_conn)
-+    # surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
-+    # assert surface
- 
-     # use xcb surface to create context, draw white
--    ctx = Context(surface)
--    ctx.set_source_rgb(1, 1, 1)
--    ctx.paint()
-+    # ctx = Context(surface)
-+    # ctx.set_source_rgb(1, 1, 1)
-+    # ctx.paint()
- 
-     # map the window and wait for it to appear
-     xcb_conn.core.MapWindow(wid)
-@@ -157,6 +157,7 @@ def test_xcb_pixmap(xcb_conn):
- 
- @pytest.mark.xfail(cairo_version() < 11200,
-                    reason="Cairo version too low")
-+@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
- def test_xcb_window(xcb_conn):
-     width = 10
-     height = 10