Adding metadata

14 files changed, 132 insertions, 624 deletions

diff --git a/sci-geosciences/gpsd/gpsd-3.27.5.ebuild b/sci-geosciences/gpsd/gpsd-3.27.5.ebuild
index 0722d7472688..c295a5b52862 100644
--- a/sci-geosciences/gpsd/gpsd-3.27.5.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.27.5.ebuild
@@ -20,7 +20,7 @@ else
 		mirror://nongnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://nongnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-garyemiller ) "
 fi
 
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index f0c1888730b5..4475133cc80a 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,3 +1,3 @@
 DIST gpxsee-15.10.tar.gz 6570277 BLAKE2B 0c6f59ab7ae121b36cfa1f17f2d13632f8ec21431ac423d11aff40918c2f0ee5425238a84ed8f605d801bf139d3c33196c6f791d020d2de101e90e3c9a67dbf7 SHA512 2844d7e41430c966bc75f4c6847c557adfdcff86655ea268d83253f3f0a16e18d20bb52552a57479106aecc011e166b8feb6bcf2ecd0c0e9d32dfbbe8c18acbe
-DIST gpxsee-16.6.tar.gz 6578429 BLAKE2B 7801ca34fac8c08e64fda177feb661e4582d16d7d5167390a600c303f86973e60464693cf4efe697bfe7191ff45a4cd3aa1469fa74602cb08d0e52f2dbbe7ffc SHA512 ebd812834efa6af3869a2819ea508b1210e1239f1e0d03c397dbd4ac2459a206797d474554ec42579692a68c3536f8c6138d2094e89d00ee1f994dc56fb058da
 DIST gpxsee-16.7.tar.gz 6580001 BLAKE2B 9c31630d57158c8041031d50e9e3f4b8818658d3d2c826fdfdb43ccaed4cdcdb20242e2479e8cbf2142bc96687a0aed25d1f9003b9a17f2d1b82089e5d5add84 SHA512 de4de1771771a97ea21f620e22a835946440f03166ec3b3db3dc2690df9e822a1f7a21e9abf191c3f9f91a70f9a608d3ae45fd9dc1c5c1918e6e40703634473d
+DIST gpxsee-16.8.tar.gz 6465064 BLAKE2B 6c1696914632ddef5cbc6a838d2605ee8681e2328dec324db5336aeeebb57f7b7a6cd988de327b38ccbf14e176c8208f519a0a074b66a906561d0993e0a9d2ed SHA512 3a291196c01709da062daf5955a2a016b4be386b15a1b0ad201272235b2cae2cbd24be6a54cfab02bd2a5173ad579bfd6c5353e2597c06b997d532d9858178fa
diff --git a/sci-geosciences/gpxsee/gpxsee-16.6.ebuild b/sci-geosciences/gpxsee/gpxsee-16.8.ebuild
index 4deee4c76d11..4deee4c76d11 100644
--- a/sci-geosciences/gpxsee/gpxsee-16.6.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-16.8.ebuild
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index b64deed3b962..1da61be50c9a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1,2 @@
-DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752
 DIST mapserver-8.2.2.tar.gz 2966634 BLAKE2B d7de9089e7159bc2c4fc54bc7e87992b7287ca56db5c6c38b700d70acef10f36b213370ab1081e14d3b03f2f86e5df8062b64f1f3a2735c2a3f87d20cdc5956d SHA512 e91454c4f71931d6a6f8540191441cef0b7b9f5ad1d4ccf65ee504b1d84272cfe19900141846300f6bcaace2a70b919f1fd5b2a80158c38dfaef413b1ce01a22
+DIST mapserver-8.6.4.tar.gz 3007483 BLAKE2B f8bb4893c915a1e040a3115fb76306324ea42b0c8161a12516a8f46b2bf9517b10a8f3df18a4431729b19dca4230bfc36a57ecac1a39fe37c03157e72a083e13 SHA512 a51d3d6bc37e337b8eb27f7140209301d2c2c8649c6475336f724bb7660e086caaa24f1345da19b797e3d53517673388f3ab621076afa57c14683b78a9f13032
diff --git a/sci-geosciences/mapserver/mapserver-8.0.2.ebuild b/sci-geosciences/mapserver/mapserver-8.6.4.ebuild
index 6880589c0fd7..fc53faf3a330 100644
--- a/sci-geosciences/mapserver/mapserver-8.0.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-8.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,22 +19,10 @@ SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
 LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 # NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos java mysql oracle perl postgis python"
-
+IUSE="apache bidi cairo geos java mysql oracle perl postgis python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the python-r1 eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/expat-2.2.8
@@ -136,6 +124,8 @@ src_configure() {
 	# and reliant on defaults not changing.
 	# Readability and maintainability is better this way.
 	local mycmakeargs=(
+		"-DBUILD_TESTING=$(usex test)"
+		"-DBUILD_FUZZER_REPRODUCER=OFF"
 		"-DCMAKE_SKIP_RPATH=ON"
 		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
 		"-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}"
@@ -193,6 +183,12 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}"
+
+	cmake_src_test
+}
+
 src_install() {
 	# Needs to be first
 	use apache && webapp_src_preinst
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ae84a8716640..e186cadb785f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.44.6.tar.bz2 189725834 BLAKE2B 87313cb9205a621e36bb17310a34d7a85ad6e11ade7628dde08d7cf2e8977f986557cb30afd742196335e3760c1c95536aafdcbb10e469807165f9abcfa87816 SHA512 7ab868fb214f571b7feac5172a4c60b1bba617df3cf55a6a3167b6ca87737be5fddec94155d3f0ec8ce0ca9efba19ee719d33ee3fba851c9fae6db409bf86f85
-DIST qgis-4.0.2.tar.bz2 191389020 BLAKE2B 7137c936169a5e86a9a44c5a40a253b9703e5abf636c6a5e2494412ff35d6b2b1be4c160baaa6eda17f03f6d5da82f7751873c51d88a3a817d22709a2cc6bee4 SHA512 999f3b665017aaea04275299ee7bd8965ce2963567b8bc9d4e3f40e51561b9cb6a6fa6fb10c03eb746eab1d8d21d95f56365c067a75ab1a31e04966d62c177b3
+DIST qgis-4.0.3.tar.bz2 191300392 BLAKE2B 217005b0107001bc797a75fe994820bb2f6abb9b9816c7ae5ec807ea466e705c06115d810397ab4c4fc3160bf16a7393d07db4c52b5d775cf735f18fffda8da2 SHA512 d160b9f471d761667d473ab739ed5ff7f7a95112e27495118a148e0c74c6cd6760d58760e74a41e280731ad6d5fda47f33f837b26b9eef06b86902cdce8ea922
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.44.3-testReportDir.patch b/sci-geosciences/qgis/files/qgis-3.44.3-testReportDir.patch
deleted file mode 100644
index ba6171da6d4c..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.44.3-testReportDir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/qgsrenderchecker.cpp b/src/core/qgsrenderchecker.cpp
-index c75985a..4696f18 100644
---- a/src/core/qgsrenderchecker.cpp
-+++ b/src/core/qgsrenderchecker.cpp
-@@ -54,7 +54,7 @@ QgsRenderChecker::QgsRenderChecker()
- QDir QgsRenderChecker::testReportDir()
- {
-   if ( qgetenv( "QGIS_CONTINUOUS_INTEGRATION_RUN" ) == QStringLiteral( "true" ) )
--    return QDir( QDir( "/root/QGIS" ).filePath( QStringLiteral( "qgis_test_report" ) ) );
-+    return QDir( QDir( qgetenv( "HOME" ) ).filePath( QStringLiteral( "qgis_test_report" ) ) );
-   else if ( !qgetenv( "QGIS_TEST_REPORT" ).isEmpty() )
-     return QDir( qgetenv( "QGIS_TEST_REPORT" ) );
- }
diff --git a/sci-geosciences/qgis/files/qgis-3.44.5-qt-6.10.patch b/sci-geosciences/qgis/files/qgis-3.44.5-qt-6.10.patch
deleted file mode 100644
index 9f7011c6729b..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.44.5-qt-6.10.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8da8e848d346534badd6e7974539b1e0fdd46666 Mon Sep 17 00:00:00 2001
-From: t0b3 <t0b3@users.noreply.github.com>
-Date: Tue, 25 Nov 2025 15:21:15 +0100
-Subject: [PATCH 1/2] fix: support Qt 6.10.1
-
-fixes: #64055
----
- src/core/qgssnappingutils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
-index 8f2f33a05dd4..73b418ec6ec5 100644
---- a/src/core/qgssnappingutils.cpp
-+++ b/src/core/qgssnappingutils.cpp
-@@ -646,7 +646,7 @@ QString QgsSnappingUtils::dump()
-     msg += QString( "layer : %1\n"
-                     "config: %2   tolerance %3 %4\n" )
-            .arg( layer.layer->name() )
--           .arg( layer.type ).arg( layer.tolerance ).arg( static_cast<int>( layer.unit ) );
-+           .arg( static_cast<int>( layer.type ) ).arg( layer.tolerance ).arg( static_cast<int>( layer.unit ) );
- 
-     if ( mStrategy == IndexAlwaysFull || mStrategy == IndexHybrid || mStrategy == IndexExtent )
-     {
-
-From 2a7ecfed2492735545e3dc2e3de6748ffc7fa7c6 Mon Sep 17 00:00:00 2001
-From: t0b3 <thomas.bettler@gmail.com>
-Date: Wed, 26 Nov 2025 11:51:34 +0100
-Subject: [PATCH 2/2] fix: support private Qt6Sql headers with Qt 6.10
-
----
- CMakeLists.txt                      | 2 +-
- external/qspatialite/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01af5b942558..08870cf66916 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -618,7 +618,7 @@ if(WITH_CORE)
- 
-   find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test Sql Positioning REQUIRED)
-   if (BUILD_WITH_QT6)
--    find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat REQUIRED)
-+    find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat SqlPrivate REQUIRED)
-   endif()
- 
-   if (NOT IOS)
-diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt
-index 489a41f6cc33..bdd11db4a6d7 100644
---- a/external/qspatialite/CMakeLists.txt
-+++ b/external/qspatialite/CMakeLists.txt
-@@ -5,6 +5,7 @@ add_definitions(${QT_DEFINITIONS})
- add_definitions(-DQT_PLUGIN)
- add_definitions(-DQT_SHARED)
- 
-+find_package(${QT_VERSION_BASE}Sql CONFIG)
- include_directories(SYSTEM ${${QT_VERSION_BASE}Sql_PRIVATE_INCLUDE_DIRS})
- 
- set(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp qsql_spatialite.h smain.h)
diff --git a/sci-geosciences/qgis/files/qgis-3.44.6-qt-6.10.patch b/sci-geosciences/qgis/files/qgis-3.44.6-qt-6.10.patch
deleted file mode 100644
index b9d414352309..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.44.6-qt-6.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --color -Naru a/src/providers/oracle/ocispatial/CMakeLists.txt b/src/providers/oracle/ocispatial/CMakeLists.txt
---- a/src/providers/oracle/ocispatial/CMakeLists.txt	2026-01-07 09:20:54.863975065 +0100
-+++ b/src/providers/oracle/ocispatial/CMakeLists.txt	2026-01-07 09:22:21.900468735 +0100
-@@ -20,6 +20,7 @@
- target_link_libraries(qsqlocispatial
-   ${QT_VERSION_BASE}::Core
-   ${QT_VERSION_BASE}::Sql
-+  ${QT_VERSION_BASE}::SqlPrivate
-   ${OCI_LIBRARY}
- )
- 
diff --git a/sci-geosciences/qgis/files/qgis-4.0.3-org.qgis.qgis.desktop b/sci-geosciences/qgis/files/qgis-4.0.3-org.qgis.qgis.desktop
new file mode 100644
index 000000000000..97e94a7028ab
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-4.0.3-org.qgis.qgis.desktop
@@ -0,0 +1,65 @@
+[Desktop Entry]
+Type=Application
+Name=QGIS Desktop
+Name[ar]=QGIS سطح المكتب
+Name[bg]=QGIS Десктоп
+Name[de]=QGIS-Desktop
+Name[fa]=میزکار کوانتم
+Name[fi]=QGIS-työasema
+Name[hu]=QGIS asztali alkalmazás
+Name[is]=QGIS-skjáborð
+Name[ja]=QGISデスクトップ
+Name[ko]=QGIS 데스크탑
+Name[lt]=QGIS Darbastalis
+Name[nb]=Skrivebordsprogrammet QGIS 
+Name[pt_PT]=QGIS - PC
+Name[ta]=QGIS டெச்க்டாப்
+Name[tr]=QGIS Masasütü
+Name[uk]=Настільний додаток QGIS
+Name[vi]=QGIS Phiên bản Máy tính Để bàn
+Name[zh-Hans]=QGIS 桌面版
+Name[zh-Hant]=QGIS 桌面版
+Name[zh_TW]=QGIS 桌面版
+GenericName=Geographic Information System
+GenericName[az]=Coğrafi informasiya sistemi
+GenericName[bg]=Географски информационни системи
+GenericName[ca]=Sistema d'Informació Geogràfica
+GenericName[cs]=Geografický informační systém
+GenericName[da]=Geografisk Informations System
+GenericName[de]=Geographisches Informationssystem
+GenericName[es]=Sistema de Información Geográfica
+GenericName[eu]=Geografia-informazioko sistema
+GenericName[fi]=GIS-paikkatietojärjestelmä
+GenericName[fr]=Système d'Information Géographique
+GenericName[gl]=Sistema de Información Xeográfica
+GenericName[hu]=Térinformatikai rendszer
+GenericName[is]=Landupplýsingakerfi
+GenericName[it]=Sistema di Informazione Geografica
+GenericName[ja]=地理情報システム
+GenericName[ko]=지리 정보 시스템
+GenericName[lt]=Geografinė informacinė sistema
+GenericName[nb]=Geografisk informasjonssystem
+GenericName[nl]=Geografisch informatiesysteem
+GenericName[pl]=System Informacji Geograficznej
+GenericName[pt_BR]=Sistema de Informação Geográfica
+GenericName[pt_PT]=Sistema de Informação Geográfica
+GenericName[ro]=Sistemul de Informații Geografice
+GenericName[ru]=Географическая информационная система
+GenericName[sk]=Geografický informačný systém
+GenericName[sv]=Geografiskt Informationssystem
+GenericName[ta]=புவியியல் செய்தி அமைப்பு
+GenericName[tr]=Coğrafi Bilgi Sistemi
+GenericName[uk]=Географічна інформаційна система
+GenericName[vi]=Hệ thống Thông tin Địa lý
+GenericName[zh-Hans]=地理信息系统
+GenericName[zh-Hant]=地理資訊系統
+GenericName[zh_TW]=地理資訊系統
+Icon=qgis
+TryExec=qgis
+Exec=qgis %F
+Terminal=false
+StartupNotify=false
+Categories=Qt;Education;Science;Geography;
+MimeType=application/x-qgis-project;application/x-qgis-project-container;application/x-qgis-layer-settings;application/x-qgis-layer-definition;application/x-qgis-composer-template;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/geopackage+sqlite3;
+Keywords=map;globe;postgis;wms;wfs;ogc;osgeo;
+StartupWMClass=QGIS4
diff --git a/sci-geosciences/qgis/qgis-3.44.6.ebuild b/sci-geosciences/qgis/qgis-3.44.6.ebuild
deleted file mode 100644
index 44576bb25aa7..000000000000
--- a/sci-geosciences/qgis/qgis-3.44.6.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
-
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64"
-fi
-inherit cmake flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-"
-# 	test? ( postgres )
-
-RESTRICT="!test? ( test )"
-
-# depends on abseil-cpp via protobuf targets
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6(+),ssl]
-	dev-cpp/abseil-cpp:=
-	>=dev-db/spatialite-4.2.0:=
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6(+)]
-	dev-qt/qtbase:6=[concurrent,gui,network,sql,ssl,widgets,xml]
-	dev-qt/qtmultimedia:6
-	dev-qt/qtpositioning:6
-	dev-qt/qtserialport:6
-	dev-qt/qtsvg:6
-	dev-qt/qttools:6[designer]
-	dev-vcs/git
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-8.1:=
-	virtual/zlib:=
-	>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
-	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6(+),svg(+)]
-	3d? ( dev-qt/qt3d:6 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	pdal? ( sci-libs/pdal:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			(
-				$(python_gen_cond_dep '
-					sci-libs/gdal[python,${PYTHON_USEDEP}]
-				')
-			)
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		)
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja2[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/qscintilla[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:6 )
-	webengine? ( dev-qt/qtwebengine:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( python? (
-		app-text/poppler[cairo,utils]
-		app-text/qpdf
-	) )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/lex
-	app-alternatives/yacc
-	dev-qt/qttools:6[linguist]
-	doc? ( app-text/doxygen )
-	test? ( python? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			postgres? (
-				dev-python/psycopg:2[${PYTHON_USEDEP}]
-			)
-			dev-python/pyqt6[${PYTHON_USEDEP},testlib]
-		')
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.44.3-testReportDir.patch"
-	"${FILESDIR}/${PN}-3.44.5-qt-6.10.patch" # bug 966729
-	"${FILESDIR}/${PN}-3.44.6-qt-6.10.patch" # TODO: upstream; bug 968477
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git config set --append --global safe.directory "${S}" || die
-
-			git init -q --initial-branch="master" || die
-
-			git config set --local gc.auto 0 || die
-			git config set --local user.email "larry@gentoo.org" || die
-			git config set --local user.name "Larry the Cow" || die
-			git add . > /dev/null || die
-
-			git commit -m "init" > /dev/null || die
-			git tag -a -m "${PV}" "${PV}" || die
-		fi
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862660
-	# https://github.com/qgis/QGIS/issues/56859
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
-
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-
-		# -DQWT_INCLUDE_DIR=/usr/include/qwt6
-		# -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		# -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_PRECOMPILED_HEADERS=OFF
-		-DWITH_DRACO=OFF
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_INTERNAL_NLOHMANN_JSON=OFF
-		-DBUILD_WITH_QT6=ON
-		-DWITH_ANALYSIS=ON
-		-DWITH_DESKTOP=ON
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DWITH_QWTPOLAR=ON
-		-DWITH_3D=$(usex 3d)
-		-DWITH_APIDOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-		-DWITH_GSL=$(usex georeferencer)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBENGINE=$(usex webengine)
-	)
-
-	# We list all supported versions *by upstream for this version*
-	# here, even if we're not allowing it (e.g. bugs for now), so
-	# we enable/disable all the right versions. This is so qgis doesn't
-	# try to automatically use a version the build system knows about.
-	local supported_grass_versions=( 7 8 )
-	if use grass; then
-		# We can do this because we have a := dep on grass &
-		# it changes subslot (ABI) when major versions change, so
-		# the logic here doesn't end up becoming stale.
-		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
-		readarray -d'.' -t v <<<"${f[2]}"
-		grassdir="grass${v[0]}${v[1]}"
-
-		GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
-		einfo "Supported versions: ${supported_grass_versions[*]}"
-		einfo "Found GRASS version: ${v[0]}*"
-
-		local known_grass_version
-		# GRASS isn't slotted (in Gentoo, anyway) so we pick
-		# the best version we can to build against, and disable the others.
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			case "${known_grass_version}" in
-				"${v[0]}")
-					einfo "GRASS version ${known_grass_version} is supported. Enabling."
-					mycmakeargs+=(
-						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
-						"-DWITH_GRASS${known_grass_version}=ON"
-					)
-					;;
-				*)
-					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
-					mycmakeargs+=(
-						"-DWITH_GRASS${known_grass_version}=OFF"
-					)
-					;;
-			esac
-		done
-	else
-		local known_grass_version
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			mycmakeargs+=(
-				"-DWITH_GRASS${known_grass_version}=OFF"
-			)
-		done
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	cmake_src_configure
-}
-
-src_test() {
-	addwrite "/proc/self/mem"
-	addwrite "/proc/self/task/"
-	addwrite "/dev/fuse"
-
-	local -x CMAKE_SKIP_TESTS=(
-		"^ProcessingGdalAlgorithmsRasterTest$"
-		"^ProcessingGdalAlgorithmsVectorTest$"
-		"^ProcessingGrassAlgorithmsImageryTest$"
-		"^ProcessingGrassAlgorithmsRasterTestPt1$"
-		"^ProcessingGrassAlgorithmsRasterTestPt2$"
-		"^ProcessingGrassAlgorithmsVectorTest$"
-		"^ProcessingQgisAlgorithmsTestPt1$"
-		"^ProcessingQgisAlgorithmsTestPt4$"
-		"^PyQgsAFSProvider$"
-		"^PyQgsAnnotation$"
-		"^PyQgsAnnotationLineTextItem$"
-		"^PyQgsAnnotationPictureItem$"
-		"^PyQgsAnnotationPointTextItem$"
-		"^PyQgsAppStartup$"
-		"^PyQgsAuthenticationSystem$"
-		"^PyQgsAuxiliaryStorage$"
-		"^PyQgsColorRampLegendNode$"
-		"^PyQgsDelimitedTextProvider$"
-		"^PyQgsEditWidgets$"
-		"^PyQgsElevationProfileCanvas$"
-		"^PyQgsExternalStorageAwsS3$"
-		"^PyQgsExternalStorageWebDav$"
-		"^PyQgsGeometryGeneratorSymbolLayer$"
-		"^PyQgsGeometryPaintDevice$"
-		"^PyQgsGeometryTest$"
-		"^PyQgsGoogleMapsGeocoder$"
-		"^PyQgsLayoutAtlas$"
-		"^PyQgsLayoutElevationProfile$"
-		"^PyQgsLayoutHtml$"
-		"^PyQgsLayoutLegend$"
-		"^PyQgsLayoutMap$"
-		"^PyQgsLayoutMapGrid$"
-		"^PyQgsLinearReferencingSymbolLayer$"
-		"^PyQgsMapLayerComboBox$"
-		"^PyQgsMapLayerProxyModel$"
-		"^PyQgsMemoryProvider$"
-		"^PyQgsMeshLayer$"
-		"^PyQgsMeshLayerLabeling$"
-		"^PyQgsMeshLayerRenderer$"
-		"^PyQgsOGRProvider$"
-		"^PyQgsOapifProvider$"
-		"^PyQgsPalLabelingCanvas$"
-		"^PyQgsPalLabelingLayout$"
-		"^PyQgsPalLabelingPlacement$"
-		"^PyQgsPalLabelingServer$"
-		"^PyQgsPlot$"
-		"^PyQgsPointDisplacementRenderer$"
-		"^PyQgsProfileSourceRegistry$"
-		"^PyQgsPythonProvider$"
-		"^PyQgsRasterFileWriter$"
-		"^PyQgsRasterLabeling$"
-		"^PyQgsRasterLayerRenderer$"
-		"^PyQgsSelectiveMasking$"
-		"^PyQgsServerWFS$"
-		"^PyQgsServerWMSGetLegendGraphic$"
-		"^PyQgsServerWMSGetMap$"
-		"^PyQgsServerWMSGetPrint$"
-		"^PyQgsServerWMSGetPrintAtlas$"
-		"^PyQgsServerWMSGetPrintExtra$"
-		"^PyQgsServerWMSGetPrintOutputs$"
-		"^PyQgsSettings$"
-		"^PyQgsSettingsEntry$"
-		"^PyQgsShapefileProvider$"
-		"^PyQgsSipCoverage$"
-		"^PyQgsStyleModel$"
-		"^PyQgsSvgCache$"
-		"^PyQgsTextRenderer$"
-		"^PyQgsVectorFileWriter$"
-		"^PyQgsVectorLayer$"
-		"^PyQgsVectorLayerCache$"
-		"^PyQgsVectorLayerCache$"
-		"^PyQgsVectorLayerSelectedFeatureSource$"
-		"^PyQgsVectorLayerShapefile$"
-		"^PyQgsVirtualLayerProvider$"
-		"^PyQgsWFSProvider$"
-		"^PyQgsWFSProviderGUI$"
-		"^TestQgsRandomMarkerSymbolLayer$"
-		"^qgis_banned_keywords$"
-		"^qgis_class_names$"
-		"^qgis_grassprovidertest8$"
-		"^qgis_licenses$"
-		"^test_3d_3dcameracontroller$"
-		"^test_3d_3drendering$"
-		"^test_3d_3dutils$"
-		"^test_3d_layout3dmap$"
-		"^test_3d_mesh3drendering$"
-		"^test_3d_pointcloud3drendering$"
-		"^test_3d_rubberband3drendering$"
-		"^test_3d_tessellator$"
-		"^test_analysis_meshcontours$"
-		"^test_analysis_processing$"
-		"^test_analysis_processingalgspt2$"
-		"^test_analysis_triangulation$"
-		"^test_app_advanceddigitizing$"
-		"^test_app_applocatorfilters$"
-		"^test_app_maptoolcircularstring$"
-		"^test_app_qgisapp$"
-		"^test_app_qgisappclipboard$"
-		"^test_app_vertextool$"
-		"^test_core_callout$"
-		"^test_core_compositionconverter$"
-		"^test_core_elevationmap$"
-		"^test_core_expression$"
-		"^test_core_fontmarker$"
-		"^test_core_gdalutils$"
-		"^test_core_labelingengine$"
-		"^test_core_layoutlabel$"
-		"^test_core_layoutmanualtable$"
-		"^test_core_layoutmap$"
-		"^test_core_layoutmapgrid$"
-		"^test_core_layoutpicture$"
-		"^test_core_layoutscalebar$"
-		"^test_core_layouttable$"
-		"^test_core_legendrenderer$"
-		"^test_core_linefillsymbol$"
-		"^test_core_maprendererjob$"
-		"^test_core_maprotation$"
-		"^test_core_maptopixel$"
-		"^test_core_meshlayer$"
-		"^test_core_meshlayerrenderer$"
-		"^test_core_networkaccessmanager$"
-		"^test_core_pallabeling$"
-		"^test_core_pointcloudediting$"
-		"^test_core_project$"
-		"^test_core_projectstorage$"
-		"^test_core_rastercontourrenderer$"
-		"^test_core_rasterlayer$"
-		"^test_core_simplemarker$"
-		"^test_core_svgmarker$"
-		"^test_core_tiledownloadmanager$"
-		"^test_core_vectortilelayer$"
-		"^test_gui_newdatabasetablewidget$"
-		"^test_gui_processinggui$"
-		"^test_gui_queryresultwidget$"
-		"^test_gui_scalecombobox$"
-		"^test_provider_copcprovider$"
-		"^test_provider_wcsprovider$"
-
-		"^test_core_projectstorage$"
-		"^test_gui_filedownloader$"
-
-		"^PyQgsProcessExecutablePt1$"
-		"^PyQgsProcessExecutablePt2$"
-		"^PyQgsRasterAttributeTable$"
-
-		"^PyQgsAuthManagerOAuth2OWSTest$"
-
-		# git dirty
-		"^test_core_mesheditor$"
-		"^test_core_translateproject$"
-		"^test_app_maptooleditmesh$"
-
-		# very slow
-		"^qgis_sip_uptodate$"
-	)
-
-	if ! use netcdf; then
-		CMAKE_SKIP_TESTS+=(
-			"^test_core_gdalprovider$"
-		)
-	fi
-
-	if ! use hdf5; then
-		CMAKE_SKIP_TESTS+=(
-			"^test_gui_meshlayerpropertiesdialog$"
-			"^test_app_maptooleditmesh$"
-		)
-	fi
-
-	if ! use python || ! use postgres; then
-		CMAKE_SKIP_TESTS+=(
-			"^ProcessingCheckValidityAlgorithmTest$"
-			"^ProcessingGdalAlgorithmsGeneralTest$"
-			"^ProcessingGdalAlgorithmsRasterTest$"
-			"^ProcessingGdalAlgorithmsVectorTest$"
-			"^ProcessingGrassAlgorithmsImageryTest$"
-			"^ProcessingGrassAlgorithmsRasterTestPt1$"
-			"^ProcessingGrassAlgorithmsRasterTestPt2$"
-			"^ProcessingGrassAlgorithmsVectorTest$"
-			"^ProcessingQgisAlgorithmsTestPt1$"
-			"^ProcessingQgisAlgorithmsTestPt3$"
-			"^ProcessingQgisAlgorithmsTestPt4$"
-			"^ProcessingQgisAlgorithmsTestPt5$"
-			"^ProcessingScriptUtilsTest$"
-		)
-	fi
-
-	xdg_environment_reset
-
-	local -x QGIS_CONTINUOUS_INTEGRATION_RUN=true
-	local -x QT_QPA_PLATFORM=offscreen
-
-	LC_ALL=en_US.UTF-8 \
-	cmake_src_test
-}
-
-src_install() {
-	if use test; then
-		git config --global --add safe.directory "${S}" || die
-	fi
-
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-
-	if ! [[ ${PV} == *9999* ]]; then
-		if use test; then
-			git config unset --all --global --value="${S}" safe.directory || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-4.0.2.ebuild b/sci-geosciences/qgis/qgis-4.0.3.ebuild
index 2c9b322607b8..1ea3a7b76304 100644
--- a/sci-geosciences/qgis/qgis-4.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-4.0.3.ebuild
@@ -20,7 +20,7 @@ else
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
 	KEYWORDS="~amd64"
 fi
-inherit cmake flag-o-matic optfeature python-single-r1 xdg
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -78,14 +78,6 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
-		|| (
-			(
-				$(python_gen_cond_dep '
-					sci-libs/gdal[python,${PYTHON_USEDEP}]
-				')
-			)
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		)
 		$(python_gen_cond_dep '
 			dev-python/httplib2[${PYTHON_USEDEP}]
 			dev-python/markupsafe[${PYTHON_USEDEP}]
@@ -100,6 +92,7 @@ COMMON_DEPEND="
 			dev-python/qscintilla[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
+			sci-libs/gdal[python,${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 			webengine? (
 				dev-python/pyqt6-webengine[${PYTHON_USEDEP}]
@@ -167,8 +160,6 @@ src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
-
 		-DQGIS_MANUAL_SUBDIR=share/man/
 		-DQGIS_LIB_SUBDIR=$(get_libdir)
 		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
@@ -490,6 +481,9 @@ src_install() {
 			git config unset --all --global --value="${S}" safe.directory || die
 		fi
 	fi
+
+	# generated from 4.0.3 build w/ USE=python
+	newmenu "${FILESDIR}"/${PN}-4.0.3-org.qgis.qgis.desktop org.qgis.qgis.desktop
 }
 
 pkg_postinst() {
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index c93040b25386..5b14504f9174 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,3 +1,4 @@
 DIST qmapshack-1.19.0.tar.gz 58382506 BLAKE2B 5280480d09ce70bd96fc9e96e36b2a2da412f3938230cb21921270d88cb5885b53517251afbe29c597a709d84c2db5e5c34d6fbaf43f3f3e8ac7a3592996ed07 SHA512 a3da5396d9f1c7773a06f1edfdfce627249ab892e0386d804cd974cd88f9ea657e0ea330ab1855171b4b7777c77084f63308a23f2343437e544b20e1162364e5
 DIST qmapshack-1.20.1.tar.gz 57842834 BLAKE2B 88c4b2f0c293a8c1e067411f6ad9db64a32d549f189bfdc5fb9e0cb54a8c653b8da1b2e28e77431edb0f082fad2c9da5da312cb5e95c2b87051e0fca464dfea2 SHA512 f236431b6944757d12cfa8c4b5af7b43a4b989ce4ede763a5d616f45035dda89a21adb263f82e6e811f0d4f11158be63ed3caac087711fc618afdb770612c41a
 DIST qmapshack-1.20.2.tar.gz 57864693 BLAKE2B b827982b27f1e34891abe5d64348295add98995e10a9d42b5ffe09b2d6ccf0104bba44b45e8d073d55081888c27bd1403bdea054afbba300dc59343d678e4fde SHA512 73c4bd9f2063e520d717f5414926fdd19b961b59b4701911de957f1003287a4e0819e64e8ce37cbd4aa10c4389decc6304127e02af74b64a258a86b20eff2d4b
+DIST qmapshack-1.20.3.tar.gz 58030217 BLAKE2B 960815fbc83bf5d1090433df411fc980a950e9ba25a18e578509d14687c8e5919ace7a58e31e47c20e437f936b113d80e326d7a56fb644041b3af3edafb533df SHA512 e8e7bc22c9b0bb4b1fd528e6f0e10056c1d16e20487236de4f03fb887a771d291d6078723469c9367c16de5d48880ddced7931610ae3e2313a4fcf8a09401352
diff --git a/sci-geosciences/qmapshack/qmapshack-1.20.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.20.3.ebuild
new file mode 100644
index 000000000000..34eb27732fdc
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.20.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
+SRC_URI="https://github.com/Maproom/${PN}/archive/refs/tags/V_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-V_${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+
+RDEPEND="
+	dev-db/sqlite
+	>=dev-libs/quazip-1.3-r2:=[qt6(+)]
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[dbus?,gui,network,sql,widgets,xml]
+	dev-qt/qtdeclarative:6
+	dev-qt/qttools:6[assistant,widgets]
+	dev-qt/qtwebengine:6[widgets]
+	sci-geosciences/routino
+	sci-libs/alglib
+	sci-libs/gdal:=
+	sci-libs/proj:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT6DBus=$(usex dbus)
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}/qch"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	docompress -x "/usr/share/doc/${PF}/qch"
+}