gentoo auto-resync : 14:03:2024 - 06:47:03

6 files changed, 191 insertions, 49 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 35ecb78b2188..3b37d184ebe6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index b0790915b5dc..6a8a70ed4d5c 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -4,7 +4,9 @@ AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
 DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
-EBUILD gpsbabel-1.7.0-r1.ebuild 1770 BLAKE2B 649bb9a27da4c58b78bfb04ce02212a4c8f0a63ebc8d092bdbfe0ad594633f9a1c81d2a2af953bd3c81a774408a1e35a6afe76d4b4ccb55be96f84fbfdf6ca34 SHA512 a5c9f59aa1f752eec82eefd59d39447bab7cde8308158e91c017dd6c73c4c03c5cfd6ca69bbb6188fd65b4497691b64dfd32c211eb28ea9cceb7926ed1c3ee10
-EBUILD gpsbabel-1.8.0-r1.ebuild 2192 BLAKE2B afd4fa6f9c9042ce43645b1bf37060b2c94b14e4f9ca31207ffdd1f4d6940c73c1cdd07aebf596096f19c5dff7ba26a07e08ce6408e51abb5a31aeb4edbd9474 SHA512 56df45e4ed2b1ada5c8c590891c22d76aa8feda4bd65e5ac24ced75c33113243c8e40f8c45454bc0975cef2d2a0e5824ec5e3fd56839ad9ccaf67f6aa79497f5
-EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980
+DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d
+EBUILD gpsbabel-1.7.0-r1.ebuild 1919 BLAKE2B 83c144e9ca5ba4649378e1857694eb87549344d340c2e09d35ace00eb7359b0b0a63b365e9b29b82c61bc973c1a460522c181a110cb5f58f04bda66c8f475a36 SHA512 551fdfb9e4e7382e1f6b6769673b73768feed8085b40ff46e6c45e98d5799d1d9301ca8d88d1fa4b695c57802e3579fe54381f499a39e6c4fd35149f768c80db
+EBUILD gpsbabel-1.8.0-r1.ebuild 2341 BLAKE2B 03b09dc72acc0c995450dbb81b3291d4aafe8221778db6c1367c51322a323425993a9a5a1b9acabc5225040a5e147de9f784b28ec420482e623914a8981301c1 SHA512 4417a926781f357c7c6981d1092ca94e81dc75388795b8605d8a8f790525ce6697000e68d45d505eaebc8fdf158765fbee8c9d325ab84f9047052ca1c92f3643
+EBUILD gpsbabel-1.9.0.ebuild 2169 BLAKE2B 08c38630a1c8eb745201c74a5dbf6060190dd339b47fb98a86a5f11583cc001687c02dc30d9244b4f1abc58506f3503685673d3001ec5288a7f4322a5b670275 SHA512 4b9c3f92119484788d8a7fb79a847fc2d68bd2b01f3aea3269d1cf8c2d002c21e0bb5766741769d80eb938871c8801d6b5bd942213569d85f9651607610604c2
+EBUILD gpsbabel-9999.ebuild 2169 BLAKE2B 08c38630a1c8eb745201c74a5dbf6060190dd339b47fb98a86a5f11583cc001687c02dc30d9244b4f1abc58506f3503685673d3001ec5288a7f4322a5b670275 SHA512 4b9c3f92119484788d8a7fb79a847fc2d68bd2b01f3aea3269d1cf8c2d002c21e0bb5766741769d80eb938871c8801d6b5bd942213569d85f9651607610604c2
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index f6c49d49af26..36dfe7b2188f 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils
+inherit flag-o-matic qmake-utils
 
 MY_PV="${PV//./_}"
 MY_P="${PN}_${MY_PV}"
@@ -64,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/862576
+	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
+	filter-lto
+
 	econf \
 		$(use_with doc doc "${S}"/doc/manual) \
 		QMAKE=$(qt5_get_bindir)/qmake \
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
index cfe639e603e8..7e4d5bf44ef1 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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
+inherit cmake desktop flag-o-matic xdg
 
 MY_PV="${PV//./_}"
 MY_P="${PN}_${MY_PV}"
@@ -76,6 +76,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/862576
+	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
+	filter-lto
+
 	local mycmakeargs=(
 		-DGPSBABEL_WITH_LIBUSB=pkgconfig
 		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
new file mode 100644
index 000000000000..e5796ceebf81
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
@@ -0,0 +1,108 @@
+# 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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc qt6"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtserialport:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets,xml]
+		dev-qt/qtserialport:6
+		dev-qt/qtwebchannel:6
+		dev-qt/qtwebengine:6[widgets]
+		dev-qt/qt5compat:6
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=ON
+		-DGPSBABEL_EMBED_MAP=ON
+		-DGPSBABEL_EMBED_TRANSLATIONS=ON
+		-DUSE_QT6="$(usex qt6)"
+	)
+
+	cmake_src_configure
+}
+
+cmake_src_compile() {
+	cmake_build gpsbabel
+	cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
+}
+
+src_install() {
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	dobin gui/GPSBabelFE/gpsbabelfe
+	insinto /usr/share/${PN}/translations/
+	doins gui/gpsbabel*_*.qm
+	newicon gui/images/appicon.png ${PN}.png
+	domenu gui/gpsbabel.desktop
+}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 4da02d15793a..e5796ceebf81 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit qmake-utils
+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"
-	SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
 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 ~ppc ~x86"
+	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc qt6"
 
-DEPEND="
-	dev-qt/qtcore:5
-	sci-libs/shapelib:=
-	sys-libs/zlib
-	virtual/libusb:1
-"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
@@ -40,47 +32,77 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtserialport:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets,xml]
+		dev-qt/qtserialport:6
+		dev-qt/qtwebchannel:6
+		dev-qt/qtwebengine:6[widgets]
+		dev-qt/qt5compat:6
+	)
 "
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-xmldoc.patch
-	"${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
 )
 
-S="${WORKDIR}/${PN}-${MY_P}"
-
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	# ensure bundled libs are not used
 	rm -r shapelib zlib || die
-	# remove prerequisite zlib/zlib.h
-	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
-	# remove failing test (fixed by f91d28bf)
-	rm testo.d/arc-project.test || die
-
-	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
 }
 
 src_configure() {
-	econf \
-		$(use_with doc doc "${S}"/doc/manual) \
-		QMAKE=$(qt5_get_bindir)/qmake \
-		--with-zlib=system
-}
+	local mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=ON
+		-DGPSBABEL_EMBED_MAP=ON
+		-DGPSBABEL_EMBED_TRANSLATIONS=ON
+		-DUSE_QT6="$(usex qt6)"
+	)
 
-src_compile() {
-	default
+	cmake_src_configure
+}
 
-	if use doc; then
-		perl xmldoc/makedoc || die
-		emake gpsbabel.html
-	fi
+cmake_src_compile() {
+	cmake_build gpsbabel
+	cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
-
-	default
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	dobin gui/GPSBabelFE/gpsbabelfe
+	insinto /usr/share/${PN}/translations/
+	doins gui/gpsbabel*_*.qm
+	newicon gui/images/appicon.png ${PN}.png
+	domenu gui/gpsbabel.desktop
 }