sci-geosciences/qgis: add 3.28.9, fix build with >=exiv2-0.28

Minor 9999 syncing.

Closes: https://bugs.gentoo.org/906470
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 318 insertions, 5 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5bd5fba6dce6..2a47cdc347cd 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
+DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b SHA512 d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
new file mode 100644
index 000000000000..b41ba70003c1
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
@@ -0,0 +1,41 @@
+From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 9 Jul 2023 10:01:49 +0200
+Subject: [PATCH] Fix build with exiv2 0.28
+
+(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94)
+---
+ src/core/raster/qgsexiftools.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp
+index 1fbd6a84a8c..f64e07e9165 100644
+--- a/src/core/raster/qgsexiftools.cpp
++++ b/src/core/raster/qgsexiftools.cpp
+@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
+       case Exiv2::signedLong:
+       case Exiv2::unsignedLongLong:
+       case Exiv2::signedLongLong:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++        val = QVariant::fromValue( it->toUint32() );
++#else
+         val = QVariant::fromValue( it->toLong() );
++#endif
+         break;
+ 
+       case Exiv2::tiffDouble:
+@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
+       case Exiv2::signedByte:
+       case Exiv2::tiffIfd:
+       case Exiv2::tiffIfd8:
++#if EXIV2_TEST_VERSION (0, 28, 0)
++        val = QVariant::fromValue( static_cast< int >( it->toUint32() ) );
++#else
+         val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
++#endif
+         break;
+ 
+       case Exiv2::date:
+-- 
+2.41.0
+
diff --git a/sci-geosciences/qgis/qgis-3.28.9.ebuild b/sci-geosciences/qgis/qgis-3.28.9.ebuild
new file mode 100644
index 000000000000..9150ce1f55e8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.9.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~x86"
+fi
+inherit cmake python-single-r1 virtualx 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 polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+	test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( dev-qt/qt3d:5 )
+	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:= )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( app-doc/doxygen )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # 3.34.0; bug 906470
+
+src_prepare() {
+	cmake_src_prepare
+	# Tests want to be run inside a git repo
+	if [[ ${PV} != *9999* ]]; then
+		if use test; then
+			git init -q || die
+			git config user.email "larry@gentoo.org" || die
+			git config user.name "Larry the Cow" || die
+			git add . || die
+			git commit -m "init" || die
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=$(usex doc)
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=$(usex test)
+		-DWITH_3D=$(usex 3d)
+		-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_QWTPOLAR=$(usex polar)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	# 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_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
+		-E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
+
+		--output-on-failure
+	)
+
+	virtx cmake_src_test -j1
+}
+
+src_install() {
+	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
+}
+
+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-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index ff95ee431f21..a2d3bae6931f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -53,16 +53,16 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sys-libs/zlib
 	>=sci-libs/proj-4.9.3:=
+	sys-libs/zlib
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( dev-qt/qt3d:5 )
@@ -104,13 +104,11 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
-	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
-BDEPEND="
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	dev-qt/linguist-tools:5
 	sys-devel/bison
 	sys-devel/flex