Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/
Date: Sun, 09 Jul 2017 12:06:57
Message-Id: 1499602001.7385d90ccac06d78c8bf90029c399b01d1883e39.heroxbd@gentoo
1 commit: 7385d90ccac06d78c8bf90029c399b01d1883e39
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 9 12:01:12 2017 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 9 12:06:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7385d90c
7
8 dev-python/matplotlib: remove bundled qhull
9
10 remove directory quotes from setup.cfg to enable it
11 find qhull in Gentoo.
12
13 update wrap_setup for the fact that we are already
14 doing out-of-source builds.
15
16 Package-Manager: Portage-2.3.3, Repoman-2.3.1
17
18 dev-python/matplotlib/matplotlib-2.0.2.ebuild | 17 +++++++----------
19 1 file changed, 7 insertions(+), 10 deletions(-)
20
21 diff --git a/dev-python/matplotlib/matplotlib-2.0.2.ebuild b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
22 index ca8d819c6ee..8a1a9803492 100644
23 --- a/dev-python/matplotlib/matplotlib-2.0.2.ebuild
24 +++ b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
25 @@ -6,7 +6,7 @@ EAPI=6
26 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
27 PYTHON_REQ_USE='tk?,threads(+)'
28
29 -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs
30 +inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
31
32 DESCRIPTION="Pure python plotting library with matlab like syntax"
33 HOMEPAGE="http://matplotlib.org/"
34 @@ -45,7 +45,7 @@ COMMON_DEPEND="
35 media-fonts/stix-fonts
36 media-libs/freetype:2
37 media-libs/libpng:0
38 - media-libs/qhull
39 + >=media-libs/qhull-2013
40 cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
41 gtk2? (
42 dev-libs/glib:2=
43 @@ -144,14 +144,14 @@ python_prepare_all() {
44 -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
45 || die "sed pyparsing failed"
46
47 - sed \
48 - -e "s:/usr/:${EPREFIX}/usr/:g" \
49 - -i setupext.py || die
50 + hprefixify setupext.py
51
52 export XDG_RUNTIME_DIR="${T}/runtime-dir"
53 mkdir "${XDG_RUNTIME_DIR}" || die
54 chmod 0700 "${XDG_RUNTIME_DIR}" || die
55
56 + rm -r extern/qhull || die
57 +
58 distutils-r1_python_prepare_all
59 }
60
61 @@ -169,7 +169,7 @@ python_configure() {
62 # common switches.
63 cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
64 [directories]
65 - basedirlist = "${EPREFIX}/usr"
66 + basedirlist = ${EPREFIX}/usr
67 [provide_packages]
68 pytz = False
69 dateutil = False
70 @@ -209,13 +209,10 @@ python_configure() {
71 wrap_setup() {
72 local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
73 unset DISPLAY
74 -
75 - # Note: remove build... if switching to out-of-source build
76 - "${@}" build --build-lib="${BUILD_DIR}"/build/lib
77 }
78
79 python_compile() {
80 - wrap_setup distutils-r1_python_compile
81 + wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
82 }
83
84 python_compile_all() {