| 1 |
commit: 962d783e8f971b4c82a0b457fa9c4f6be56e8005 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 18 03:04:19 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 18 03:05:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962d783e |
| 7 |
|
| 8 |
sci-geosciences/gmt: Drop 4.5.6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-geosciences/gmt/Manifest | 8 -- |
| 14 |
sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch | 62 -------------- |
| 15 |
sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch | 19 ----- |
| 16 |
sci-geosciences/gmt/gmt-4.5.6.ebuild | 95 ---------------------- |
| 17 |
sci-geosciences/gmt/metadata.xml | 2 - |
| 18 |
5 files changed, 186 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest |
| 21 |
index a59fa600c3e..63ed70439e3 100644 |
| 22 |
--- a/sci-geosciences/gmt/Manifest |
| 23 |
+++ b/sci-geosciences/gmt/Manifest |
| 24 |
@@ -1,11 +1,3 @@ |
| 25 |
DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e |
| 26 |
DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945 |
| 27 |
-DIST gmt-4.5.6-doc.tar.bz2 25230761 BLAKE2B 5e4ed5400accb3da2af6d6403ffb1b86b05a8fe6724b7fcf1728c31f56cfd0a4ce80fe47b9b3f5fcab1bc42ef8cc06ec0cc971cdd7397ab059035dfe9bc2e109 SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302 |
| 28 |
-DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886d3047392c4ab72311bb278f4a041516a16858f06103b8edfe6ec251db09e0a3e028bb944c289ba833f99c0af79f SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0 |
| 29 |
-DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e |
| 30 |
-DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027 |
| 31 |
-DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e |
| 32 |
DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22 |
| 33 |
-DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332 |
| 34 |
-DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375 |
| 35 |
-DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e |
| 36 |
|
| 37 |
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 |
| 38 |
deleted file mode 100644 |
| 39 |
index f0fe4c3e833..00000000000 |
| 40 |
--- a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,62 +0,0 @@ |
| 43 |
-Drop manipulation of several flags: |
| 44 |
- |
| 45 |
-* stripping of -g from CFLAGS, as it interferes with deliberate |
| 46 |
- generation of debug symbols and breaks on flags like -ggdb. |
| 47 |
-* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is |
| 48 |
- done as a separate step on Gentoo (and many other distros) in order |
| 49 |
- to faciliate retention or splitting of debug symbols. |
| 50 |
-* Setting of optimization flags, as the user should be free to choose |
| 51 |
- them. |
| 52 |
- |
| 53 |
-2009-07-27 Martin von Gagern |
| 54 |
- |
| 55 |
-Reference: http://bugs.gentoo.org/279268 |
| 56 |
- |
| 57 |
-Index: GMT4.5.0/configure |
| 58 |
-=================================================================== |
| 59 |
---- GMT4.5.0.orig/configure |
| 60 |
-+++ GMT4.5.0/configure |
| 61 |
-@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then |
| 62 |
- echo "${ECHO_T}yes" >&6; } |
| 63 |
- CFLAGS="$CFLAGS -g" |
| 64 |
- else |
| 65 |
-- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 66 |
-- if test "$os" = "Darwin" ; then |
| 67 |
-- LDFLAGS="$LDFLAGS -Wl,-x" |
| 68 |
-- else |
| 69 |
-- LDFLAGS="$LDFLAGS -s" |
| 70 |
-- fi |
| 71 |
-- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 72 |
-- CFLAGS="$CFLAGS -O2" |
| 73 |
-- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then |
| 74 |
-- CFLAGS="$CFLAGS" |
| 75 |
-- else |
| 76 |
-- CFLAGS="$CFLAGS -O" |
| 77 |
-- fi |
| 78 |
- { echo "$as_me:$LINENO: result: no" >&5 |
| 79 |
- echo "${ECHO_T}no" >&6; } |
| 80 |
- fi |
| 81 |
-Index: GMT4.5.0/configure.ac |
| 82 |
-=================================================================== |
| 83 |
---- GMT4.5.0.orig/configure.ac |
| 84 |
-+++ GMT4.5.0/configure.ac |
| 85 |
-@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then |
| 86 |
- AC_MSG_RESULT(yes) |
| 87 |
- CFLAGS="$CFLAGS -g" |
| 88 |
- else |
| 89 |
-- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 90 |
-- if test "$os" = "Darwin" ; then |
| 91 |
-- LDFLAGS="$LDFLAGS -Wl,-x" |
| 92 |
-- else |
| 93 |
-- LDFLAGS="$LDFLAGS -s" |
| 94 |
-- fi |
| 95 |
-- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 96 |
-- CFLAGS="$CFLAGS -O2" |
| 97 |
-- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then |
| 98 |
-- CFLAGS="$CFLAGS" |
| 99 |
-- else |
| 100 |
-- CFLAGS="$CFLAGS -O" |
| 101 |
-- fi |
| 102 |
- AC_MSG_RESULT(no) |
| 103 |
- fi |
| 104 |
- dnl ----------------------------------------------------------------- |
| 105 |
|
| 106 |
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 |
| 107 |
deleted file mode 100644 |
| 108 |
index e724b4ceab7..00000000000 |
| 109 |
--- a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,19 +0,0 @@ |
| 112 |
-Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'" |
| 113 |
-build failure; patch from upstream version 4.5.11 |
| 114 |
- |
| 115 |
-https://bugs.gentoo.org/show_bug.cgi?id=543624 |
| 116 |
- |
| 117 |
---- a/src/misc/gmtdigitize.c |
| 118 |
-+++ b/src/misc/gmtdigitize.c |
| 119 |
-@@ -37,6 +37,11 @@ |
| 120 |
- * |
| 121 |
- */ |
| 122 |
- |
| 123 |
-+#define _XOPEN_SOURCE |
| 124 |
-+#ifdef HAVE_UNISTD_H |
| 125 |
-+#include <unistd.h> |
| 126 |
-+#endif |
| 127 |
-+ |
| 128 |
- #include "gmt.h" |
| 129 |
- |
| 130 |
- #ifndef WIN32 |
| 131 |
|
| 132 |
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild |
| 133 |
deleted file mode 100644 |
| 134 |
index 9e73c830b20..00000000000 |
| 135 |
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,95 +0,0 @@ |
| 138 |
-# Copyright 1999-2016 Gentoo Foundation |
| 139 |
-# Distributed under the terms of the GNU General Public License v2 |
| 140 |
- |
| 141 |
-EAPI=5 |
| 142 |
- |
| 143 |
-inherit multilib autotools eutils |
| 144 |
- |
| 145 |
-GSHHS="gshhs-2.1.1" |
| 146 |
- |
| 147 |
-DESCRIPTION="Powerful map generator" |
| 148 |
-HOMEPAGE="http://gmt.soest.hawaii.edu/" |
| 149 |
-SRC_URI="mirror://gmt/legacy/${P}-src.tar.bz2 |
| 150 |
- mirror://gmt/legacy/${P}-share.tar.bz2 |
| 151 |
- mirror://gmt/legacy/${GSHHS}-coast.tar.bz2 |
| 152 |
- mirror://gmt/legacy/${P}-suppl.tar.bz2 |
| 153 |
- doc? ( mirror://gmt/legacy/${P}-doc.tar.bz2 ) |
| 154 |
- gmtfull? ( mirror://gmt/legacy/${GSHHS}-full.tar.bz2 ) |
| 155 |
- gmthigh? ( mirror://gmt/legacy/${GSHHS}-high.tar.bz2 ) |
| 156 |
- gmttria? ( mirror://gmt/legacy/${P}-triangle.tar.bz2 )" |
| 157 |
- |
| 158 |
-LICENSE="GPL-2 gmttria? ( Artistic )" |
| 159 |
-SLOT="0" |
| 160 |
-KEYWORDS="amd64 x86" |
| 161 |
-IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave postscript" |
| 162 |
- |
| 163 |
-RDEPEND=" |
| 164 |
- !sci-biology/probcons |
| 165 |
- netcdf? ( >=sci-libs/netcdf-4.1 ) |
| 166 |
- octave? ( sci-mathematics/octave ) |
| 167 |
-" |
| 168 |
-DEPEND="${RDEPEND}" |
| 169 |
- |
| 170 |
-RESTRICT="mirror" # for the gmttria |
| 171 |
- |
| 172 |
-S="${WORKDIR}/GMT${PV}" |
| 173 |
- |
| 174 |
-# mex can use matlab too which i can't test |
| 175 |
-REQUIRED_USE=" |
| 176 |
- mex? ( octave ) |
| 177 |
- gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh ) |
| 178 |
-" |
| 179 |
- |
| 180 |
-# hand written make files that are not parallel safe |
| 181 |
-MAKEOPTS+=" -j1" |
| 182 |
- |
| 183 |
-src_prepare() { |
| 184 |
- mv -f "${WORKDIR}/share/"* "${S}/share/" || die |
| 185 |
- |
| 186 |
- epatch \ |
| 187 |
- "${FILESDIR}/${PN}-4.5.0-no-strip.patch" \ |
| 188 |
- "${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \ |
| 189 |
- "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch |
| 190 |
- |
| 191 |
- eautoreconf |
| 192 |
-} |
| 193 |
- |
| 194 |
-src_configure() { |
| 195 |
- # triangle disabled due to non-comercial license |
| 196 |
- econf \ |
| 197 |
- --libdir=/usr/$(get_libdir)/${P} \ |
| 198 |
- --includedir=/usr/include/${P} \ |
| 199 |
- --datadir=/usr/share/${P} \ |
| 200 |
- --docdir=/usr/share/doc/${PF} \ |
| 201 |
- --disable-update \ |
| 202 |
- --disable-debug \ |
| 203 |
- --disable-gdal \ |
| 204 |
- --disable-matlab \ |
| 205 |
- --disable-xgrid \ |
| 206 |
- --enable-shared \ |
| 207 |
- $(use_enable netcdf) \ |
| 208 |
- $(use_enable octave) \ |
| 209 |
- $(use_enable debug devdebug) \ |
| 210 |
- $(use_enable !metric US) \ |
| 211 |
- $(use_enable postscript eps) \ |
| 212 |
- $(use_enable mex) \ |
| 213 |
- $(use_enable gmttria triangle) |
| 214 |
-} |
| 215 |
- |
| 216 |
-src_install() { |
| 217 |
- emake \ |
| 218 |
- DESTDIR="${D}" \ |
| 219 |
- install-gmt install-data install-suppl install-man |
| 220 |
- |
| 221 |
- # remove static libs |
| 222 |
- find "${D}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + |
| 223 |
- |
| 224 |
- dodoc README |
| 225 |
- use doc && dodoc -r "${S}"/share/doc/${PN}/* |
| 226 |
- |
| 227 |
- cat << _EOF_ > "${T}/99gmt" |
| 228 |
-GMTHOME=${EPREFIX}/usr/share/${P} |
| 229 |
-GMT_SHAREDIR=${EPREFIX}/usr/share/${P} |
| 230 |
-_EOF_ |
| 231 |
- doenvd "${T}/99gmt" |
| 232 |
-} |
| 233 |
|
| 234 |
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml |
| 235 |
index d0db455197c..ce97db5b54d 100644 |
| 236 |
--- a/sci-geosciences/gmt/metadata.xml |
| 237 |
+++ b/sci-geosciences/gmt/metadata.xml |
| 238 |
@@ -7,8 +7,6 @@ |
| 239 |
</maintainer> |
| 240 |
<use> |
| 241 |
<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> |
| 242 |
- <flag name="gmtfull">Full resolution bathymetry database</flag> |
| 243 |
- <flag name="gmthigh">Add high resolution bathymetry database</flag> |
| 244 |
<flag name="gmttria">Non GNU triangulation method, more efficient</flag> |
| 245 |
<flag name="gshhg">Install coastline database</flag> |
| 246 |
<flag name="htmldoc">Install html documentation</flag> |
Archives