From: Michał Górny Date: Sun, 26 Jan 2020 17:29:34 +0000 (+0100) Subject: dev-python/pycairo: Remove redundant versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26c30981bc0ab3c9035ae043a297453641c2bd10;p=gentoo.git dev-python/pycairo: Remove redundant versions Signed-off-by: Michał Górny --- diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index 34b639ececff..131b894f4cab 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -1,4 +1 @@ -DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db -DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5 -DIST pycairo-1.18.1.tar.gz 200610 BLAKE2B 47e707f3481d816e9fcd72d169d7ab9210f746396a45a6c9cdac946b4dca9529515ebe1a288d985eed659ff23488bec2cf3e0fb8d11c160349530871ed05881f SHA512 fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0 diff --git a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch deleted file mode 100644 index d4d75a172d63..000000000000 --- a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 430c6ffb65cd839be5ba6266a89f645afa8f9442 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 14 Oct 2018 12:30:56 +0200 -Subject: [PATCH] setup.py: Support specifying custom --pkgconfigdir - -Support overriding --pkgconfigdir for whenever the autodetection -gives incorrect result (e.g. PyPy). Fixes #119. ---- - setup.py | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 36641d9..75c8888 100755 ---- a/setup.py -+++ b/setup.py -@@ -14,6 +14,7 @@ except ImportError: - from distutils.core import Extension, Command, Distribution - from distutils.ccompiler import new_compiler - from distutils.sysconfig import customize_compiler -+from distutils.util import change_root - from distutils import log - from distutils import sysconfig - -@@ -265,11 +266,15 @@ class test_cmd(Command): - - class install_pkgconfig(Command): - description = "install .pc file" -- user_options = [] -+ user_options = [ -+ ('pkgconfigdir=', None, 'pkg-config file install directory'), -+ ] - - def initialize_options(self): -+ self.root = None - self.install_base = None - self.install_data = None -+ self.pkgconfigdir = None - self.compiler_type = None - self.outfiles = [] - -@@ -280,6 +285,11 @@ class install_pkgconfig(Command): - ('install_data', 'install_data'), - ) - -+ self.set_undefined_options( -+ 'install', -+ ('root', 'root'), -+ ) -+ - self.set_undefined_options( - 'build_ext', - ('compiler_type', 'compiler_type'), -@@ -315,8 +325,13 @@ class install_pkgconfig(Command): - "Skipping install_pkgconfig, not supported with MSVC") - return - -- python_lib = sysconfig.get_python_lib(True, True, self.install_data) -- pkgconfig_dir = os.path.join(os.path.dirname(python_lib), 'pkgconfig') -+ if self.pkgconfigdir is None: -+ python_lib = sysconfig.get_python_lib(True, True, -+ self.install_data) -+ pkgconfig_dir = os.path.join(os.path.dirname(python_lib), -+ 'pkgconfig') -+ else: -+ pkgconfig_dir = change_root(self.root, self.pkgconfigdir) - self.mkpath(pkgconfig_dir) - - pcname = "py3cairo.pc" if sys.version_info[0] == 3 else "pycairo.pc" --- -2.19.1 - diff --git a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild deleted file mode 100644 index c957ba9a2d72..000000000000 --- a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_6 pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo" -SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/cairo-1.13.1[svg] -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -python_compile_all() { - use doc && emake -C docs -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/. ) - - if use examples; then - dodoc -r examples - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild deleted file mode 100644 index 374788a138c0..000000000000 --- a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo" -SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/cairo-1.13.1[svg] -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/pycairo-1.17.0-pkgconfigdir.patch -) - -python_compile_all() { - use doc && emake -C docs -} - -python_test() { - esetup.py test -} - -python_install() { - distutils-r1_python_install \ - install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/. ) - - if use examples; then - dodoc -r examples - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/pycairo/pycairo-1.18.1.ebuild b/dev-python/pycairo/pycairo-1.18.1.ebuild deleted file mode 100644 index ea83bd345307..000000000000 --- a/dev-python/pycairo/pycairo-1.18.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo" -SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/cairo-1.13.1[svg] -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -python_compile_all() { - if use doc; then - sphinx-build docs -b html _build/html || die - fi -} - -python_test() { - esetup.py test -} - -python_install() { - distutils-r1_python_install \ - install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" -} - -python_install_all() { - use doc && local HTML_DOCS=( _build/html/. ) - - if use examples; then - dodoc -r examples - fi - - distutils-r1_python_install_all -}