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 265DB138351 for ; Sun, 16 Feb 2020 17:08:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44A75E08F9; Sun, 16 Feb 2020 17:08:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0FBFEE08F9 for ; Sun, 16 Feb 2020 17:08:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B0BB834EB90 for ; Sun, 16 Feb 2020 17:08:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 218AF144 for ; Sun, 16 Feb 2020 17:08:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1581872828.55fe9c5b26895e3f338047a70b57bee78c0641af.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gmt/gmt-4.5.18-r1.ebuild X-VCS-Directories: sci-geosciences/gmt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 55fe9c5b26895e3f338047a70b57bee78c0641af X-VCS-Branch: master Date: Sun, 16 Feb 2020 17:08:45 +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: ced6b591-de63-49ee-964e-1206e22d1eae X-Archives-Hash: 0b640ca9618080607b6d8715efc44163 commit: 55fe9c5b26895e3f338047a70b57bee78c0641af Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 16 15:50:24 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 16 17:07:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fe9c5b sci-geosciences/gmt: EAPI-7, style fixes, re-add eautoreconf Closes: https://bugs.gentoo.org/670226 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/gmt/gmt-4.5.18-r1.ebuild | 40 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild index 086f864b6b2..ac668505bc6 100644 --- a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild +++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools DESCRIPTION="Powerful map generator" HOMEPAGE="https://gmt.soest.hawaii.edu/" -SRC_URI=" - mirror://gmt/${P}-src.tar.bz2 +SRC_URI="mirror://gmt/${P}-src.tar.bz2 gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )" LICENSE="GPL-2+ gmttria? ( Artistic )" @@ -16,23 +15,28 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc examples debug +gdal gmttria +gshhg htmldoc +metric mex +netcdf octave postscript tutorial" -RDEPEND=" - !sci-biology/probcons - gdal? ( sci-libs/gdal ) - gshhg? ( sci-geosciences/gshhg-gmt ) - netcdf? ( >=sci-libs/netcdf-4.1 ) - octave? ( sci-mathematics/octave )" -DEPEND="${RDEPEND}" - # mex can use matlab too which i can't test -REQUIRED_USE=" - mex? ( octave ) +REQUIRED_USE="mex? ( octave )" + +DEPEND=" + gdal? ( sci-libs/gdal:= ) + gshhg? ( sci-geosciences/gshhg-gmt ) + netcdf? ( sci-libs/netcdf:= ) + octave? ( sci-mathematics/octave:= ) +" +RDEPEND="${DEPEND} + !sci-biology/probcons " PATCHES=( "${FILESDIR}"/${PN}-4.5.9-no-strip.patch "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch - ) +) + +src_prepare() { + default + eautoreconf +} src_configure() { local myconf=( @@ -71,17 +75,17 @@ src_install() { if use examples; then docompress -x /usr/share/doc/${PF}/examples else - rm -rf "${ED}/usr/share/doc/${PF}/examples" || die + rm -r "${ED}/usr/share/doc/${PF}/examples" || die fi if ! use htmldoc; then - rm -rf "${ED}/usr/share/doc/${PF}/html" || die + rm -r "${ED}/usr/share/doc/${PF}/html" || die fi if use tutorial; then docompress -x /usr/share/doc/${PF}/tutorial else - rm -rf "${ED}/usr/share/doc/${PF}/tutorial" || die + rm -r "${ED}/usr/share/doc/${PF}/tutorial" || die fi # remove static libs