diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
| commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
| tree | 697733f5cb713908dcf378e13fd15a798a906a91 /dev-python/pycairo | |
| parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) | |
gentoo resync : 18.11.2018
Diffstat (limited to 'dev-python/pycairo')
| -rw-r--r-- | dev-python/pycairo/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch | 71 | ||||
| -rw-r--r-- | dev-python/pycairo/pycairo-1.17.0-r1.ebuild (renamed from dev-python/pycairo/pycairo-1.17.0.ebuild) | 13 |
3 files changed, 84 insertions, 3 deletions
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest index 66cd0752ec40..b9f915b53617 100644 --- a/dev-python/pycairo/Manifest +++ b/dev-python/pycairo/Manifest @@ -1,5 +1,6 @@ +AUX pycairo-1.17.0-pkgconfigdir.patch 2465 BLAKE2B ea288bb36d4096586d2384b3d25b95fc02747e0780c773bde768832893fbe7c87476ab57fa342d6ec15ff06c6cf123cad1b1e6461c79aa3e1c86369f5b96fc13 SHA512 716e55df7416f8bb6cf73e3576fac5a9967667019b05ae9dd13e4c9edacf9c07d1e29b6e67ac8bb158171d8d2d82d02a61f3d8fb77c3c1a28e288de1f352d163 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5 EBUILD pycairo-1.16.3-r1.ebuild 1095 BLAKE2B 20def77c3a3e045e0032facc0398ffa8ff74c5720a2c4b94f766a94bab62d3ded5bfa38635f3d95f864f38f235b942522bae3a4b2e7ae554a937f47bb96303dd SHA512 cc782cf27262f03e466e714aa232b5525ecf8e38e282890df3cb83ee9f18ccf28c4bb4a04cefdc78436d5b8c0a8d1cec6508bde5c966fb01db8dbf066ec39dd0 -EBUILD pycairo-1.17.0.ebuild 1107 BLAKE2B 8eba2cdda75db82159fabe1dab3b4918f1936faa6298510169e40d3658d412d138d5568ca93be262eb00b5c0da5004452d6f1a52b417142d3368fb9b99db8823 SHA512 07fdafe3bad55ca27e57c04ca0824ece886453b282f506efebedeed8f03eb8a680d206eced00e0442f45513494c6cb81e71f33c73f4563a12e83f33429e2e9ac +EBUILD pycairo-1.17.0-r1.ebuild 1279 BLAKE2B e3a7357b55481d7dc425848534e21474f3ae4ab14b7ad8bf2f807aa003298114bcc3d7eb8ff04e53c46dd2fc37315b4994084834aabdf6cd2aecc864e3a61bbe SHA512 f22e7853603300728d09ef47be0ba24ebc785c897e61261061c98d6940d714907f12d87b05357d073564160785cfe92f71b3964afb32ad8165914760894825ab MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc diff --git a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch new file mode 100644 index 000000000000..d4d75a172d63 --- /dev/null +++ b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch @@ -0,0 +1,71 @@ +From 430c6ffb65cd839be5ba6266a89f645afa8f9442 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +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.17.0.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild index 65751904ec19..3b7e663eaa0d 100644 --- a/dev-python/pycairo/pycairo-1.17.0.ebuild +++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -14,7 +14,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" RDEPEND=" @@ -28,6 +28,10 @@ DEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}"/pycairo-1.17.0-pkgconfigdir.patch +) + python_compile_all() { use doc && emake -C docs } @@ -36,6 +40,11 @@ python_test() { esetup.py test } +python_install() { + distutils-r1_python_install \ + install_pkgconfig --pkgconfigdir="/usr/$(get_libdir)/pkgconfig" +} + python_install_all() { use doc && local HTML_DOCS=( docs/_build/. ) |