commit: 1a93e3bf22879fc4f777df1137548a25f85327c7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 18:37:25 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 28 23:01:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a93e3bf
sci-geosciences/gmt: drop 4.5.18-r1, 6.3.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-geosciences/gmt/Manifest | 3 - .../gmt/files/gmt-4.5.6-respect-ldflags.patch | 56 ------------- sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch | 38 --------- sci-geosciences/gmt/gmt-4.5.18-r1.ebuild | 93 --------------------- sci-geosciences/gmt/gmt-6.3.0.ebuild | 97 ---------------------- sci-geosciences/gmt/metadata.xml | 4 - 6 files changed, 291 deletions(-) diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest index 3683afa881c4..f0bb96273d7c 100644 --- a/sci-geosciences/gmt/Manifest +++ b/sci-geosciences/gmt/Manifest @@ -1,5 +1,2 @@ -DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e -DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22 -DIST gmt-6.3.0-src.tar.xz 55396792 BLAKE2B b0b69506119caadcba5f5faf471b52009edadedc5104c60a540829aeb9c7786305d4760ba76d625f19adfc5f86c86dd10284876dfbceb055bdd78541862ebd32 SHA512 e02709b28f5940d92bfb4ddd9dcadd7c0e88d2973faa55732638e220cd23962ee605046bdf163b439f11379cb4665a178ab1ec4314dc897b6c5ee029b16aa2a5 DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40 diff --git a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch deleted file mode 100644 index 07494380fdfb..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urN GMT4.5.6/src/Makefile GMT4.5.6.new/src/Makefile ---- GMT4.5.6/src/Makefile 2011-03-03 22:02:50.000000000 +0100 -+++ GMT4.5.6.new/src/Makefile 2011-06-07 14:48:00.969500019 +0200 -@@ -195,13 +195,13 @@ - $(RANLIB) $@ - - libpsl.$(SL): libpsl.a -- $(LD) $(LD_OPT) pslib.o $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) pslib.o $(LIBS) -o $@ - - libgmt.$(SL): libgmt.a -- $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ - - libgmtps.$(SL): libgmtps.a libgmt.$(SL) libpsl.$(SL) -- $(LD) $(LD_OPT) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgd77/Makefile GMT4.5.6.new/src/mgd77/Makefile ---- GMT4.5.6/src/mgd77/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgd77/Makefile 2011-06-07 14:53:46.394181616 +0200 -@@ -93,7 +93,7 @@ - $(RANLIB) $@ - - libmgd77.$(SL): libmgd77.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgg/Makefile GMT4.5.6.new/src/mgg/Makefile ---- GMT4.5.6/src/mgg/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgg/Makefile 2011-06-07 14:54:48.096410233 +0200 -@@ -95,7 +95,7 @@ - $(RANLIB) $@ - - libgmt_mgg.$(SL): libgmt_mgg.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/x2sys/Makefile GMT4.5.6.new/src/x2sys/Makefile ---- GMT4.5.6/src/x2sys/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/x2sys/Makefile 2011-06-07 14:54:15.124822433 +0200 -@@ -83,7 +83,7 @@ - $(RANLIB) $@ - - libx2sys.$(SL): libx2sys.a -- $(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@ - - #------------------------------------------------------------------------------- - # program rules diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch deleted file mode 100644 index f57f1d811b05..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch +++ /dev/null @@ -1,38 +0,0 @@ -Drop manipulation of several flags: - -* stripping of -g from CFLAGS, as it interferes with deliberate - generation of debug symbols and breaks on flags like -ggdb. -* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is - done as a separate step on Gentoo (and many other distros) in order - to faciliate retention or splitting of debug symbols. -* Setting of optimization flags, as the user should be free to choose - them. - -2009-07-27 Martin von Gagern - -Reference: http://bugs.gentoo.org/279268 - -Index: GMT4.5.0/configure.ac -=================================================================== ---- GMT4.5.0.orig/configure.ac -+++ GMT4.5.0/configure.ac -@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -g" - else -- CFLAGS=`echo $CFLAGS | sed 's/-g//'` -- if test "$os" = "Darwin" ; then -- LDFLAGS="$LDFLAGS -Wl,-x" -- else -- LDFLAGS="$LDFLAGS -s" -- fi -- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then -- CFLAGS="$CFLAGS -O2" -- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then -- CFLAGS="$CFLAGS" -- else -- CFLAGS="$CFLAGS -O" -- fi - AC_MSG_RESULT(no) - fi - dnl ----------------------------------------------------------------- diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild deleted file mode 100644 index a7e01472873c..000000000000 --- a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Powerful map generator" -HOMEPAGE="https://gmt.soest.hawaii.edu/"; -SRC_URI="mirror://gmt/${P}-src.tar.bz2 - gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )" - -LICENSE="GPL-2+ gmttria? ( Artistic )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc examples debug +gdal gmttria +gshhg htmldoc +metric mex +netcdf octave postscript tutorial" - -# mex can use matlab too which i can't test -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=( - --datadir=/usr/share/${P} - --includedir=/usr/include/${P} - --disable-update - --disable-matlab - --disable-xgrid - --disable-debug - $(use_enable gdal) - $(use_enable netcdf) - $(use_enable octave) - $(use_enable debug devdebug) - $(use_enable !metric US) - $(use_enable postscript eps) - $(use_enable mex) - $(use_enable gmttria triangle) - $(use_with gshhg gshhg-dir /usr/share/gshhg) - ) - econf "${myconf[@]}" -} - -src_compile() { - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" -j1 install-all - einstalldocs - - # Remove various documentation - if ! use doc; then - rm -rf "${ED}/usr/share/doc/${PF}/pdf" || die - fi - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -r "${ED}/usr/share/doc/${PF}/examples" || die - fi - - if ! use htmldoc; then - rm -r "${ED}/usr/share/doc/${PF}/html" || die - fi - - if use tutorial; then - docompress -x /usr/share/doc/${PF}/tutorial - else - rm -r "${ED}/usr/share/doc/${PF}/tutorial" || die - fi - - # remove static libs - find "${ED}/usr/$(get_libdir)" -name '*.a' -delete || die -} diff --git a/sci-geosciences/gmt/gmt-6.3.0.ebuild b/sci-geosciences/gmt/gmt-6.3.0.ebuild deleted file mode 100644 index 97ec47620ea1..000000000000 --- a/sci-geosciences/gmt/gmt-6.3.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 cmake - -DESCRIPTION="Powerful map generator" -HOMEPAGE="https://www.generic-mapping-tools.org"; -SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${P}-src.tar.xz"; - -LICENSE="GPL-3+ gmttria? ( Artistic )" -SLOT="6" -KEYWORDS="~amd64 ~x86" -IUSE="blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre pcre2 threads zlib" - -REQUIRED_USE="?? ( pcre pcre2 )" - -DEPEND=" - app-text/ghostscript-gpl:= - media-gfx/graphicsmagick:= - net-misc/curl - >=sci-libs/netcdf-4.1:=[hdf5] - media-video/ffmpeg:= - blas? ( virtual/blas ) - fftw? ( sci-libs/fftw:3.0= ) - gdal? ( sci-libs/gdal:= ) - geos? ( sci-libs/geos ) - lapack? ( virtual/lapack ) - pcre? ( dev-libs/libpcre:= ) - pcre2? ( dev-libs/libpcre2:= ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND="${DEPEND} - !sci-biology/probcons - sci-geosciences/dcw-gmt - sci-geosciences/gshhg-gmt -" - -src_prepare() { - cmake_src_prepare - # Rename man pages to avoid a name conflict with gmt5 - pushd man_release || die - local m c suffix newc - for m in *.gz; do - c=${m%%.*} - suffix=${m#*.} - if [[ "${c}" == "gmt" ]]; then - newc=gmt${SLOT} - else - newc=gmt${SLOT}_${c} - fi - mv "${c}.${suffix}" "${newc}.${suffix}" || die - done - popd || die -} - -src_configure() { - local mycmakeargs=( - -DGMT_DATADIR="share/${P}" - -DGMT_DOCDIR="share/doc/${PF}" - -DGMT_MANDIR="share/man" - -DLICENSE_RESTRICTED=$(usex gmttria no yes) - -DGMT_ENABLE_OPENMP=$(usex openmp) - -DGMT_USE_THREADS=$(usex threads) - -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=OFF # Install bash completions properly - -DGMT_INSTALL_MODULE_LINKS=OFF # Don't install symlinks on gmt binary, they are conflicted with gmt5 - -DGMT_INSTALL_NAME_SUFFIX="${SLOT}" - -DBASH_COMPLETION_DIR="$(get_bashcompdir)" - $(cmake_use_find_package blas BLAS) - $(cmake_use_find_package gdal GDAL) - $(cmake_use_find_package geos GEOS) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package lapack LAPACK) - $(cmake_use_find_package pcre PCRE) - $(cmake_use_find_package zlib ZLIB) - ) - use pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - docompress -x /usr/share/doc/${PF}/examples - docompress -x /usr/share/doc/${PF}/tutorial - - # remove conflicting symlink - rm "${ED}/usr/bin/gmt" || die - rm "${ED}/usr/$(get_libdir)/libgmt.so" || die - rm "${ED}/usr/$(get_libdir)/libpostscriptlight.so" || die - - # Decompress manuals - find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die - # Rename bash completion file - mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt${SLOT}" || die -} diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml index 6395ce2e1493..089070826efa 100644 --- a/sci-geosciences/gmt/metadata.xml +++ b/sci-geosciences/gmt/metadata.xml @@ -9,11 +9,7 @@ <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag> <flag name="gmttria">Non GNU triangulation method, more efficient</flag> - <flag name="gshhg">Install coastline database</flag> <flag name="htmldoc">Install html documentation</flag> - <flag name="metric">Use SI (cm) units instead of US (inches) ones</flag> - <flag name="mex">Enable compilation of mex supplement which requires Octave/Matlab</flag> - <flag name="octave">Enable octave support</flag> <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for regular expressions</flag> <flag name="tutorial">Install data files for tutorial</flag> </use>
