From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:57:42 +0100
Subject: gentoo resync : 14.07.2018

---
 .../cairocffi/files/cairocffi-0.7.1-test.patch     | 58 ----------------------
 .../cairocffi/files/cairocffi-0.8.0-tests.patch    | 23 ---------
 dev-python/cairocffi/files/mapping.patch           | 10 ----
 3 files changed, 91 deletions(-)
 delete mode 100644 dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
 delete mode 100644 dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
 delete mode 100644 dev-python/cairocffi/files/mapping.patch

(limited to 'dev-python/cairocffi/files')

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
diff --git a/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch b/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
deleted file mode 100644
index 04839fd08efd..000000000000
--- a/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cairocffi-0.8.0/cairocffi/test_xcb.py
-+++ cairocffi-0.8.0/cairocffi/test_xcb.py
-@@ -118,14 +118,14 @@
-     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)
diff --git a/dev-python/cairocffi/files/mapping.patch b/dev-python/cairocffi/files/mapping.patch
deleted file mode 100644
index 14cae286617c..000000000000
--- a/dev-python/cairocffi/files/mapping.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur cairocffi-0.5.3.orig/docs/conf.py cairocffi-0.5.3/docs/conf.py
---- docs/conf.py	2013-05-24 10:33:32.000000000 +0800
-+++ docs/conf.py	2014-04-08 16:09:39.648229837 +0800
-@@ -14,6 +14,3 @@
- exclude_patterns = ['_build']
- autodoc_member_order = 'bysource'
- autodoc_default_flags = ['members']
--intersphinx_mapping = {
--    'http://docs.python.org/': None,
--    'http://cairographics.org/documentation/pycairo/2/': None}
-- 
cgit v1.2.3