public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2016-01-10 20:10 Amy Winston
  0 siblings, 0 replies; 15+ messages in thread
From: Amy Winston @ 2016-01-10 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f6e3cb92f3e41ab3ea359f8a1bf099707081bf79
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 20:04:28 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 20:04:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e3cb92

sci-geosciences/gmt: fetch repaired bug #561202

Package-Manager: portage-2.2.24

 sci-geosciences/gmt/Manifest         | 16 ++++++++--------
 sci-geosciences/gmt/gmt-4.5.6.ebuild | 22 +++++++++++-----------
 sci-geosciences/gmt/gmt-4.5.8.ebuild | 10 +++++-----
 sci-geosciences/gmt/gmt-4.5.9.ebuild | 10 +++++-----
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index d5a8019..99f04d0 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,13 +1,13 @@
-DIST GMT4.5.6_doc.tar.bz2 25230761 SHA256 9fbdf427ef06e666d83871c9e1241e5b578906b82e5c382d38fe75dfb40645dd SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302 WHIRLPOOL 36a13a4a5bfae1f660fb684c5ebb6b2785cb3bef89d2840360f0cd61e4228c7ae4f147a1fcbd83f1dcb4d40f7d1afdfad1303ae354291424ccd630ae6f1aafd1
-DIST GMT4.5.6_share.tar.bz2 43704 SHA256 364fcd62e1ed422d40399b92815e1196e916ea86f5a460cc799406754220234d SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0 WHIRLPOOL a30b9b3bff58a0db9f70529c262c3db0a73a39aed962063f0299f3147973eae952f6edd0bbb58e4cfdb9b8530213bf16661d8970391852267354284f81a515d0
-DIST GMT4.5.6_src.tar.bz2 1134118 SHA256 f58b24320e9ffd2a2196aa68689dbc8b3bf01a13c4efc30a28aba2dd5b65e7b4 SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e WHIRLPOOL e58762ee4c2dd4cc553e8e1eb0e6a972f1060221944e1cebfe712bfbda19b579e5937a4ce1937d0743978989b087246b63c2fcad730b69e5685ef63e16107edc
-DIST GMT4.5.6_suppl.tar.bz2 4137369 SHA256 572d23252055ed1e1d72f07e7aee86d92c4cd15b47fd55b0ecf39bfb7f014bee SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027 WHIRLPOOL 55abc1471e582385420392a81c4d46c045cf85c94cbade0db6f6c9c0bb88e2a0cba7182125c686e1b4464f74ce8a06d99d4f57f55ebcccf62f538cbd29e8b646
-DIST GMT4.5.6_triangle.tar.bz2 103426 SHA256 0ef5ca66eebd1386b1f59e2577cedb2d7e68c8bff83d4b57a648d1b04026a05c SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e WHIRLPOOL de80a48ddfa9edb82a4312843ec604c2e78e73b756212293f88d0ae4cdaf259f6de5eae5c0178b7fed53c7f640147f1705b4f685c21f2e4840f66330eea12b0d
-DIST GSHHS2.1.1_coast.tar.bz2 4322743 SHA256 9d78154cc316553e7ade8c79792d15e97469615f67e256e91b35da4bf0e64730 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332 WHIRLPOOL 6658cd37fe2db73baa629566765e1657f5ecb214ccfad88c2cff7dd0524b45f89897f87ca7a8d1698e9ebd3a7592c437764a99c333c0967fa6bc18058381f653
-DIST GSHHS2.1.1_full.tar.bz2 29916230 SHA256 a81f6cdf64cad78c36b71c550079f11ebc11305b399f2c5354dc0d4087977938 SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375 WHIRLPOOL acb9edd5d4d468b8903646155a6d85f80bdebd54debc7af0f04934010fb211b4da8c94396177de7410a9c92caef02e3a3dddc9e89075dfcda34843f45b1543f8
-DIST GSHHS2.1.1_high.tar.bz2 9712697 SHA256 a19e1e4b205419d56ae3dca98a71dd0001eb5aab2ebc5f436c1d7e6e741945c7
+DIST gmt-4.5.6-doc.tar.bz2 25230761 SHA256 9fbdf427ef06e666d83871c9e1241e5b578906b82e5c382d38fe75dfb40645dd SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302 WHIRLPOOL 36a13a4a5bfae1f660fb684c5ebb6b2785cb3bef89d2840360f0cd61e4228c7ae4f147a1fcbd83f1dcb4d40f7d1afdfad1303ae354291424ccd630ae6f1aafd1
+DIST gmt-4.5.6-share.tar.bz2 43704 SHA256 364fcd62e1ed422d40399b92815e1196e916ea86f5a460cc799406754220234d SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0 WHIRLPOOL a30b9b3bff58a0db9f70529c262c3db0a73a39aed962063f0299f3147973eae952f6edd0bbb58e4cfdb9b8530213bf16661d8970391852267354284f81a515d0
+DIST gmt-4.5.6-src.tar.bz2 1134118 SHA256 f58b24320e9ffd2a2196aa68689dbc8b3bf01a13c4efc30a28aba2dd5b65e7b4 SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e WHIRLPOOL e58762ee4c2dd4cc553e8e1eb0e6a972f1060221944e1cebfe712bfbda19b579e5937a4ce1937d0743978989b087246b63c2fcad730b69e5685ef63e16107edc
+DIST gmt-4.5.6-suppl.tar.bz2 4137369 SHA256 572d23252055ed1e1d72f07e7aee86d92c4cd15b47fd55b0ecf39bfb7f014bee SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027 WHIRLPOOL 55abc1471e582385420392a81c4d46c045cf85c94cbade0db6f6c9c0bb88e2a0cba7182125c686e1b4464f74ce8a06d99d4f57f55ebcccf62f538cbd29e8b646
+DIST gmt-4.5.6-triangle.tar.bz2 103426 SHA256 0ef5ca66eebd1386b1f59e2577cedb2d7e68c8bff83d4b57a648d1b04026a05c SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e WHIRLPOOL de80a48ddfa9edb82a4312843ec604c2e78e73b756212293f88d0ae4cdaf259f6de5eae5c0178b7fed53c7f640147f1705b4f685c21f2e4840f66330eea12b0d
 DIST gmt-4.5.8-non-gpl.tar.bz2 109125 SHA256 f68c9ee5d0376f0931643be9afc34f21f2f8752117c7fdfb46a7239c1acdc98f SHA512 04b3eefd1490b194d7797af86fc726dd84960d65dd955e5ddefaf6ea4ec5a98f6f00085acc0cc846aa70e986facf65221256dd6a625f918c6abe6ba0b6b06f64 WHIRLPOOL 882789617e091bd844ae2e30e80d328492d5b2a5b033ec2ac876ea2a95c0b1fb8e2b75f0d5529c4d9d20a74a2c782ebff4a8c61d53c0a651a96f0e0cb37df1e8
 DIST gmt-4.5.8.tar.bz2 39350328 SHA256 de3398acaf3ecb34f48c8a61a916c6037276793bd4b13bef376282a7731e54d4 SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd WHIRLPOOL 2e09cd006818c3b656bacd54b9f28642993f26a5ada6d92ce52026bf0530746705fdba4a46aa44bd30855784b3f8cebc0047b2e3c683d24bdcb8d7c0025ffc69
 DIST gmt-4.5.9-non-gpl.tar.bz2 103494 SHA256 29103015063d61b5b6103775a1bd7cc56b053018bb2fa680213839a98215897b SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5 WHIRLPOOL d59d894b2d6b5822a71501e51ab0e328c2fe9367c1d1c64591971004c594554fe8a692d84a1a76b84f614556f8c8d31ae83245a1c6fbc9a70aed53934272c7c1
 DIST gmt-4.5.9.tar.bz2 39325492 SHA256 9b13be96ccf4bbd38c14359c05dfa7eeeb4b5f06d6f4be9c33d6c3ea276afc86 SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242 WHIRLPOOL ca890bc544f0861bf722f623773d41fac294874be76b25222a71ac0f9ef725069982ca9f77c5ca7558eadcd2a8b8e8bd1a934bf467ba1ef873ccbbc1f9a024fb
+DIST gshhs-2.1.1-coast.tar.bz2 4322743 SHA256 9d78154cc316553e7ade8c79792d15e97469615f67e256e91b35da4bf0e64730 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332 WHIRLPOOL 6658cd37fe2db73baa629566765e1657f5ecb214ccfad88c2cff7dd0524b45f89897f87ca7a8d1698e9ebd3a7592c437764a99c333c0967fa6bc18058381f653
+DIST gshhs-2.1.1-full.tar.bz2 29916230 SHA256 a81f6cdf64cad78c36b71c550079f11ebc11305b399f2c5354dc0d4087977938 SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375 WHIRLPOOL acb9edd5d4d468b8903646155a6d85f80bdebd54debc7af0f04934010fb211b4da8c94396177de7410a9c92caef02e3a3dddc9e89075dfcda34843f45b1543f8
+DIST gshhs-2.1.1-high.tar.bz2 9712697 SHA256 a19e1e4b205419d56ae3dca98a71dd0001eb5aab2ebc5f436c1d7e6e741945c7 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e WHIRLPOOL da74e96a61c3458591f196b15a48da79e8296d4a4475834c2c9f07bd98eab60676f4e04d0ecc6a5bfa95cda0b28c84fc982396438dd7a3fbcf7cad99341ba20a
 DIST gshhs-2.2.0.tar.bz2 47021761 SHA256 e6c6c93ae10c9476c33934d46f5fb54a4d12463bdfb46f8e1c2f189ed4a4dfd2 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83 WHIRLPOOL 125aa0f8e4da1b1f62b0380250cd06ec2f5d1e0f7b8c2316feebd6a49bb229a8608156d1555e2e241772c716fc452f6c7cc38d64877e7ee44c1e76f0b09d3c59

diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
index 821b040..1a42018 100644
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.6.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit multilib autotools eutils
 
-GSHHS="GSHHS2.1.1"
+GSHHS="gshhs-2.1.1"
 
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="mirror://gmt/GMT${PV}_src.tar.bz2
-	mirror://gmt/GMT${PV}_share.tar.bz2
-	mirror://gmt/${GSHHS}_coast.tar.bz2
-	mirror://gmt/GMT${PV}_suppl.tar.bz2
-	doc? ( mirror://gmt/GMT${PV}_doc.tar.bz2 )
-	gmtfull? ( mirror://gmt/${GSHHS}_full.tar.bz2 )
-	gmthigh? ( mirror://gmt/${GSHHS}_high.tar.bz2 )
-	gmttria? ( mirror://gmt/GMT${PV}_triangle.tar.bz2 )"
+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"

diff --git a/sci-geosciences/gmt/gmt-4.5.8.ebuild b/sci-geosciences/gmt/gmt-4.5.8.ebuild
index 69de6f0..22b8ef9 100644
--- a/sci-geosciences/gmt/gmt-4.5.8.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=yes
 
@@ -13,9 +13,9 @@ GSHHS="gshhs-2.2.0"
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
 SRC_URI="
-	mirror://gmt/${P}.tar.bz2
-	mirror://gmt/${GSHHS}.tar.bz2
-	gmttria? ( mirror://gmt/${P}-non-gpl.tar.bz2 )"
+	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"

diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild
index 03bb413..062a2a2 100644
--- a/sci-geosciences/gmt/gmt-4.5.9.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=yes
 
@@ -13,9 +13,9 @@ GSHHS="gshhs-2.2.0"
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
 SRC_URI="
-	mirror://gmt/${P}.tar.bz2
-	mirror://gmt/${GSHHS}.tar.bz2
-	gmttria? ( mirror://gmt/${P}-non-gpl.tar.bz2 )"
+	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"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2018-08-18  9:33 Amy Liffey
  0 siblings, 0 replies; 15+ messages in thread
From: Amy Liffey @ 2018-08-18  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     313d2aef432078db4a1d72fbb450d35066d4aa06
Author:     Michael Uleysky <uleysky <AT> gmail <DOT> com>
AuthorDate: Thu May 31 05:37:22 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 09:32:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313d2aef

sci-geosciences/gmt: version bump 4.5.18

Closes: https://github.com/gentoo/gentoo/pull/9454

 sci-geosciences/gmt/Manifest          |  3 ++
 sci-geosciences/gmt/gmt-4.5.18.ebuild | 85 +++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 4381b9971b2..44f607655fe 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,3 +1,5 @@
+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
@@ -7,6 +9,7 @@ DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db
 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 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

diff --git a/sci-geosciences/gmt/gmt-4.5.18.ebuild b/sci-geosciences/gmt/gmt-4.5.18.ebuild
new file mode 100644
index 00000000000..9730b119d3c
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.18.ebuild
@@ -0,0 +1,85 @@
+# 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"
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-16 17:08 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c536857dc3ca88dc25936ad650c17a7591574df6
Author:     Michael Uleysky <uleysky <AT> gmail <DOT> com>
AuthorDate: Tue Aug 21 04:35:53 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:07:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c536857d

sci-geosciences/gmt: DEPEND on gshhg-data, fine-grained doc USE

Add new flags that control the installation of documentation.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/gmt/gmt-4.5.18-r1.ebuild | 89 ++++++++++++++++++++++++++++++++
 sci-geosciences/gmt/metadata.xml         |  3 ++
 2 files changed, 92 insertions(+)

diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
new file mode 100644
index 00000000000..086f864b6b2
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+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 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
+	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+	)
+
+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 -rf "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+
+	if ! use htmldoc; then
+		rm -rf "${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
+	fi
+
+	# remove static libs
+	find "${ED}/usr/$(get_libdir)" -name '*.a' -delete || die
+}

diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index c31969b5f36..6c1818c1b49 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -10,8 +10,11 @@
     <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>
     <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="tutorial">Install data files for tutorial</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-16 17:08 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     43bf958195aaff2a083ccde319081b2e1018a3fb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 16:05:44 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:07:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bf9581

sci-geosciences/gmt: EAPI-7, cmake.eclass, slot ops, style

fix unused cmake vars
drop optional runtime USE - dcw and gshhg did not switch any build options,
so technically are RDEPEND optional. Hard-depend on them instead.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/gmt/gmt-5.4.4.ebuild | 94 ++++++++++++++++++------------------
 sci-geosciences/gmt/metadata.xml     |  1 -
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
index efba8079f9e..c2e3c983f50 100644
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -1,9 +1,9 @@
-# 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 bash-completion-r1 cmake-utils
+inherit bash-completion-r1 cmake
 
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="https://gmt.soest.hawaii.edu/"
@@ -12,71 +12,73 @@ SRC_URI="mirror://gmt/${P}-src.tar.xz"
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="5"
 KEYWORDS="~amd64 ~x86"
-IUSE="+dcw doc examples +fftw +gdal gmttria +gshhg htmldoc lapack openmp pcre pcre2 threads tutorial"
+IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
 
-RDEPEND="
-	!sci-biology/probcons
+REQUIRED_USE="?? ( pcre pcre2 )"
+
+DEPEND="
 	app-text/ghostscript-gpl
-	dcw? ( sci-geosciences/dcw-gmt )
-	fftw? ( sci-libs/fftw:3.0/3 )
-	gdal? ( sci-libs/gdal )
-	gshhg? ( sci-geosciences/gshhg-gmt )
-	>=sci-libs/netcdf-4.1[hdf5]
+	net-misc/curl
+	>=sci-libs/netcdf-4.1:=[hdf5]
+	sys-libs/zlib
+	fftw? ( sci-libs/fftw:3.0= )
+	gdal? ( sci-libs/gdal:= )
 	lapack? ( virtual/lapack )
 	pcre? ( dev-libs/libpcre )
 	pcre2? ( dev-libs/libpcre2 )
-	net-misc/curl
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="?? ( pcre pcre2 )"
+"
+RDEPEND="${DEPEND}
+	!sci-biology/probcons
+	sci-geosciences/dcw-gmt
+	sci-geosciences/gshhg-gmt
+"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# Rename man pages to avoid a name conflict with gmt4
 	pushd man_release || die
 	local m c suffix newc
-	for m in *.gz; do
-		c=${m%%.*}
-		suffix=${m#*.}
-		newc=gmt_${c}
-		# This man pages does'nt conflict
-		case "${c}" in
-		"gmt" | "gmt.conf" | "postscriptlight")
-			continue ;;
-		"gmt_shell_functions")
-			newc=gmt5_shell_functions ;;
-		"gmtcolors")
-			newc=gmt5colors ;;
-		esac
-		mv "${c}.${suffix}" "${newc}.${suffix}" || die
-	done
+		for m in *.gz; do
+			c=${m%%.*}
+			suffix=${m#*.}
+			newc=gmt_${c}
+			# This man pages does'nt conflict
+			case ${c} in
+				gmt|gmt.conf|postscriptlight)
+					continue ;;
+				gmt_shell_functions)
+					newc=gmt5_shell_functions ;;
+				gmtcolors)
+					newc=gmt5colors ;;
+			esac
+			mv "${c}.${suffix}" "${newc}.${suffix}" || die
+		done
 	popd || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DLICENSE_RESTRICTED="$(usex gmttria no yes)"
-		-DGMT_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 gmt4
-		-DBASH_COMPLETION_DIR="$(get_bashcompdir)"
 		-DGMT_DATADIR="share/${P}"
 		-DGMT_DOCDIR="share/doc/${PF}"
 		-DGMT_MANDIR="share/man"
+		-DLICENSE_RESTRICTED=$(usex gmttria no yes)
+		-DGMT_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 gmt4
+		-DBASH_COMPLETION_DIR="$(get_bashcompdir)"
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package lapack LAPACK)
+		$(cmake_use_find_package pcre PCRE)
 	)
-	use fftw || mycmakeargs+=( -DGMT_EXCLUDE_FFTW3=yes )
-	use gdal || mycmakeargs+=( -DGMT_EXCLUDE_GDAL=yes )
-	use lapack || mycmakeargs+=( -DGMT_EXCLUDE_LAPACK=yes )
-	use pcre || mycmakeargs+=( -DGMT_EXCLUDE_PCRE=yes )
-	use pcre2 || mycmakeargs+=( -DGMT_EXCLUDE_PCRE2=yes )
-	cmake-utils_src_configure
+	use pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) )
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	# Remove various documentation
 	if ! use doc; then
 		rm -rf "${ED}/usr/share/doc/${PF}/pdf" || die

diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 4f81777f6e7..d0db455197c 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Geosciences Project</name>
   </maintainer>
   <use>
-    <flag name="dcw">Install countries boundaries database</flag>
     <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>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-16 17:08 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ec3bf8a6ee69aea6be83b2197915763c9962d505
Author:     Michael Uleysky <uleysky <AT> gmail <DOT> com>
AuthorDate: Tue Aug 21 04:38:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:07:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3bf8a6

sci-geosciences/gmt: 5.4.4 version bump

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/gmt/Manifest         |   1 +
 sci-geosciences/gmt/gmt-5.4.4.ebuild | 109 +++++++++++++++++++++++++++++++++++
 sci-geosciences/gmt/metadata.xml     |   4 +-
 3 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 44f607655fe..aeeb947dfc1 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -9,6 +9,7 @@ DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db
 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

diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
new file mode 100644
index 00000000000..efba8079f9e
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 cmake-utils
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="https://gmt.soest.hawaii.edu/"
+SRC_URI="mirror://gmt/${P}-src.tar.xz"
+
+LICENSE="GPL-3+ gmttria? ( Artistic )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dcw doc examples +fftw +gdal gmttria +gshhg htmldoc lapack openmp pcre pcre2 threads tutorial"
+
+RDEPEND="
+	!sci-biology/probcons
+	app-text/ghostscript-gpl
+	dcw? ( sci-geosciences/dcw-gmt )
+	fftw? ( sci-libs/fftw:3.0/3 )
+	gdal? ( sci-libs/gdal )
+	gshhg? ( sci-geosciences/gshhg-gmt )
+	>=sci-libs/netcdf-4.1[hdf5]
+	lapack? ( virtual/lapack )
+	pcre? ( dev-libs/libpcre )
+	pcre2? ( dev-libs/libpcre2 )
+	net-misc/curl
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="?? ( pcre pcre2 )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# Rename man pages to avoid a name conflict with gmt4
+	pushd man_release || die
+	local m c suffix newc
+	for m in *.gz; do
+		c=${m%%.*}
+		suffix=${m#*.}
+		newc=gmt_${c}
+		# This man pages does'nt conflict
+		case "${c}" in
+		"gmt" | "gmt.conf" | "postscriptlight")
+			continue ;;
+		"gmt_shell_functions")
+			newc=gmt5_shell_functions ;;
+		"gmtcolors")
+			newc=gmt5colors ;;
+		esac
+		mv "${c}.${suffix}" "${newc}.${suffix}" || die
+	done
+	popd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLICENSE_RESTRICTED="$(usex gmttria no yes)"
+		-DGMT_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 gmt4
+		-DBASH_COMPLETION_DIR="$(get_bashcompdir)"
+		-DGMT_DATADIR="share/${P}"
+		-DGMT_DOCDIR="share/doc/${PF}"
+		-DGMT_MANDIR="share/man"
+	)
+	use fftw || mycmakeargs+=( -DGMT_EXCLUDE_FFTW3=yes )
+	use gdal || mycmakeargs+=( -DGMT_EXCLUDE_GDAL=yes )
+	use lapack || mycmakeargs+=( -DGMT_EXCLUDE_LAPACK=yes )
+	use pcre || mycmakeargs+=( -DGMT_EXCLUDE_PCRE=yes )
+	use pcre2 || mycmakeargs+=( -DGMT_EXCLUDE_PCRE2=yes )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# 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 -rf "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+
+	if ! use htmldoc; then
+		rm -rf "${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
+	fi
+
+	# Decompress manuals
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die
+	# Rename some files to avoid a name conflict with gmt4
+	mv "${ED}/usr/bin/gmt_shell_functions.sh" "${ED}/usr/bin/gmt5_shell_functions.sh" || die
+	mv "${ED}/usr/bin/isogmt" "${ED}/usr/bin/isogmt5" || die
+	rm "${ED}/usr/bin/gmtswitch" || die
+	# Rename bash completion file
+	mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt" || die
+}

diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 6c1818c1b49..4f81777f6e7 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -6,15 +6,17 @@
     <name>Gentoo Geosciences Project</name>
   </maintainer>
   <use>
+    <flag name="dcw">Install countries boundaries database</flag>
     <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="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 libpcre2 for regular expressions</flag>
     <flag name="tutorial">Install data files for tutorial</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-16 17:08 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     55fe9c5b26895e3f338047a70b57bee78c0641af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 15:50:24 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=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 <asturm <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-17 12:13 Agostino Sarubbo
  0 siblings, 0 replies; 15+ messages in thread
From: Agostino Sarubbo @ 2020-02-17 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     1b4c0af40e8d896a12437c95d66ca55201f2b6f4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 12:12:50 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 12:12:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b4c0af4

sci-geosciences/gmt: amd64 stable wrt bug #709828

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gmt/gmt-4.5.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
index ac668505bc6..1314216ae3a 100644
--- a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.bz2
 
 LICENSE="GPL-2+ gmttria? ( Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-02-17 12:21 Agostino Sarubbo
  0 siblings, 0 replies; 15+ messages in thread
From: Agostino Sarubbo @ 2020-02-17 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8a98303442db42f8ef36fdde6c000f04378ca7db
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 12:20:59 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 12:20:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a983034

sci-geosciences/gmt: x86 stable wrt bug #709828

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gmt/gmt-4.5.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
index 1314216ae3a..a7e01472873 100644
--- a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.bz2
 
 LICENSE="GPL-2+ gmttria? ( Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2020-05-29  7:39 Agostino Sarubbo
  0 siblings, 0 replies; 15+ messages in thread
From: Agostino Sarubbo @ 2020-05-29  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     21b7b0625600590ecb02a8ce14607b687b6bce5b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 07:38:24 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 29 07:38:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b7b062

sci-geosciences/gmt: amd64 stable wrt bug #712246

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gmt/gmt-5.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
index c2e3c983f50..a7b032d1fa8 100644
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.xz"
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
 
 REQUIRED_USE="?? ( pcre pcre2 )"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2022-03-01 11:57 Andrew Ammerlaan
  0 siblings, 0 replies; 15+ messages in thread
From: Andrew Ammerlaan @ 2022-03-01 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b9857b8e20f45d0d4d477eaab0acf4e2798ba191
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 11:56:57 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 11:57:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9857b8e

sci-geosciences/gmt: add version 6.3.0

Co-authored-by: Daniel Peters <sir_tuam <AT> web.de>
Closes: https://bugs.gentoo.org/728500
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/gmt/Manifest         |  1 +
 sci-geosciences/gmt/gmt-6.3.0.ebuild | 97 ++++++++++++++++++++++++++++++++++++
 sci-geosciences/gmt/metadata.xml     |  1 +
 3 files changed, 99 insertions(+)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 63ed70439e37..7be2ca454c3d 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,3 +1,4 @@
 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.gz 68516925 BLAKE2B 0b7197d3fbc8bdf4dec3e85a2a122eee7a4c6cdd7d04d5fc74a72d62f80c4d38d9a2c2c0fa278e03e6ce5f04ef5cb47d9fd6255d8af8ee3736979260f9e5da86 SHA512 696a3bdc86f811e6a05dccad154efee6ea4b800e7a647ed7668f14b793e14eb61e7fadf85c0d34653709e54e595bad2d34617bdbaeb6a73267ec85db29db5ddf

diff --git a/sci-geosciences/gmt/gmt-6.3.0.ebuild b/sci-geosciences/gmt/gmt-6.3.0.ebuild
new file mode 100644
index 000000000000..825e8ff6ec66
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-6.3.0.ebuild
@@ -0,0 +1,97 @@
+# 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.gz"
+
+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 3a11971d2b8c..144f7af6cdfa 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <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>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2022-04-12 21:04 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-04-12 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     7edbb9981c89808d509d7136835230bdb629d64f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 12:20:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 21:03:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edbb998

sci-geosciences/gmt: switch to xz

Smaller tarballs.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gmt/Manifest         | 2 +-
 sci-geosciences/gmt/gmt-5.4.4.ebuild | 2 +-
 sci-geosciences/gmt/gmt-6.3.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 7be2ca454c3d..af97b4e37c1b 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,4 +1,4 @@
 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.gz 68516925 BLAKE2B 0b7197d3fbc8bdf4dec3e85a2a122eee7a4c6cdd7d04d5fc74a72d62f80c4d38d9a2c2c0fa278e03e6ce5f04ef5cb47d9fd6255d8af8ee3736979260f9e5da86 SHA512 696a3bdc86f811e6a05dccad154efee6ea4b800e7a647ed7668f14b793e14eb61e7fadf85c0d34653709e54e595bad2d34617bdbaeb6a73267ec85db29db5ddf
+DIST gmt-6.3.0-src.tar.xz 55396792 BLAKE2B b0b69506119caadcba5f5faf471b52009edadedc5104c60a540829aeb9c7786305d4760ba76d625f19adfc5f86c86dd10284876dfbceb055bdd78541862ebd32 SHA512 e02709b28f5940d92bfb4ddd9dcadd7c0e88d2973faa55732638e220cd23962ee605046bdf163b439f11379cb4665a178ab1ec4314dc897b6c5ee029b16aa2a5

diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
index 2b891c81bc2f..d82f8a96ac37 100644
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sci-geosciences/gmt/gmt-6.3.0.ebuild b/sci-geosciences/gmt/gmt-6.3.0.ebuild
index 825e8ff6ec66..97ec47620ea1 100644
--- a/sci-geosciences/gmt/gmt-6.3.0.ebuild
+++ b/sci-geosciences/gmt/gmt-6.3.0.ebuild
@@ -7,7 +7,7 @@ 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.gz"
+SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="6"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2022-12-18  4:20 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-12-18  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     fe2b3a1c5a643344735f93628964435040f06027
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 04:06:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 04:19:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2b3a1c

sci-geosciences/gmt: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gmt/metadata.xml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 144f7af6cdfa..3d30a3cb7447 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <use>
-    <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 libpcre2 for regular expressions</flag>
-    <flag name="tutorial">Install data files for tutorial</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<use>
+		<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 libpcre2 for regular expressions</flag>
+		<flag name="tutorial">Install data files for tutorial</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">GenericMappingTools/gmt</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2022-12-18  4:20 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-12-18  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2a082b5927d8ce78df7ff729a11227bd38afbdb6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 04:18:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 04:19:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a082b59

sci-geosciences/gmt: add 6.4.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gmt/Manifest         |  1 +
 sci-geosciences/gmt/gmt-6.4.0.ebuild | 94 ++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index af97b4e37c1b..3683afa881c4 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -2,3 +2,4 @@ DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279
 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/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0.ebuild
new file mode 100644
index 000000000000..47ef90d65d6e
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-6.4.0.ebuild
@@ -0,0 +1,94 @@
+# 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 threads zlib"
+
+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/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)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_PCRE=ON
+		$(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 PCRE2)
+		$(cmake_use_find_package zlib ZLIB)
+	)
+
+	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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2023-01-20  1:17 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-01-20  1:17 UTC (permalink / raw
  To: gentoo-commits

commit:     2520a1ef851ac54ed5ce63005b815877fe1f90f3
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jan 19 21:13:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 01:14:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2520a1ef

sci-geosciences/gmt: use pkg tag for dev-libs/libpcre2

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29179
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gmt/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 3d30a3cb7447..6395ce2e1493 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -14,7 +14,7 @@
 		<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 libpcre2 for regular expressions</flag>
+		<flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for regular expressions</flag>
 		<flag name="tutorial">Install data files for tutorial</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/
@ 2023-02-07 16:54 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-02-07 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     ecfac65e98287cdc6b53a36bfe57b75e4745f549
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 16:54:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 16:54:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfac65e

sci-geosciences/gmt: Stabilize 6.4.0 amd64, #892433

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gmt/gmt-6.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gmt/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0.ebuild
index 47ef90d65d6e..ab7b61b5eb63 100644
--- a/sci-geosciences/gmt/gmt-6.4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-6.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre threads zlib"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-02-07 16:55 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-18  4:20 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gmt/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-02-07 16:54 Sam James
2023-01-20  1:17 Sam James
2022-12-18  4:20 Sam James
2022-04-12 21:04 Sam James
2022-03-01 11:57 Andrew Ammerlaan
2020-05-29  7:39 Agostino Sarubbo
2020-02-17 12:21 Agostino Sarubbo
2020-02-17 12:13 Agostino Sarubbo
2020-02-16 17:08 Andreas Sturmlechner
2020-02-16 17:08 Andreas Sturmlechner
2020-02-16 17:08 Andreas Sturmlechner
2020-02-16 17:08 Andreas Sturmlechner
2018-08-18  9:33 Amy Liffey
2016-01-10 20:10 Amy Winston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox