gentoo resync : 20.03.2022

3 files changed, 101 insertions, 1 deletions

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 9169bfa211e2..a8f338ed125d 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -4,6 +4,8 @@ AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f36
 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
 EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9
 EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7657cc66b852db05b70bddb77abf6a064defc4e433236deee6ff225388b752f243ecab9ca625e886bc783540a8b29c17b7105d82039f9994b78969554db17ff0 SHA512 7dd86ba2c92fd552ed0096b0dc290f12d2df319882ffe5fd2b6a2ca57e4bca0266d9cda7dd2bd62fe9d07e0372bdd614c8f6dcb82c66c5f8a76066c00a774859
-MISC metadata.xml 919 BLAKE2B 39a42bb5a9131c03b736ce373e1e5d20dc3690fdebdb58981a6cebaa769625072412fc61b4197926babba36a02c063d4ff09c7c2f0b3890951074c00d479581f SHA512 6d4baa276668d359e5e11e48ddfa7938cca6994435f8b51cb65feb894be764789d17dd8861985daa538369496a24367ef7c95c979af44f63e91eb81bb4a22bb2
+EBUILD gmt-6.3.0.ebuild 2717 BLAKE2B b8974080be151773eb8e8bd5adec3c5fa9fc0993370fa520ff774ce461cbef4e3b93a11143f25275142c625201b1882c4c014160f71ad54d1f34bcf1bbbc3145 SHA512 3fb28cff4d1dde6c3c777fd412eb2a912e233188a5d83424b833cb0d6aa72202f1c235cec6e58929d3b60b5e025c90ffacd7c6275805111354170fb65f103226
+MISC metadata.xml 996 BLAKE2B 543f4152c5e6c5b0e94fccf8abf4de51bf442080e30bc2db1210f2de5ae822487df115daf7347d10c7a3e89b51ba526e0551bcd6447ba632ba84e6db09d3082a SHA512 071fb44f78d13898938be933959f8db0936bf5c7d40a667453563be4a32b6f49e07c3199adb7ff64e160c69043fe6d09dce9531c896053f211e52198aa9b1ab6
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>