gentoo auto-resync : 11:06:2023 - 14:17:09

4 files changed, 1 insertions, 137 deletions

diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 9ba28f824d7e..0926c271cde9 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,6 +1,3 @@
-AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f366e4469656c0cc405c2979819870734666c5c777a725a04b2508dd85d84cbccce6ca8000ddd0b1e32f755038e17d SHA512 3e5b26234ecaef39658ef1e82f90b5ffd86ff5fd0a91eda829c92fd11a886e1c4106f0a578b5bd223e3ae9b75dec0c44022112197bed69fae09cd534f7e535a8
-DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
 DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40
-EBUILD gmt-5.4.4.ebuild 3085 BLAKE2B b948907dddde73aa76be9c5c6ea4d46c7885e7fefa4de8fc11210cb9e0f5f6bbd8813608f9bf136838f73bf505fd28282cbb4937285fc74bdc49e84b917e8070 SHA512 1dc699f0e7711d4f72c0fe4db4c26d90a34f1f3cc7a750b11af537f92551ac86e3035346417df87e5a2ef33afc962517209ff895f60308464af7f5ffe0feefb7
 EBUILD gmt-6.4.0.ebuild 2615 BLAKE2B c104e6c6382f4caaeb47dfbe176c5de29ab6c8fff16e251b86467caa8a593494d4a6e8495b1a86fff58b41d5a267c56c4d0c3822ce793ddc9ea223422043e436 SHA512 a36bd6550fc700e9199d0a3b3939e5cf27ffde48959441975122b4d49490c7844a51a999d3d553152ee7d8f67fa76d6e9fd77dd4d10e1a5d0304973091d13f95
-MISC metadata.xml 803 BLAKE2B 495348da16fac57337217745efbb67a20ddf05d208136caaab926434b84f765c7c7f044dc026bf5df7c09fbaf443f210e19f3bb8e3bc5c1b68b5bfb2bd0379c5 SHA512 09e8b04766b871f579b84541de88f19c8f6bff63a9b6b36bbc863cedbb0e3bb3eeb13becac2a793b88dbb2ced592f5b8d80f7c421c7491be4a48cd56fb402205
+MISC metadata.xml 598 BLAKE2B e9f4551ca272d7f20f76a508db5ef33963819635d9409ee2d62699f2f982ace1198dc6f73f064c9457f8862e4198f3fcc19e15ef286e395d8db90341c072a398 SHA512 2275e91105ab3ada0cf02f68c4ba20aadc442c8af63274bd1bde0c8c31e41aeedfc8d621c1e2ffed4dbaa04f0f83975b344f1344eabb128543917f3485f6fea2
diff --git a/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch b/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch
deleted file mode 100644
index 54aecb3c0d55..000000000000
--- a/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/738224
-Author: hangglider@gmx.de
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -187,7 +187,7 @@
- 		return;
- 	}
- 	else {
--		fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, sys_siglist[sig_num]);
-+		fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, strsignal(sig_num));
- 		backtrace_symbols_fd (array, 2, STDERR_FILENO); /* print function with faulting instruction */
- 		size = backtrace (array, 50); /* get void*'s for all entries on the stack */
- 		fprintf (stderr, "Stack backtrace:\n");
-
diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
deleted file mode 100644
index 15ac033c5501..000000000000
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake flag-o-matic
-
-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="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
-
-REQUIRED_USE="?? ( pcre pcre2 )"
-
-DEPEND="
-	app-text/ghostscript-gpl
-	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 )
-"
-RDEPEND="${DEPEND}
-	!sci-biology/probcons
-	sci-geosciences/dcw-gmt
-	sci-geosciences/gshhg-gmt
-"
-
-PATCHES=( "${FILESDIR}"/${P}-sighandler.patch )
-
-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
-	popd || die
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/710088
-	# drop on version bump
-	append-cflags -fcommon
-	local mycmakeargs=(
-		-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 pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_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 089070826efa..05748e9b8511 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -9,9 +9,6 @@
 		<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="htmldoc">Install html documentation</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>
 		<remote-id type="github">GenericMappingTools/gmt</remote-id>