From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D3903139695 for ; Sun, 9 Jul 2017 12:06:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BF2D21406A; Sun, 9 Jul 2017 12:06:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B99221406A for ; Sun, 9 Jul 2017 12:06:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4027341A9E for ; Sun, 9 Jul 2017 12:06:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C6D5746A for ; Sun, 9 Jul 2017 12:06:52 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1499602001.7385d90ccac06d78c8bf90029c399b01d1883e39.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/matplotlib-2.0.2.ebuild X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 7385d90ccac06d78c8bf90029c399b01d1883e39 X-VCS-Branch: master Date: Sun, 9 Jul 2017 12:06:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 71057219-9e47-4a2b-9e5d-4c9cee196942 X-Archives-Hash: 844f350e2773ec8ed6e8e795a73a340f commit: 7385d90ccac06d78c8bf90029c399b01d1883e39 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 12:01:12 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 12:06:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7385d90c dev-python/matplotlib: remove bundled qhull remove directory quotes from setup.cfg to enable it find qhull in Gentoo. update wrap_setup for the fact that we are already doing out-of-source builds. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-python/matplotlib/matplotlib-2.0.2.ebuild | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-2.0.2.ebuild b/dev-python/matplotlib/matplotlib-2.0.2.ebuild index ca8d819c6ee..8a1a9803492 100644 --- a/dev-python/matplotlib/matplotlib-2.0.2.ebuild +++ b/dev-python/matplotlib/matplotlib-2.0.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) PYTHON_REQ_USE='tk?,threads(+)' -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs +inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix DESCRIPTION="Pure python plotting library with matlab like syntax" HOMEPAGE="http://matplotlib.org/" @@ -45,7 +45,7 @@ COMMON_DEPEND=" media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 - media-libs/qhull + >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) gtk2? ( dev-libs/glib:2= @@ -144,14 +144,14 @@ python_prepare_all() { -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ || die "sed pyparsing failed" - sed \ - -e "s:/usr/:${EPREFIX}/usr/:g" \ - -i setupext.py || die + hprefixify setupext.py export XDG_RUNTIME_DIR="${T}/runtime-dir" mkdir "${XDG_RUNTIME_DIR}" || die chmod 0700 "${XDG_RUNTIME_DIR}" || die + rm -r extern/qhull || die + distutils-r1_python_prepare_all } @@ -169,7 +169,7 @@ python_configure() { # common switches. cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die [directories] - basedirlist = "${EPREFIX}/usr" + basedirlist = ${EPREFIX}/usr [provide_packages] pytz = False dateutil = False @@ -209,13 +209,10 @@ python_configure() { wrap_setup() { local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg unset DISPLAY - - # Note: remove build... if switching to out-of-source build - "${@}" build --build-lib="${BUILD_DIR}"/build/lib } python_compile() { - wrap_setup distutils-r1_python_compile + wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib } python_compile_all() {