gentoo auto-resync : 02:12:2024 - 02:07:07

8 files changed, 195 insertions, 2 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 47712e601871..81c8c629bab2 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 0926c271cde9..cdd1f246c6f0 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,3 +1,4 @@
+AUX gmt-6.4.0-mergesort.patch 1874 BLAKE2B 1905084208ccc5afc2728ca0b616552c6375402a8a346661aa0f3740f994fab103e948ee78237632953a4ba4b239a0cd4f8118aaebcd610296152b5bc1ca2223 SHA512 f62f3e6e8497cab39eacb5315d8f912d906ea3b1bb0a62717996c76153e4fac77b73c8cef493507a1f846950765665c5d152e37bd282bbddd0f669d88303823c
 DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40
-EBUILD gmt-6.4.0.ebuild 2615 BLAKE2B c104e6c6382f4caaeb47dfbe176c5de29ab6c8fff16e251b86467caa8a593494d4a6e8495b1a86fff58b41d5a267c56c4d0c3822ce793ddc9ea223422043e436 SHA512 a36bd6550fc700e9199d0a3b3939e5cf27ffde48959441975122b4d49490c7844a51a999d3d553152ee7d8f67fa76d6e9fd77dd4d10e1a5d0304973091d13f95
+EBUILD gmt-6.4.0-r1.ebuild 2664 BLAKE2B 2000b179517c0752497349bc1c7b81fed3a34425ed87d1f82e14d5cc8195eeb19feb0257331ed81b10977b06876d3d31a1a5545a9ebc13061ef324663d0f3f48 SHA512 35f1912ae35461bbcb77a0ba740d855423f6b3c21624233d825c0bec53dc36cc16c4ac31b2374b1ece9998acabff12793b90a111fef86df916dc15c50efd8f4a
 MISC metadata.xml 598 BLAKE2B e9f4551ca272d7f20f76a508db5ef33963819635d9409ee2d62699f2f982ace1198dc6f73f064c9457f8862e4198f3fcc19e15ef286e395d8db90341c072a398 SHA512 2275e91105ab3ada0cf02f68c4ba20aadc442c8af63274bd1bde0c8c31e41aeedfc8d621c1e2ffed4dbaa04f0f83975b344f1344eabb128543917f3485f6fea2
diff --git a/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch b/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch
new file mode 100644
index 000000000000..55a31f29e44b
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-6.4.0-mergesort.patch
@@ -0,0 +1,57 @@
+From a898ed6598541a70976a44ece58f5f358a80e1bc Mon Sep 17 00:00:00 2001
+From: Paul Wessel <pwessel@hawaii.edu>
+Date: Mon, 24 Apr 2023 14:41:35 +0200
+Subject: [PATCH] Ensure mergesort is declared if needed
+Upstream: https://github.com/GenericMappingTools/gmt/pull/7411
+Bug: https://bugs.gentoo.org/945480
+
+See #7410  for background.  Here I implement it a bit differently.  The mergesort function is used both in a module (gmtspatial) as well as by some gmt_*.c libraries, hence if it is not part of the standard libraries we declare it in gmt_prototypes.h so it is set for both modules and libs.
+--- a/src/gmt_init.c
++++ b/src/gmt_init.c
+@@ -167,6 +167,10 @@
+ #	include <mex.h>
+ #endif
+ 
++#ifndef HAVE_MERGESORT
++#include "mergesort.c"
++#endif
++
+ /* These are used in gmtinit_init_custom_annot and gmtinit_decode_tinfo only */
+ #define GMT_ITEM_ANNOT		0
+ #define GMT_ITEM_INTVAL		1
+--- a/src/gmt_prototypes.h
++++ b/src/gmt_prototypes.h
+@@ -39,6 +39,15 @@ EXTERN_MSC void gmt_grd_dump (struct GMT_GRID_HEADER *header, gmt_grdfloat *grid
+ EXTERN_MSC char * gmt_strdup (struct GMT_CTRL *GMT, const char *s);
+ #endif
+ 
++#ifdef __APPLE__
++/* macOX has it built in, so ensure we define this flag */
++#define HAVE_MERGESORT
++#endif
++
++#ifndef HAVE_MERGESORT
++EXTERN_MSC int mergesort (void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void *));
++#endif
++
+ /* gmt_nc.c: */
+ 
+ EXTERN_MSC bool gmt_nc_is_cube (struct GMTAPI_CTRL *API, char *file);
+--- a/src/gmtspatial.c
++++ b/src/gmtspatial.c
+@@ -165,15 +165,6 @@ struct GMTSPATIAL_PAIR {
+ 	uint64_t pos;
+ };
+ 
+-#ifdef __APPLE__
+-/* macOX has it built in, so ensure we define this flag */
+-#define HAVE_MERGESORT
+-#endif
+-
+-#ifndef HAVE_MERGESORT
+-#include "mergesort.c"
+-#endif
+-
+ static void *New_Ctrl (struct GMT_CTRL *GMT) {	/* Allocate and initialize a new control structure */
+ 	struct GMTSPATIAL_CTRL *C;
+ 
diff --git a/sci-geosciences/gmt/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0-r1.ebuild
index ab7b61b5eb63..7f7d94e82835 100644
--- a/sci-geosciences/gmt/gmt-6.4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-6.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 	sci-geosciences/gshhg-gmt
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-mergesort.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# Rename man pages to avoid a name conflict with gmt5
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 3f5f6a666a74..29c041ae3556 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,5 +1,9 @@
 AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86ef51db7e2962cbd05a33e1b5e5bc5b57845bb3e9e885b85b7ec81cef7c26e424ff3aed81818edb5c749c0b1fc0d1275f545962f1373 SHA512 4b82fdaea637d2bec322b085b3df33e7c493aeec93e145a3f6b1493884c3dd891e0252f9d4a5ec4f75b482178a65de050062fa18f078523426aee60cae002efd
+AUX gpsbabel-1.9.0-qmake-xmldoc.patch 456 BLAKE2B 20dcb943989025ef5d5110371298252b14cbc1ce0a018c8f0ab181342109ecfc415268f075e0c408e69c1ee15a83854795a827df0e022699fd395b09a1cc79c4 SHA512 d54bf5742b55249b3ea13194803cbb81a24e0c2bc369df0264d3c9841b3eb905ecb0653e7d7cb08c1fd923ce9abf3df19ae4f833d8288c7c2d68a77b46be4912
+AUX gpsbabel-1.9.0-xmllint.patch 382 BLAKE2B 1f5daddf81914462b4e33872c1de1d0b6f8c40142732f4485e8916f2dba94cdf3f6cd8962eac635271e6cb7ceefa6ca114c54c5fbcd8168d5881b162a75cb539 SHA512 c168ff061f363f725c828e6d2f98c744f651387eae0cd0aa09c21dcb96d80669c17446ab16b171a7b8382aaa45110d80be79f1598a5d9527c2183a6ac55802c7
+DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d
+EBUILD gpsbabel-1.9.0-r1.ebuild 2258 BLAKE2B b670638816d0a7d9853f9e9bee8b9b1c96bfebcfcd298e84b28a20e79c817bb629fb3d4168395f6f68b49ef59349fdeb4e0cbbe725b723856203f9bb526f0be0 SHA512 ea46069ffdcdf4aa25e4a565a5f1bc6fea87a4d17e2c5ed42d13ebb6b0d212a496f4a9ba8e1677682bf70333ff49da946ff6e839387e509d58bc6babbad0b399
 EBUILD gpsbabel-1.9.0.ebuild 2158 BLAKE2B 7ad368350a5d1df38b7432ec397118e6b40af0f0e277de0de166f4a0b3a4a1455eb6151e51b421a0a27b4a832cdff1d95dd893754b1b18e07c9caae286e4cb88 SHA512 f2e87c57bb5462e53b6d1950faa3db5d2150eb5892b80a2bd874301c45d9556021fa357fb92858cef8714657ab5a9e0d29235bc68408fdaab79c30406bf38117
 EBUILD gpsbabel-9999.ebuild 1896 BLAKE2B 69c0e2ac096587bebb9054a83315d8e7337d9cd2f01ba2626564839677beb485fdb931f7800ce6d81bb0a7442433698bee045c538b30999fde7747961e6dca39 SHA512 da7a6632c367847347392c0b769a6e35be97462274d14bdb5a60dbfa15368e5b92c1e596f12b69f63571982b778e8cfd28368038eb7dfb0603503ea6f66fc2b2
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-qmake-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-qmake-xmldoc.patch
new file mode 100644
index 000000000000..2bf36f39a84c
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-qmake-xmldoc.patch
@@ -0,0 +1,11 @@
+--- a/tools/make_gpsbabel_html.sh
++++ b/tools/make_gpsbabel_html.sh
+@@ -10,6 +10,7 @@ xsltproc \
+   --stringparam html.cleanup "1" \
+   --stringparam make.clean.html "1" \
+   --stringparam html.valid.html "1" \
+-  --stringparam html.stylesheet "https://www.gpsbabel.org/style3.css" \
++  --stringparam html.stylesheet "gpsbabel.org-style3.css" \
++  --nonet \
+   http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/docbook.xsl \
+   xmldoc/readme.xml
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-xmllint.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-xmllint.patch
new file mode 100644
index 000000000000..46a5365568d3
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-xmllint.patch
@@ -0,0 +1,10 @@
+--- a/tools/make_gpsbabel_doc.sh
++++ b/tools/make_gpsbabel_doc.sh
+@@ -2,7 +2,6 @@
+ set -ex
+ 
+ perl xmldoc/makedoc
+-xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml
+ # the following doesn't seem to work.
+ #xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml
+ # jing and many depedencies removed from fedora
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..5a4ed28f31f5
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake desktop xdg
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+else
+	SRC_URI="
+		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
+		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc gui"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	gui? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	dev-qt/qtbase:6
+	dev-qt/qt5compat:6
+	gui? (
+		dev-qt/qtbase:6[gui,network,widgets,xml]
+		dev-qt/qtserialport:6
+		dev-qt/qtwebchannel:6
+		dev-qt/qtwebengine:6[widgets]
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
+	"${FILESDIR}"/${P}-qmake-xmldoc.patch
+	"${FILESDIR}"/${P}-xmllint.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+
+	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=$(usex gui)
+		-DGPSBABEL_EMBED_MAP=$(usex gui)
+		-DGPSBABEL_EMBED_TRANSLATIONS=$(usex gui)
+		-DUSE_QT6=ON
+	)
+
+	cmake_src_configure
+}
+
+cmake_src_compile() {
+	cmake_build gpsbabel
+	use gui && cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/${PN}.html" "${S}/${PN}.org-style3.css" )
+	einstalldocs
+
+	dobin gpsbabel
+	if use gui; then
+		dobin gui/GPSBabelFE/gpsbabelfe
+		insinto /usr/share/${PN}/translations/
+		doins gui/gpsbabel*_*.qm
+		newicon gui/images/appicon.png ${PN}.png
+		domenu gui/gpsbabel.desktop
+	fi
+}