[gentoo-commits] repo/gentoo:master commit in: dev-python/cairocffi/, dev-python/cairocffi/files/

[Virgil Dupras]

commit:     208cf548f168bdf9d72bd377b4c846e08a7da6ff
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 03:24:12 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 03:24:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208cf548

dev-python/cairocffi: remove old

Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-python/cairocffi/Manifest                      |  1 -
 dev-python/cairocffi/cairocffi-0.7.2.ebuild        | 57 ---------------------
 .../cairocffi/files/cairocffi-0.7.1-test.patch     | 58 ----------------------
 3 files changed, 116 deletions(-)

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 09e9aa4272a..6d413b4b999 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,3 +1,2 @@
-DIST cairocffi-0.7.2.tar.gz 75337 BLAKE2B 9405eb6bafd0a83be2e2ae566eb9893a87bb8066c24885c955038f27357cc92e89e58998e16b2ec662559eebea6240e2e5c699d00e595fa13952e07f0264c9d2 SHA512 a4b5798ee713a8847ebd21ef328b3e0a94403ce1e80ac108f6d8e4abffbf96551542bb5c848550d82bcebb3d9f645c90ea87fc3eb254bd8e9d57b6a55db76de1
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5

diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
deleted file mode 100644
index 25ff3059926..00000000000
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-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 ~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/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=(
-	# 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() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	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.7.1-test.patch b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
deleted file mode 100644
index b5a2b4530fb..00000000000
--- 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")
-+@××××××.skip("https://github.com/SimonSapin/cairocffi/issues/65")
- def test_xcb_window(xcb_conn):
-     width = 10
-     height = 10