gentoo auto-resync : 18:12:2022 - 09:41:22

3 files changed, 116 insertions, 17 deletions

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index e3b74cc62fc8..9046745b959e 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -5,7 +5,9 @@ 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
 EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9
 EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7ce77400d0aa0834c9681581b88fd8c27c01c4e1c3bc12f5973aa3ea29d25f00dc18f7462d5c55cbc0b17a64d2ea95b53299b69be2e56ab24ce16db888c8cb41 SHA512 8906114f67a3210de7b0d08f6012b6b19b88dca0fdd621e364e627b96d0642bd6c0bb8ade05d06548bb8c8e631ff5838525e8f9ef86612f943ad59af5c115fe7
 EBUILD gmt-6.3.0.ebuild 2717 BLAKE2B 252ec1547265df64c8a7baa8821c0eb43c357740bbeac3ec5f0b05374ace93c6126abddfb7eecc64be42bcd8efacc1d4692f4ab998ccf4f415ee74b78b80b0d1 SHA512 0935d06f8dbc7fbd7d8b99bc6e709d277fb10df23a7820993dd9abc37ce7417572746a04ca8e27645bf39487bc13a474b571cc6ee67a44492aeefba33aa1c82d
-MISC metadata.xml 996 BLAKE2B 543f4152c5e6c5b0e94fccf8abf4de51bf442080e30bc2db1210f2de5ae822487df115daf7347d10c7a3e89b51ba526e0551bcd6447ba632ba84e6db09d3082a SHA512 071fb44f78d13898938be933959f8db0936bf5c7d40a667453563be4a32b6f49e07c3199adb7ff64e160c69043fe6d09dce9531c896053f211e52198aa9b1ab6
+EBUILD gmt-6.4.0.ebuild 2616 BLAKE2B 80cbbf905a4421942c653804ac3715a0e785164c67e4028c4f4217e1f9888886d035875f8b3a37744579ef9df978fb1ab7b0708cfd16c476cc70c91c12a3c9de SHA512 fd5904d103f2b7db77d10184ec270c41c54d567abb8872c69ca6ba69f2833335fe49f4ca5c70f3e6154c4232585aa6c5d5310825be70b4738b706c0be02378ef
+MISC metadata.xml 1056 BLAKE2B 2391184b4955db0173714d201355c92f4c7f9d14079920316781e9db423e037d967fd3739465cc6c93d7a8ce9ed4f933d040566abff6c868558ab2d866558eb8 SHA512 d45fcd43b7d1ee36e32e1bd90ed7fe68fec0c4261331fedcb3608fdac060f4ae709f79ff7d3a57143c578adffac2d866f839847ddb7e7c11850540be78419979
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
+}
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>