gentoo auto-resync : 09:02:2024 - 17:33:55

6 files changed, 33 insertions, 126 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 9f5ab526b8d2..e2143983a920 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 085c99be66a1..3e1933e10045 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,8 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
-DIST gpxsee-13.13.tar.gz 5551928 BLAKE2B e438c84ca7a7ade71cd5651464cab1378719609050d32b11e744dfe2952074c3fcd64ce111f4ccd10d8b71ed3e96fbd6b1ee0b00658a6120082abedb9ba53629 SHA512 d451d17d24bca0baca614d3b81896543f21e3cd1f97b8ce524b69e412a8d785058002990f7fc18613b62d2a9ebb5f09017a24e88ee8763732ac2e37242a7ca84
 DIST gpxsee-13.14.tar.gz 5552553 BLAKE2B 693af0d57fc923b7ccaeace7c52f76bba4749dee9bae4f7593dc350cfe4c89bf2212a32fa47a52d39cde2f91fcc53675867b7be6b9241daef615eda388a8cf53 SHA512 af21cfa160bfdf21f3537da254e0f079063b827a4fe008245e9b67d50735480a82138d1a5aad119fb73397ca2d53b98c2dfb83b3419f32c3339876050c5f4816
-DIST gpxsee-13.4.tar.gz 5497497 BLAKE2B 1ae4a00aaba5549292002ccb1e151670f268f6b5fb32577ccc95be0aafd694c512329b34863b716ff7bc4d7509768cd4759d0611cdee915d7b7103c0e6451303 SHA512 d31898ecb57b1f47e1abfab601a16a30609ffaf6e421a366177e679f80ba1ab4ef818cc1ccd444c29db85e0b636a71940291451ad3485ab4826e3f9e7ec40e2a
-EBUILD gpxsee-13.13.ebuild 1217 BLAKE2B ef246596e2373d83ec6285052e9dab105dbfa3147f52c15bb099a8bfa186e4727019dc02dfeac67fd358c1bf7a93a059b45b3e9efd41399af73775e778a88224 SHA512 25378bcd9d5eeb2ecab0f72b06f624b1322c61f5df0d34c8b6ab8b2e0228393daa07ec47f13988b758b3cab095af7fdc5d89a45a437439fa9bb1f53a2b5d0518
+DIST gpxsee-13.15.tar.gz 5552897 BLAKE2B 3817d824692064e4c15b3c32a8d3d8982899cc0de1ff2f01b6ee1a11992b41f9b39b758cea2ebe2aaff3de3dba3fceb0a08e10d76cf4801c2e794b8d081e6074 SHA512 4c80dbe46c47642dd994e4766ab6fc0e9509f43f7727160a7affeaa19efe12015d9eb04d9d584aac85f3d024699af85fab191097e5a6f7cb53f58295ddf88e32
 EBUILD gpxsee-13.14.ebuild 1247 BLAKE2B 3f767810656b44960c45f26e54e4fab0c20ce914f8d8cc7e1cc63035e34c47dbb68dc806d8b9a973a04d696da22e6a9af8696033192fe9c1cda164d22daa184f SHA512 af8853f1bb9291964f7e54e037f9930ec03e2c2379532aab520ce2e5ecb4cb1699ee1d744b417d2c1ea7747adb116813c2ae411fbea47606c1a5e88fc8c6197b
-EBUILD gpxsee-13.4.ebuild 1214 BLAKE2B b158e2dbb79029a3ffbb2e9b0eef4f5cdf8df1b6eeff62151eb48a40efb32a51a2b2c4cd77f2bc49f11d84fea08a3394dff472bbabce16ec9ab3b2007f2fc798 SHA512 81e153b8f4820970d68604a7f8d10937281e26ef8607cfa216dfe58b4ae363da7f5215d3c188b3d538077fa92eb0a9c8f06ec0cdb90571463ba1d229e9a3c814
+EBUILD gpxsee-13.15.ebuild 1517 BLAKE2B e942ddebb7e8e1dd66e5e4e69073bdcf4f662902b49ec0ec54abb576330f0e6cc85c9d5f4b3d8de3945ea53fcc1f390d798771d20256b37cedb8ed9924feb99d SHA512 7d37ba428467d25a4fdbda73347a9490d175021ef1f48fad787b02b3982e65d972b1171e4a525fc3e48e8953cb26095368095a89694348f4249fe9ad289787a7
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-13.13.ebuild b/sci-geosciences/gpxsee/gpxsee-13.15.ebuild
index d3040a4c8b15..a06e28411dd2 100644
--- a/sci-geosciences/gpxsee/gpxsee-13.13.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-13.15.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
@@ -10,7 +10,8 @@ MY_PN="GPXSee"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
+HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee"
+IUSE="qt6"
 SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -19,19 +20,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qtpositioning:6
+		dev-qt/qtserialport:6
+	)
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtpositioning:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtserialport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6 )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
 
 PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
 
@@ -48,8 +59,13 @@ src_prepare() {
 }
 
 src_compile() {
-	$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
-	eqmake5 gpxsee.pro
+	if use qt6; then
+		$(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake6 gpxsee.pro
+	else
+		$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake5 gpxsee.pro
+	fi
 	emake
 }
 
diff --git a/sci-geosciences/gpxsee/gpxsee-13.4.ebuild b/sci-geosciences/gpxsee/gpxsee-13.4.ebuild
deleted file mode 100644
index b8381be90926..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-13.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh"
-inherit plocale qmake-utils xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale rm_ts
-}
-
-src_compile() {
-	$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 7ec0b89bbbca..a3fbd5d4bf3b 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,3 @@
-DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281
 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c
-EBUILD qmapshack-1.16.1-r1.ebuild 976 BLAKE2B 5aa370763060982a384f19f7d31a77e6adeefc0df0a257a5f54e6ada84c21112e249fd3e6229a7c169a760e87734bf9ad743733331770a4ae48ea412a2e1ab3e SHA512 4e0caf30bb3f17dc628b44ff531af99ac5815d4cc702a96d089608722a5a2ea0469c22d9c0ac161b598dccf443bbf5def700111d86f4155f8705df508c15c9f4
 EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850
 MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.1-r1.ebuild
deleted file mode 100644
index 066be37b82da..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/quazip:0=[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5[widgets]
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/alglib
-	sci-libs/gdal:=
-	>=sci-libs/proj-8:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}"/${PN}-V_${PV}
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/html
-	cmake_src_install
-	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
-}