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 5F124138350 for ; Sat, 8 Feb 2020 16:53:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3291DE0866; Sat, 8 Feb 2020 16:53:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC4B1E0841 for ; Sat, 8 Feb 2020 16:53:27 +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 CB2B234E856 for ; Sat, 8 Feb 2020 16:53:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0279B133 for ; Sat, 8 Feb 2020 16:53:23 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1581180728.222fafb83d3fb05a934596d5ab648e8dce440c56.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/grass-7.4.4-r2.ebuild sci-geosciences/grass/grass-7.4.4.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 222fafb83d3fb05a934596d5ab648e8dce440c56 X-VCS-Branch: master Date: Sat, 8 Feb 2020 16:53:23 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9cca887c-027c-4548-870c-3e8efe63297e X-Archives-Hash: 31035eb293a5e710911cabbb3a413d17 commit: 222fafb83d3fb05a934596d5ab648e8dce440c56 Author: David Seifert gentoo org> AuthorDate: Sat Feb 8 16:52:08 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 8 16:52:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222fafb8 sci-geosciences/grass: [QA] Fix UnnecessarySlashStrip Signed-off-by: David Seifert gentoo.org> sci-geosciences/grass/grass-7.4.4-r2.ebuild | 22 +++++++++++----------- sci-geosciences/grass/grass-7.4.4.ebuild | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild index 4fc91618386..1eae3bc22a9 100644 --- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild +++ b/sci-geosciences/grass/grass-7.4.4-r2.ebuild @@ -150,23 +150,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +175,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +244,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild index e875e74c758..7ab6f3281d1 100644 --- a/sci-geosciences/grass/grass-7.4.4.ebuild +++ b/sci-geosciences/grass/grass-7.4.4.ebuild @@ -150,23 +150,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +175,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +244,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter