Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/
Date: Sat, 27 May 2017 04:11:58
Message-Id: 1495858272.852b01ce41d232c574425bf45421249eac91ea69.floppym@gentoo
1 commit: 852b01ce41d232c574425bf45421249eac91ea69
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 27 04:11:12 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat May 27 04:11:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852b01ce
7
8 dev-python/pycairo: replace "lib" with correct libdir
9
10 This path is used to install the pkgconfig file(s). If the files are
11 installed in the wrong libdir, pkg-config in pygobject will fail to
12 find them.
13
14 Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69
15
16 .../pycairo/{pycairo-1.13.1.ebuild => pycairo-1.13.1-r1.ebuild} | 8 +++++++-
17 1 file changed, 7 insertions(+), 1 deletion(-)
18
19 diff --git a/dev-python/pycairo/pycairo-1.13.1.ebuild b/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
20 similarity index 86%
21 rename from dev-python/pycairo/pycairo-1.13.1.ebuild
22 rename to dev-python/pycairo/pycairo-1.13.1-r1.ebuild
23 index 3686caad877..30b7fc97e0c 100644
24 --- a/dev-python/pycairo/pycairo-1.13.1.ebuild
25 +++ b/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
26 @@ -27,9 +27,15 @@ DEPEND="${RDEPEND}
27 test? ( dev-python/pytest[${PYTHON_USEDEP}] )
28 "
29
30 +python_prepare_all() {
31 + # Fix pkgconfig path
32 + sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
33 + distutils-r1_python_prepare_all
34 +}
35 +
36 python_compile() {
37 local enable_xpyb
38 - [[ ${EPYTHON} == python2* ]] && enable_xpyb=$(usex xcb "--enable-xpyb" "")
39 + python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
40
41 esetup.py build ${enable_xpyb}
42 }