* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/files/, sci-geosciences/gmt/
@ 2020-02-16 17:08 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 557843f933be99d24274fadaffdf9e71ae41eda2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 15:52:02 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:07:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557843f9
sci-geosciences/gmt: Drop 4.5.8, 4.5.9, 4.5.18
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/gmt/Manifest | 6 --
.../gmt/files/gmt-4.5.8-bfr-overflow.patch | 27 -------
sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch | 16 ----
sci-geosciences/gmt/gmt-4.5.18.ebuild | 85 --------------------
sci-geosciences/gmt/gmt-4.5.8.ebuild | 91 ---------------------
sci-geosciences/gmt/gmt-4.5.9.ebuild | 92 ----------------------
6 files changed, 317 deletions(-)
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index aeeb947dfc1..a59fa600c3e 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -5,13 +5,7 @@ DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886
DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e
DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027
DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e
-DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db8ef00362b2f1fc7c50edd76ffb14810da0eb1837a31f8a4b31391308f45f4c7289303d3bc4885f5c152d62b49151b5 SHA512 04b3eefd1490b194d7797af86fc726dd84960d65dd955e5ddefaf6ea4ec5a98f6f00085acc0cc846aa70e986facf65221256dd6a625f918c6abe6ba0b6b06f64
-DIST gmt-4.5.8.tar.bz2 39350328 BLAKE2B 8d1e0c588ef4ecef1d64a4071101d9a0c14ba9780a213ce1b121840c0acd676f43931f4a4f03a539b40bfba57935f8a9e9bae3cb3630410f15cccb3bd57eb87b SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd
-DIST gmt-4.5.9-non-gpl.tar.bz2 103494 BLAKE2B a056845917a7eb2c6e66a8797a2d47a2fe4c9a659b98242ff6953f9194d86d56a85c3e1e973f562d060a3d3396845847de683e06b6b929effb84ca0c625afe8e SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5
-DIST gmt-4.5.9.tar.bz2 39325492 BLAKE2B 012afa7555d7262a4b8ae9af90309653f6f374fdb34bffbc1f0052e2cbee93b17d1f6e70934e3de555f83774a34c278bc81f5a6cc7521840a35bc70001d9ee6f SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242
DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
-DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332
DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375
DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e
-DIST gshhs-2.2.0.tar.bz2 47021761 BLAKE2B 89ffbca48d782a64ec1ecf7945915a64ab70385c1db3fef65bf1d41db46f3c047554d51c13de20706fe84d1568593679fb822b23d8ab580c100159475edd9cf1 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch b/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
deleted file mode 100644
index 216149d93f7..00000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c
-index b27b1d9..6a25576 100644
---- a/src/mgd77/mgd77.c
-+++ b/src/mgd77/mgd77.c
-@@ -854,7 +854,7 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
- case 3: strcpy (P->Parameters_Surveyed_Code, word); break;
- case 4: strncpy (P->File_Creation_Year, word, 4);
- strncpy (P->File_Creation_Month, &word[4], 2);
-- strncpy (P->File_Creation_Day, &word[6], 4); break;
-+ strncpy (P->File_Creation_Day, &word[6], 2); break;
- case 5: strcpy (P->Source_Institution, word); break;
- case 6: strcpy (P->Country, word); break;
- case 7: strcpy (P->Platform_Name, word); break;
-@@ -865,11 +865,11 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
- case 12: strcpy (P->Funding, word); break;
- case 13: strncpy (P->Survey_Departure_Year, word, 4);
- strncpy (P->Survey_Departure_Month, &word[4], 2);
-- strncpy (P->Survey_Departure_Day, &word[6], 4); break;
-+ strncpy (P->Survey_Departure_Day, &word[6], 2); break;
- case 14: strcpy (P->Port_of_Departure, word); break;
- case 15: strncpy (P->Survey_Arrival_Year, word, 4);
- strncpy (P->Survey_Arrival_Month, &word[4], 2);
-- strncpy (P->Survey_Arrival_Day, &word[6], 4); break;
-+ strncpy (P->Survey_Arrival_Day, &word[6], 2); break;
- case 16: strcpy (P->Port_of_Arrival, word); break;
- case 17: strcpy (P->Navigation_Instrumentation, word); break;
- case 18: strcpy (P->Geodetic_Datum_Position_Determination_Method, word); break;
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch b/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
deleted file mode 100644
index 5c63bb20957..00000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/gmt.h b/src/gmt.h
-index d4c9c20..ea6ddc5 100644
---- a/src/gmt.h
-+++ b/src/gmt.h
-@@ -34,9 +34,11 @@ extern "C" {
-
- /* GMT is POSIX.1 COMPLIANT */
-
-+/*
- #ifndef _POSIX_SOURCE
- #define _POSIX_SOURCE 1
- #endif
-+*/
-
- /* Declaration modifiers for DLL support (MSC et al) */
-
\ No newline at end of file
diff --git a/sci-geosciences/gmt/gmt-4.5.18.ebuild b/sci-geosciences/gmt/gmt-4.5.18.ebuild
deleted file mode 100644
index 9730b119d3c..00000000000
--- a/sci-geosciences/gmt/gmt-4.5.18.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-GSHHG="gshhg-gmt-2.3.7"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="https://gmt.soest.hawaii.edu/"
-SRC_URI="
- mirror://gmt/${P}-src.tar.bz2
- mirror://gmt/${GSHHG}.tar.gz
- gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
- !sci-biology/probcons
- gdal? ( sci-libs/gdal )
- 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 )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.5.9-no-strip.patch
- "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
- )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- default
-
- mkdir "${S}/share/coast" || die
- mv -f "${WORKDIR}/${GSHHG}/"*.nc "${S}/share/coast/" || die
-}
-
-src_configure() {
- econf \
- --libdir=/usr/$(get_libdir)/${P} \
- --includedir=/usr/include/${P} \
- --datadir=/usr/share/${P} \
- --docdir=/usr/share/doc/${PF} \
- --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)
-}
-
-src_install() {
- emake DESTDIR="${D}" install-all
- einstalldocs
-
- docompress -x /usr/share/doc/${PF}/{examples,tutorial}
-
- # remove static libs
- find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + || die
-
- cat <<- _EOF_ > "${T}/99gmt"
- GMTHOME="${EPREFIX}/usr/share/${P}"
- GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
- _EOF_
- doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.8.ebuild b/sci-geosciences/gmt/gmt-4.5.8.ebuild
deleted file mode 100644
index e61d5070043..00000000000
--- a/sci-geosciences/gmt/gmt-4.5.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib toolchain-funcs
-
-GSHHS="gshhs-2.2.0"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="
- mirror://gmt/legacy/${P}.tar.bz2
- mirror://gmt/legacy/${GSHHS}.tar.bz2
- gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
- !sci-biology/probcons
- gdal? ( sci-libs/gdal )
- netcdf? ( >=sci-libs/netcdf-4.1 )
- octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
- mex? ( octave )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.5.0-no-strip.patch
- "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
- "${FILESDIR}"/${P}-bfr-overflow.patch
- "${FILESDIR}"/${P}-impl-dec.patch
- )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
- tc-export AR RANLIB
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --libdir=/usr/$(get_libdir)/${P}
- --includedir=/usr/include/${P}
- --datadir=/usr/share/${P}
- --docdir=/usr/share/doc/${PF}
- --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)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install install-all
-
- # remove static libs
- find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
- cat <<- _EOF_ > "${T}/99gmt"
- GMTHOME="${EPREFIX}/usr/share/${P}"
- GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
- _EOF_
- doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild
deleted file mode 100644
index 329cb136f13..00000000000
--- a/sci-geosciences/gmt/gmt-4.5.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib toolchain-funcs
-
-GSHHS="gshhs-2.2.0"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="
- mirror://gmt/legacy/${P}.tar.bz2
- mirror://gmt/legacy/${GSHHS}.tar.bz2
- gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
- !sci-biology/probcons
- gdal? ( sci-libs/gdal )
- netcdf? ( >=sci-libs/netcdf-4.1 )
- octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
- mex? ( octave )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.5.9-no-strip.patch
- "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
- "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
- )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
- tc-export AR RANLIB
-
- autotools-utils_src_prepare
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --libdir=/usr/$(get_libdir)/${P}
- --includedir=/usr/include/${P}
- --datadir=/usr/share/${P}
- --docdir=/usr/share/doc/${PF}
- --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)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install install-all
-
- # remove static libs
- find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
- cat <<- _EOF_ > "${T}/99gmt"
- GMTHOME="${EPREFIX}/usr/share/${P}"
- GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
- _EOF_
- doenvd "${T}/99gmt"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/files/, sci-geosciences/gmt/
@ 2020-02-18 3:05 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-02-18 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 962d783e8f971b4c82a0b457fa9c4f6be56e8005
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 03:04:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 03:05:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962d783e
sci-geosciences/gmt: Drop 4.5.6
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/gmt/Manifest | 8 --
sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch | 62 --------------
sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch | 19 -----
sci-geosciences/gmt/gmt-4.5.6.ebuild | 95 ----------------------
sci-geosciences/gmt/metadata.xml | 2 -
5 files changed, 186 deletions(-)
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index a59fa600c3e..63ed70439e3 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,11 +1,3 @@
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-4.5.6-doc.tar.bz2 25230761 BLAKE2B 5e4ed5400accb3da2af6d6403ffb1b86b05a8fe6724b7fcf1728c31f56cfd0a4ce80fe47b9b3f5fcab1bc42ef8cc06ec0cc971cdd7397ab059035dfe9bc2e109 SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302
-DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886d3047392c4ab72311bb278f4a041516a16858f06103b8edfe6ec251db09e0a3e028bb944c289ba833f99c0af79f SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0
-DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e
-DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027
-DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e
DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
-DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332
-DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375
-DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e
diff --git a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
deleted file mode 100644
index f0fe4c3e833..00000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
+++ /dev/null
@@ -1,62 +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
-===================================================================
---- GMT4.5.0.orig/configure
-+++ GMT4.5.0/configure
-@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then
- echo "${ECHO_T}yes" >&6; }
- 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
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-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/files/gmt-4.5.9-unistd.h.patch b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
deleted file mode 100644
index e724b4ceab7..00000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'"
-build failure; patch from upstream version 4.5.11
-
-https://bugs.gentoo.org/show_bug.cgi?id=543624
-
---- a/src/misc/gmtdigitize.c
-+++ b/src/misc/gmtdigitize.c
-@@ -37,6 +37,11 @@
- *
- */
-
-+#define _XOPEN_SOURCE
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #include "gmt.h"
-
- #ifndef WIN32
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
deleted file mode 100644
index 9e73c830b20..00000000000
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib autotools eutils
-
-GSHHS="gshhs-2.1.1"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="mirror://gmt/legacy/${P}-src.tar.bz2
- mirror://gmt/legacy/${P}-share.tar.bz2
- mirror://gmt/legacy/${GSHHS}-coast.tar.bz2
- mirror://gmt/legacy/${P}-suppl.tar.bz2
- doc? ( mirror://gmt/legacy/${P}-doc.tar.bz2 )
- gmtfull? ( mirror://gmt/legacy/${GSHHS}-full.tar.bz2 )
- gmthigh? ( mirror://gmt/legacy/${GSHHS}-high.tar.bz2 )
- gmttria? ( mirror://gmt/legacy/${P}-triangle.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
- !sci-biology/probcons
- netcdf? ( >=sci-libs/netcdf-4.1 )
- octave? ( sci-mathematics/octave )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror" # for the gmttria
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
- mex? ( octave )
- gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
- mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
- epatch \
- "${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
- "${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \
- "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
-
- eautoreconf
-}
-
-src_configure() {
- # triangle disabled due to non-comercial license
- econf \
- --libdir=/usr/$(get_libdir)/${P} \
- --includedir=/usr/include/${P} \
- --datadir=/usr/share/${P} \
- --docdir=/usr/share/doc/${PF} \
- --disable-update \
- --disable-debug \
- --disable-gdal \
- --disable-matlab \
- --disable-xgrid \
- --enable-shared \
- $(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)
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- install-gmt install-data install-suppl install-man
-
- # remove static libs
- find "${D}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
- dodoc README
- use doc && dodoc -r "${S}"/share/doc/${PN}/*
-
- cat << _EOF_ > "${T}/99gmt"
-GMTHOME=${EPREFIX}/usr/share/${P}
-GMT_SHAREDIR=${EPREFIX}/usr/share/${P}
-_EOF_
- doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index d0db455197c..ce97db5b54d 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -7,8 +7,6 @@
</maintainer>
<use>
<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
- <flag name="gmtfull">Full resolution bathymetry database</flag>
- <flag name="gmthigh">Add high resolution bathymetry database</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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/files/, sci-geosciences/gmt/
@ 2023-01-28 23:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 23:01 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/files/, sci-geosciences/gmt/
@ 2024-12-01 8:37 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-12-01 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 3ca573c730559e095047180c04dc4f45dcaf758f
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Nov 30 16:08:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 08:36:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca573c7
sci-geosciences/gmt: fix implicit function declaration
[sam: Revbump for modern C fix.]
Closes: https://bugs.gentoo.org/945480
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/39531
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gmt/files/gmt-6.4.0-mergesort.patch | 57 ++++++++++++++++++++++
.../gmt/{gmt-6.4.0.ebuild => gmt-6.4.0-r1.ebuild} | 6 ++-
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch b/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch
new file mode 100644
index 000000000000..55a31f29e44b
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch
@@ -0,0 +1,57 @@
+From a898ed6598541a70976a44ece58f5f358a80e1bc Mon Sep 17 00:00:00 2001
+From: Paul Wessel <pwessel@hawaii.edu>
+Date: Mon, 24 Apr 2023 14:41:35 +0200
+Subject: [PATCH] Ensure mergesort is declared if needed
+Upstream: https://github.com/GenericMappingTools/gmt/pull/7411
+Bug: https://bugs.gentoo.org/945480
+
+See #7410 for background. Here I implement it a bit differently. The mergesort function is used both in a module (gmtspatial) as well as by some gmt_*.c libraries, hence if it is not part of the standard libraries we declare it in gmt_prototypes.h so it is set for both modules and libs.
+--- a/src/gmt_init.c
++++ b/src/gmt_init.c
+@@ -167,6 +167,10 @@
+ # include <mex.h>
+ #endif
+
++#ifndef HAVE_MERGESORT
++#include "mergesort.c"
++#endif
++
+ /* These are used in gmtinit_init_custom_annot and gmtinit_decode_tinfo only */
+ #define GMT_ITEM_ANNOT 0
+ #define GMT_ITEM_INTVAL 1
+--- a/src/gmt_prototypes.h
++++ b/src/gmt_prototypes.h
+@@ -39,6 +39,15 @@ EXTERN_MSC void gmt_grd_dump (struct GMT_GRID_HEADER *header, gmt_grdfloat *grid
+ EXTERN_MSC char * gmt_strdup (struct GMT_CTRL *GMT, const char *s);
+ #endif
+
++#ifdef __APPLE__
++/* macOX has it built in, so ensure we define this flag */
++#define HAVE_MERGESORT
++#endif
++
++#ifndef HAVE_MERGESORT
++EXTERN_MSC int mergesort (void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void *));
++#endif
++
+ /* gmt_nc.c: */
+
+ EXTERN_MSC bool gmt_nc_is_cube (struct GMTAPI_CTRL *API, char *file);
+--- a/src/gmtspatial.c
++++ b/src/gmtspatial.c
+@@ -165,15 +165,6 @@ struct GMTSPATIAL_PAIR {
+ uint64_t pos;
+ };
+
+-#ifdef __APPLE__
+-/* macOX has it built in, so ensure we define this flag */
+-#define HAVE_MERGESORT
+-#endif
+-
+-#ifndef HAVE_MERGESORT
+-#include "mergesort.c"
+-#endif
+-
+ static void *New_Ctrl (struct GMT_CTRL *GMT) { /* Allocate and initialize a new control structure */
+ struct GMTSPATIAL_CTRL *C;
+
diff --git a/sci-geosciences/gmt/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0-r1.ebuild
similarity index 96%
rename from sci-geosciences/gmt/gmt-6.4.0.ebuild
rename to sci-geosciences/gmt/gmt-6.4.0-r1.ebuild
index ab7b61b5eb63..7f7d94e82835 100644
--- a/sci-geosciences/gmt/gmt-6.4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-6.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
sci-geosciences/gshhg-gmt
"
+PATCHES=(
+ "${FILESDIR}/${P}-mergesort.patch"
+)
+
src_prepare() {
cmake_src_prepare
# Rename man pages to avoid a name conflict with gmt5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-01 8:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-28 23:01 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/files/, sci-geosciences/gmt/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-12-01 8:37 Sam James
2020-02-18 3:05 Andreas Sturmlechner
2020-02-16 17:08 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox