[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     bcb68aeb96085117df144b48463631f373c917ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 00:55:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 01:02:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb68aeb

sci-geosciences/qgis: Add missing DEPEND

Reported-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/qgis/qgis-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 704f228f1f8..3bb8a29f239 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
+	dev-libs/qtkeychain[qt5(+)]
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Arthur Zamarin]

commit:     f926c9d8912cacac9b0f723e7f520e9fcdcd929f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 14:48:39 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 14:48:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f926c9d8

sci-geosciences/qgis: Stabilize 3.38.3 amd64, #933037

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild
index 0284f8d105e8..0d8635be68e9 100644
--- a/sci-geosciences/qgis/qgis-3.38.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     dc8357a961fe178ee6aa73157248cbbed6bd43e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 16:36:07 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 16:36:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8357a9

sci-geosciences/qgis: drop 3.38.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-3.38.0-r1.ebuild | 464 -----------------------------
 2 files changed, 465 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c151ff7baf3d..aebd41dc20ba 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
 DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
deleted file mode 100644
index 0284f8d105e8..000000000000
--- a/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 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 postgres python qml test webengine"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-"
-# 	test? ( postgres )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt6,ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt6]
-	dev-qt/qttools:6[designer]
-	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-vcs/git
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[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}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt6]
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:6 )
-	webengine? ( dev-qt/qtwebengine:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		python? (
-			app-text/qpdf
-			app-text/poppler[cairo,utils]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/qttools:6[linguist]
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		python? (
-			$(python_gen_cond_dep '
-				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				dev-python/nose2[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=(
-	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
-	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
-	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git config --global --add safe.directory "${S}" || die
-			git init -q || die
-			git config --local gc.auto 0 || die
-			git config --local user.email "larry@gentoo.org" || die
-			git config --local user.name "Larry the Cow" || die
-			git add . || die
-
-			git commit -m "init" || 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=(
-		-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
-		-DBUILD_WITH_QT6=ON
-		-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=ON
-		-DWITH_QTWEBENGINE=$(usex webengine)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_DRACO=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
-
-	cmake_src_configure
-}
-
-src_test() {
-	addwrite "/proc/self/mem"
-	addwrite "/proc/self/task/"
-	addwrite "/dev/fuse"
-
-	local -x CMAKE_SKIP_TESTS=(
-		PyQgsAFSProvider$
-		PyQgsAnnotation$
-		PyQgsAuthenticationSystem$
-		PyQgsAuxiliaryStorage$
-		PyQgsBlockingNetworkRequest$
-		PyQgsBlockingProcess$
-		PyQgsCodeEditor$
-		PyQgsDataItemProviderRegistry$
-		PyQgsDelimitedTextProvider$
-		PyQgsEditWidgets$
-		PyQgsElevationProfileCanvas$
-		PyQgsEmbeddedSymbolRenderer$
-		PyQgsExternalStorageAwsS3$
-		PyQgsExternalStorageWebDav$
-		PyQgsFileDownloader$
-		PyQgsFloatingWidget$
-		PyQgsGeometryTest$
-		PyQgsGoogleMapsGeocoder$
-		PyQgsGroupLayer$
-		PyQgsLayerDefinition$
-		PyQgsLayoutHtml$
-		PyQgsLayoutLegend$
-		PyQgsLayoutMap$
-		PyQgsLineSymbolLayers$
-		PyQgsMapBoxGlStyleConverter$
-		PyQgsMapLayerComboBox$
-		PyQgsMapLayerProxyModel$
-		PyQgsMemoryProvider$
-		PyQgsNetworkAccessManager$
-		PyQgsOGRProvider$
-		PyQgsOGRProviderGpkg$
-		PyQgsPainting$
-		PyQgsPalLabelingCanvas$
-		PyQgsPalLabelingLayout$
-		PyQgsPalLabelingPlacement$
-		PyQgsPlot$
-		PyQgsPointCloudAttributeByRampRenderer$
-		PyQgsPointCloudClassifiedRenderer$
-		PyQgsPointCloudRgbRenderer$
-		PyQgsProcessExecutablePt1$
-		PyQgsProcessExecutablePt2$
-		PyQgsProcessingAlgRunner$
-		PyQgsProcessingInPlace$
-		PyQgsProcessingPackageLayersAlgorithm$
-		PyQgsProcessingParameters$
-		PyQgsProject$
-		PyQgsPythonProvider$
-		PyQgsRasterFileWriter$
-		PyQgsRasterLayer$
-		PyQgsRasterLayerRenderer$
-		PyQgsSelectiveMasking$
-		PyQgsSettings$
-		PyQgsSettingsEntry$
-		PyQgsShapefileProvider$
-		PyQgsSpatialiteProvider$
-		PyQgsStyleModel$
-		PyQgsSvgCache$
-		PyQgsSymbolLayerReadSld$
-		PyQgsTextRenderer$
-		PyQgsVectorFileWriter$
-		PyQgsVectorLayerCache$
-		PyQgsVectorLayerEditBuffer$
-		PyQgsVectorLayerEditUtils$
-		PyQgsVectorLayerProfileGenerator$
-		PyQgsWFSProvider$
-		TestQgsRandomMarkerSymbolLayer$
-		qgis_sip_uptodate$
-		test_3d_3drendering$
-		test_3d_layout3dmap$
-		test_3d_mesh3drendering$
-		test_3d_pointcloud3drendering$
-		test_3d_tessellator$
-		test_analysis_gcptransformer$
-		test_app_advanceddigitizing$
-		test_authmethod_authoauth2method$
-		test_core_mapdevicepixelratio$
-		test_core_ogcutils$
-		test_core_openclutils$
-		test_core_vectortilelayer$
-		test_gui_dockwidget$
-		test_gui_ogrprovidergui$
-
-		PyQgsDocCoverage$
-		PyQgsSipCoverage$
-	)
-
-	CMAKE_SKIP_TESTS+=(
-		test_core_blendmodes$
-		test_core_callout$
-		test_core_compositionconverter$
-		test_core_dataitem$
-		test_core_expression$
-		test_core_gdalutils$
-		test_core_labelingengine$
-		test_core_layoutmap$
-		test_core_layoutmapoverview$
-		test_core_layoutpicture$
-		test_core_linefillsymbol$
-		test_core_maprendererjob$
-		test_core_maprotation$
-		test_core_meshlayer$
-		test_core_meshlayerrenderer$
-		test_core_networkaccessmanager$
-		test_core_pointcloudlayerexporter$
-		test_core_project$
-		test_core_rastercontourrenderer$
-		test_core_rasterlayer$
-		test_core_simplemarker$
-		test_core_tiledownloadmanager$
-		test_gui_processinggui$
-		test_gui_filedownloader$
-		test_gui_newdatabasetablewidget$
-		test_gui_queryresultwidget$
-		test_analysis_processingalgspt2$
-		test_analysis_meshcontours$
-		test_analysis_triangulation$
-		test_analysis_processing$
-		test_provider_wcsprovider$
-		test_app_maptoolcircularstring$
-		test_app_vertextool$
-	)
-
-	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+=(
-			ProcessingGrassAlgorithmsRasterTestPt2$
-			ProcessingCheckValidityAlgorithmTest$
-			ProcessingGdalAlgorithmsGeneralTest$
-			ProcessingGdalAlgorithmsRasterTest$
-			ProcessingGdalAlgorithmsVectorTest$
-			ProcessingGeneralTest$
-			ProcessingGenericAlgorithmsTest$
-			ProcessingGrassAlgorithmsImageryTest$
-			ProcessingGrassAlgorithmsRasterTestPt1$
-			ProcessingGrassAlgorithmsVectorTest$
-			ProcessingGuiTest$
-			ProcessingModelerTest$
-			ProcessingParametersTest$
-			ProcessingProjectProviderTest$
-			ProcessingQgisAlgorithmsTestPt1$
-			ProcessingQgisAlgorithmsTestPt2$
-			ProcessingQgisAlgorithmsTestPt3$
-			ProcessingQgisAlgorithmsTestPt4$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingScriptUtilsTest$
-			ProcessingToolsTest$
-		)
-	fi
-
-	local myctestargs=(
-		--output-on-failure
-		-j1
-	)
-
-	xdg_environment_reset
-
-	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
-	virtx 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
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     552966ff7dbf03583387e1203afddc140200eb81
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 10:43:30 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:55:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=552966ff

sci-geosciences/qgis: unkeyword 3.28.10 for ~x86

Depends on sci-geosciences/gpsbabel, which lost its ~x86 keyword for
unconditional dev-qt/qtwebengine dependency.

Bug: https://bugs.gentoo.org/935700
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index 6b2233260c1e..bff6a620ed00 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     5687f7843dad94a27a48861b57a7a5c683e9f011
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 10:43:14 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:55:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5687f784

sci-geosciences/qgis: drop 3.36.3-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-3.36.3-r1.ebuild | 513 -----------------------------
 2 files changed, 514 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 72a22013d4f5..67e504f94fa1 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild
deleted file mode 100644
index 43309edb502c..000000000000
--- a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 flag-o-matic 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 qt6 test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	qt6? ( polar )
-	test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-vcs/git
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	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}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
-		')
-	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		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
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
-	test? (
-		python? (
-			app-text/qpdf
-			app-text/poppler[cairo,utils]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		python? (
-			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
-				dev-python/nose2[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
-	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
-	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git config --global --add safe.directory "${S}" || die
-			git init -q || die
-			git config --local gc.auto 0 || die
-			git config --local user.email "larry@gentoo.org" || die
-			git config --local user.name "Larry the Cow" || die
-			git add . || die
-
-			git commit -m "init" || 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=(
-		-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
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-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_QTWEBKIT=OFF
-		-DWITH_DRACO=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
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x CMAKE_SKIP_TESTS=(
-		PyQgsAFSProvider$
-		PyQgsAnnotation$
-		PyQgsAuthenticationSystem$
-		PyQgsAuxiliaryStorage$
-		PyQgsBlockingNetworkRequest$
-		PyQgsBlockingProcess$
-		PyQgsCodeEditor$
-		PyQgsDataItemProviderRegistry$
-		PyQgsDelimitedTextProvider$
-		PyQgsEditWidgets$
-		PyQgsElevationProfileCanvas$
-		PyQgsEmbeddedSymbolRenderer$
-		PyQgsExternalStorageAwsS3$
-		PyQgsExternalStorageWebDav$
-		PyQgsFileDownloader$
-		PyQgsFloatingWidget$
-		PyQgsGeometryTest$
-		PyQgsGoogleMapsGeocoder$
-		PyQgsGroupLayer$
-		PyQgsLayerDefinition$
-		PyQgsLayoutHtml$
-		PyQgsLayoutLegend$
-		PyQgsLayoutMap$
-		PyQgsLineSymbolLayers$
-		PyQgsMapBoxGlStyleConverter$
-		PyQgsMapLayerComboBox$
-		PyQgsMapLayerProxyModel$
-		PyQgsMemoryProvider$
-		PyQgsNetworkAccessManager$
-		PyQgsOGRProvider$
-		PyQgsOGRProviderGpkg$
-		PyQgsPainting$
-		PyQgsPalLabelingCanvas$
-		PyQgsPalLabelingLayout$
-		PyQgsPalLabelingPlacement$
-		PyQgsPlot$
-		PyQgsPointCloudAttributeByRampRenderer$
-		PyQgsPointCloudClassifiedRenderer$
-		PyQgsPointCloudRgbRenderer$
-		PyQgsProcessExecutablePt1$
-		PyQgsProcessExecutablePt2$
-		PyQgsProcessingAlgRunner$
-		PyQgsProcessingInPlace$
-		PyQgsProcessingPackageLayersAlgorithm$
-		PyQgsProcessingParameters$
-		PyQgsProject$
-		PyQgsPythonProvider$
-		PyQgsRasterFileWriter$
-		PyQgsRasterLayer$
-		PyQgsRasterLayerRenderer$
-		PyQgsSelectiveMasking$
-		PyQgsSettings$
-		PyQgsSettingsEntry$
-		PyQgsShapefileProvider$
-		PyQgsSpatialiteProvider$
-		PyQgsStyleModel$
-		PyQgsSvgCache$
-		PyQgsSymbolLayerReadSld$
-		PyQgsTextRenderer$
-		PyQgsVectorFileWriter$
-		PyQgsVectorLayerCache$
-		PyQgsVectorLayerEditBuffer$
-		PyQgsVectorLayerEditUtils$
-		PyQgsVectorLayerProfileGenerator$
-		PyQgsWFSProvider$
-		TestQgsRandomMarkerSymbolLayer$
-		qgis_sip_uptodate$
-		test_3d_3drendering$
-		test_3d_layout3dmap$
-		test_3d_mesh3drendering$
-		test_3d_pointcloud3drendering$
-		test_3d_tessellator$
-		test_analysis_gcptransformer$
-		test_app_advanceddigitizing$
-		test_authmethod_authoauth2method$
-		test_core_mapdevicepixelratio$
-		test_core_ogcutils$
-		test_core_openclutils$
-		test_core_vectortilelayer$
-		test_gui_dockwidget$
-		test_gui_ogrprovidergui$
-
-		PyQgsDocCoverage$
-		PyQgsSipCoverage$
-	)
-
-	CMAKE_SKIP_TESTS+=(
-		test_core_blendmodes$
-		test_core_callout$
-		test_core_compositionconverter$
-		test_core_dataitem$
-		test_core_expression$
-		test_core_gdalutils$
-		test_core_labelingengine$
-		test_core_layoutmap$
-		test_core_layoutmapoverview$
-		test_core_layoutpicture$
-		test_core_linefillsymbol$
-		test_core_maprendererjob$
-		test_core_maprotation$
-		test_core_meshlayer$
-		test_core_meshlayerrenderer$
-		test_core_networkaccessmanager$
-		test_core_pointcloudlayerexporter$
-		test_core_project$
-		test_core_rastercontourrenderer$
-		test_core_rasterlayer$
-		test_core_simplemarker$
-		test_core_tiledownloadmanager$
-		test_gui_processinggui$
-		test_gui_filedownloader$
-		test_gui_newdatabasetablewidget$
-		test_gui_queryresultwidget$
-		test_analysis_processingalgspt2$
-		test_analysis_meshcontours$
-		test_analysis_triangulation$
-		test_analysis_processing$
-		test_provider_wcsprovider$
-		test_app_maptoolcircularstring$
-		test_app_vertextool$
-	)
-
-	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+=(
-			ProcessingGrassAlgorithmsRasterTestPt2$
-			ProcessingCheckValidityAlgorithmTest$
-			ProcessingGdalAlgorithmsGeneralTest$
-			ProcessingGdalAlgorithmsRasterTest$
-			ProcessingGdalAlgorithmsVectorTest$
-			ProcessingGeneralTest$
-			ProcessingGenericAlgorithmsTest$
-			ProcessingGrassAlgorithmsImageryTest$
-			ProcessingGrassAlgorithmsRasterTestPt1$
-			ProcessingGrassAlgorithmsVectorTest$
-			ProcessingGuiTest$
-			ProcessingModelerTest$
-			ProcessingParametersTest$
-			ProcessingProjectProviderTest$
-			ProcessingQgisAlgorithmsTestPt1$
-			ProcessingQgisAlgorithmsTestPt2$
-			ProcessingQgisAlgorithmsTestPt3$
-			ProcessingQgisAlgorithmsTestPt4$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingScriptUtilsTest$
-			ProcessingToolsTest$
-		)
-	fi
-
-	local myctestargs=(
-		--output-on-failure
-		-j1
-	)
-
-	xdg_environment_reset
-
-	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
-	virtx 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
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d2b8fe0ca4c573c04426e374b58d1a038630b32d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 19:29:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:55:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b8fe0c

sci-geosciences/qgis: add 3.38.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.38.3.ebuild | 464 ++++++++++++++++++++++++++++++++
 2 files changed, 465 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 67e504f94fa1..c151ff7baf3d 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
+DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild
new file mode 100644
index 000000000000..0284f8d105e8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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 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 postgres python qml test webengine"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+"
+# 	test? ( postgres )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	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-vcs/git
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[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}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		python? (
+			app-text/qpdf
+			app-text/poppler[cairo,utils]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/qttools:6[linguist]
+	app-alternatives/yacc
+	app-alternatives/lex
+	doc? ( app-text/doxygen )
+	test? (
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
+				dev-python/nose2[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=(
+	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
+	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
+	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# Tests want to be run inside a git repo
+	if [[ ${PV} != *9999* ]]; then
+		if use test; then
+			git config --global --add safe.directory "${S}" || die
+			git init -q || die
+			git config --local gc.auto 0 || die
+			git config --local user.email "larry@gentoo.org" || die
+			git config --local user.name "Larry the Cow" || die
+			git add . || die
+
+			git commit -m "init" || 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=(
+		-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
+		-DBUILD_WITH_QT6=ON
+		-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=ON
+		-DWITH_QTWEBENGINE=$(usex webengine)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+		-DWITH_DRACO=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
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite "/proc/self/mem"
+	addwrite "/proc/self/task/"
+	addwrite "/dev/fuse"
+
+	local -x CMAKE_SKIP_TESTS=(
+		PyQgsAFSProvider$
+		PyQgsAnnotation$
+		PyQgsAuthenticationSystem$
+		PyQgsAuxiliaryStorage$
+		PyQgsBlockingNetworkRequest$
+		PyQgsBlockingProcess$
+		PyQgsCodeEditor$
+		PyQgsDataItemProviderRegistry$
+		PyQgsDelimitedTextProvider$
+		PyQgsEditWidgets$
+		PyQgsElevationProfileCanvas$
+		PyQgsEmbeddedSymbolRenderer$
+		PyQgsExternalStorageAwsS3$
+		PyQgsExternalStorageWebDav$
+		PyQgsFileDownloader$
+		PyQgsFloatingWidget$
+		PyQgsGeometryTest$
+		PyQgsGoogleMapsGeocoder$
+		PyQgsGroupLayer$
+		PyQgsLayerDefinition$
+		PyQgsLayoutHtml$
+		PyQgsLayoutLegend$
+		PyQgsLayoutMap$
+		PyQgsLineSymbolLayers$
+		PyQgsMapBoxGlStyleConverter$
+		PyQgsMapLayerComboBox$
+		PyQgsMapLayerProxyModel$
+		PyQgsMemoryProvider$
+		PyQgsNetworkAccessManager$
+		PyQgsOGRProvider$
+		PyQgsOGRProviderGpkg$
+		PyQgsPainting$
+		PyQgsPalLabelingCanvas$
+		PyQgsPalLabelingLayout$
+		PyQgsPalLabelingPlacement$
+		PyQgsPlot$
+		PyQgsPointCloudAttributeByRampRenderer$
+		PyQgsPointCloudClassifiedRenderer$
+		PyQgsPointCloudRgbRenderer$
+		PyQgsProcessExecutablePt1$
+		PyQgsProcessExecutablePt2$
+		PyQgsProcessingAlgRunner$
+		PyQgsProcessingInPlace$
+		PyQgsProcessingPackageLayersAlgorithm$
+		PyQgsProcessingParameters$
+		PyQgsProject$
+		PyQgsPythonProvider$
+		PyQgsRasterFileWriter$
+		PyQgsRasterLayer$
+		PyQgsRasterLayerRenderer$
+		PyQgsSelectiveMasking$
+		PyQgsSettings$
+		PyQgsSettingsEntry$
+		PyQgsShapefileProvider$
+		PyQgsSpatialiteProvider$
+		PyQgsStyleModel$
+		PyQgsSvgCache$
+		PyQgsSymbolLayerReadSld$
+		PyQgsTextRenderer$
+		PyQgsVectorFileWriter$
+		PyQgsVectorLayerCache$
+		PyQgsVectorLayerEditBuffer$
+		PyQgsVectorLayerEditUtils$
+		PyQgsVectorLayerProfileGenerator$
+		PyQgsWFSProvider$
+		TestQgsRandomMarkerSymbolLayer$
+		qgis_sip_uptodate$
+		test_3d_3drendering$
+		test_3d_layout3dmap$
+		test_3d_mesh3drendering$
+		test_3d_pointcloud3drendering$
+		test_3d_tessellator$
+		test_analysis_gcptransformer$
+		test_app_advanceddigitizing$
+		test_authmethod_authoauth2method$
+		test_core_mapdevicepixelratio$
+		test_core_ogcutils$
+		test_core_openclutils$
+		test_core_vectortilelayer$
+		test_gui_dockwidget$
+		test_gui_ogrprovidergui$
+
+		PyQgsDocCoverage$
+		PyQgsSipCoverage$
+	)
+
+	CMAKE_SKIP_TESTS+=(
+		test_core_blendmodes$
+		test_core_callout$
+		test_core_compositionconverter$
+		test_core_dataitem$
+		test_core_expression$
+		test_core_gdalutils$
+		test_core_labelingengine$
+		test_core_layoutmap$
+		test_core_layoutmapoverview$
+		test_core_layoutpicture$
+		test_core_linefillsymbol$
+		test_core_maprendererjob$
+		test_core_maprotation$
+		test_core_meshlayer$
+		test_core_meshlayerrenderer$
+		test_core_networkaccessmanager$
+		test_core_pointcloudlayerexporter$
+		test_core_project$
+		test_core_rastercontourrenderer$
+		test_core_rasterlayer$
+		test_core_simplemarker$
+		test_core_tiledownloadmanager$
+		test_gui_processinggui$
+		test_gui_filedownloader$
+		test_gui_newdatabasetablewidget$
+		test_gui_queryresultwidget$
+		test_analysis_processingalgspt2$
+		test_analysis_meshcontours$
+		test_analysis_triangulation$
+		test_analysis_processing$
+		test_provider_wcsprovider$
+		test_app_maptoolcircularstring$
+		test_app_vertextool$
+	)
+
+	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+=(
+			ProcessingGrassAlgorithmsRasterTestPt2$
+			ProcessingCheckValidityAlgorithmTest$
+			ProcessingGdalAlgorithmsGeneralTest$
+			ProcessingGdalAlgorithmsRasterTest$
+			ProcessingGdalAlgorithmsVectorTest$
+			ProcessingGeneralTest$
+			ProcessingGenericAlgorithmsTest$
+			ProcessingGrassAlgorithmsImageryTest$
+			ProcessingGrassAlgorithmsRasterTestPt1$
+			ProcessingGrassAlgorithmsVectorTest$
+			ProcessingGuiTest$
+			ProcessingModelerTest$
+			ProcessingParametersTest$
+			ProcessingProjectProviderTest$
+			ProcessingQgisAlgorithmsTestPt1$
+			ProcessingQgisAlgorithmsTestPt2$
+			ProcessingQgisAlgorithmsTestPt3$
+			ProcessingQgisAlgorithmsTestPt4$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingScriptUtilsTest$
+			ProcessingToolsTest$
+		)
+	fi
+
+	local myctestargs=(
+		--output-on-failure
+		-j1
+	)
+
+	xdg_environment_reset
+
+	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
+	virtx 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
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e688c80720175b039f56dd269b726bb0ed2d65d7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:34:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:16:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e688c807

sci-geosciences/qgis: 3.38.0-r1 revbump w/o Qt5 and ~x86

Bug: https://bugs.gentoo.org/933037
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.38.0-r1.ebuild | 464 +++++++++++++++++++++++++++++
 1 file changed, 464 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
new file mode 100644
index 000000000000..0284f8d105e8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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 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 postgres python qml test webengine"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+"
+# 	test? ( postgres )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	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-vcs/git
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[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}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		python? (
+			app-text/qpdf
+			app-text/poppler[cairo,utils]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/qttools:6[linguist]
+	app-alternatives/yacc
+	app-alternatives/lex
+	doc? ( app-text/doxygen )
+	test? (
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
+				dev-python/nose2[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=(
+	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
+	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
+	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# Tests want to be run inside a git repo
+	if [[ ${PV} != *9999* ]]; then
+		if use test; then
+			git config --global --add safe.directory "${S}" || die
+			git init -q || die
+			git config --local gc.auto 0 || die
+			git config --local user.email "larry@gentoo.org" || die
+			git config --local user.name "Larry the Cow" || die
+			git add . || die
+
+			git commit -m "init" || 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=(
+		-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
+		-DBUILD_WITH_QT6=ON
+		-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=ON
+		-DWITH_QTWEBENGINE=$(usex webengine)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+		-DWITH_DRACO=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
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite "/proc/self/mem"
+	addwrite "/proc/self/task/"
+	addwrite "/dev/fuse"
+
+	local -x CMAKE_SKIP_TESTS=(
+		PyQgsAFSProvider$
+		PyQgsAnnotation$
+		PyQgsAuthenticationSystem$
+		PyQgsAuxiliaryStorage$
+		PyQgsBlockingNetworkRequest$
+		PyQgsBlockingProcess$
+		PyQgsCodeEditor$
+		PyQgsDataItemProviderRegistry$
+		PyQgsDelimitedTextProvider$
+		PyQgsEditWidgets$
+		PyQgsElevationProfileCanvas$
+		PyQgsEmbeddedSymbolRenderer$
+		PyQgsExternalStorageAwsS3$
+		PyQgsExternalStorageWebDav$
+		PyQgsFileDownloader$
+		PyQgsFloatingWidget$
+		PyQgsGeometryTest$
+		PyQgsGoogleMapsGeocoder$
+		PyQgsGroupLayer$
+		PyQgsLayerDefinition$
+		PyQgsLayoutHtml$
+		PyQgsLayoutLegend$
+		PyQgsLayoutMap$
+		PyQgsLineSymbolLayers$
+		PyQgsMapBoxGlStyleConverter$
+		PyQgsMapLayerComboBox$
+		PyQgsMapLayerProxyModel$
+		PyQgsMemoryProvider$
+		PyQgsNetworkAccessManager$
+		PyQgsOGRProvider$
+		PyQgsOGRProviderGpkg$
+		PyQgsPainting$
+		PyQgsPalLabelingCanvas$
+		PyQgsPalLabelingLayout$
+		PyQgsPalLabelingPlacement$
+		PyQgsPlot$
+		PyQgsPointCloudAttributeByRampRenderer$
+		PyQgsPointCloudClassifiedRenderer$
+		PyQgsPointCloudRgbRenderer$
+		PyQgsProcessExecutablePt1$
+		PyQgsProcessExecutablePt2$
+		PyQgsProcessingAlgRunner$
+		PyQgsProcessingInPlace$
+		PyQgsProcessingPackageLayersAlgorithm$
+		PyQgsProcessingParameters$
+		PyQgsProject$
+		PyQgsPythonProvider$
+		PyQgsRasterFileWriter$
+		PyQgsRasterLayer$
+		PyQgsRasterLayerRenderer$
+		PyQgsSelectiveMasking$
+		PyQgsSettings$
+		PyQgsSettingsEntry$
+		PyQgsShapefileProvider$
+		PyQgsSpatialiteProvider$
+		PyQgsStyleModel$
+		PyQgsSvgCache$
+		PyQgsSymbolLayerReadSld$
+		PyQgsTextRenderer$
+		PyQgsVectorFileWriter$
+		PyQgsVectorLayerCache$
+		PyQgsVectorLayerEditBuffer$
+		PyQgsVectorLayerEditUtils$
+		PyQgsVectorLayerProfileGenerator$
+		PyQgsWFSProvider$
+		TestQgsRandomMarkerSymbolLayer$
+		qgis_sip_uptodate$
+		test_3d_3drendering$
+		test_3d_layout3dmap$
+		test_3d_mesh3drendering$
+		test_3d_pointcloud3drendering$
+		test_3d_tessellator$
+		test_analysis_gcptransformer$
+		test_app_advanceddigitizing$
+		test_authmethod_authoauth2method$
+		test_core_mapdevicepixelratio$
+		test_core_ogcutils$
+		test_core_openclutils$
+		test_core_vectortilelayer$
+		test_gui_dockwidget$
+		test_gui_ogrprovidergui$
+
+		PyQgsDocCoverage$
+		PyQgsSipCoverage$
+	)
+
+	CMAKE_SKIP_TESTS+=(
+		test_core_blendmodes$
+		test_core_callout$
+		test_core_compositionconverter$
+		test_core_dataitem$
+		test_core_expression$
+		test_core_gdalutils$
+		test_core_labelingengine$
+		test_core_layoutmap$
+		test_core_layoutmapoverview$
+		test_core_layoutpicture$
+		test_core_linefillsymbol$
+		test_core_maprendererjob$
+		test_core_maprotation$
+		test_core_meshlayer$
+		test_core_meshlayerrenderer$
+		test_core_networkaccessmanager$
+		test_core_pointcloudlayerexporter$
+		test_core_project$
+		test_core_rastercontourrenderer$
+		test_core_rasterlayer$
+		test_core_simplemarker$
+		test_core_tiledownloadmanager$
+		test_gui_processinggui$
+		test_gui_filedownloader$
+		test_gui_newdatabasetablewidget$
+		test_gui_queryresultwidget$
+		test_analysis_processingalgspt2$
+		test_analysis_meshcontours$
+		test_analysis_triangulation$
+		test_analysis_processing$
+		test_provider_wcsprovider$
+		test_app_maptoolcircularstring$
+		test_app_vertextool$
+	)
+
+	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+=(
+			ProcessingGrassAlgorithmsRasterTestPt2$
+			ProcessingCheckValidityAlgorithmTest$
+			ProcessingGdalAlgorithmsGeneralTest$
+			ProcessingGdalAlgorithmsRasterTest$
+			ProcessingGdalAlgorithmsVectorTest$
+			ProcessingGeneralTest$
+			ProcessingGenericAlgorithmsTest$
+			ProcessingGrassAlgorithmsImageryTest$
+			ProcessingGrassAlgorithmsRasterTestPt1$
+			ProcessingGrassAlgorithmsVectorTest$
+			ProcessingGuiTest$
+			ProcessingModelerTest$
+			ProcessingParametersTest$
+			ProcessingProjectProviderTest$
+			ProcessingQgisAlgorithmsTestPt1$
+			ProcessingQgisAlgorithmsTestPt2$
+			ProcessingQgisAlgorithmsTestPt3$
+			ProcessingQgisAlgorithmsTestPt4$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingScriptUtilsTest$
+			ProcessingToolsTest$
+		)
+	fi
+
+	local myctestargs=(
+		--output-on-failure
+		-j1
+	)
+
+	xdg_environment_reset
+
+	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
+	virtx 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
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     ffc5fc48020b8efd124b82bb939d24816c2e1957
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:35:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:16:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc5fc48

sci-geosciences/qgis: drop 3.38.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.38.0.ebuild | 520 --------------------------------
 1 file changed, 520 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.38.0.ebuild b/sci-geosciences/qgis/qgis-3.38.0.ebuild
deleted file mode 100644
index 76526560ee61..000000000000
--- a/sci-geosciences/qgis/qgis-3.38.0.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 flag-o-matic 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 qt6 test webengine"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	qt6? ( polar )
-"
-# 	test? ( postgres )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-vcs/git
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	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}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
-		')
-	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-		webengine? ( dev-qt/qtwebengine:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		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
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-		webengine? ( dev-qt/qtwebengine:6 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
-	test? (
-		python? (
-			app-text/qpdf
-			app-text/poppler[cairo,utils]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		python? (
-			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
-				dev-python/nose2[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=(
-	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
-	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
-	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git config --global --add safe.directory "${S}" || die
-			git init -q || die
-			git config --local gc.auto 0 || die
-			git config --local user.email "larry@gentoo.org" || die
-			git config --local user.name "Larry the Cow" || die
-			git add . || die
-
-			git commit -m "init" || 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=(
-		-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
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-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_QTWEBENGINE=$(usex webengine)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_DRACO=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
-
-	cmake_src_configure
-}
-
-src_test() {
-	addwrite "/proc/self/mem"
-	addwrite "/proc/self/task/"
-	addwrite "/dev/fuse"
-
-	local -x CMAKE_SKIP_TESTS=(
-		PyQgsAFSProvider$
-		PyQgsAnnotation$
-		PyQgsAuthenticationSystem$
-		PyQgsAuxiliaryStorage$
-		PyQgsBlockingNetworkRequest$
-		PyQgsBlockingProcess$
-		PyQgsCodeEditor$
-		PyQgsDataItemProviderRegistry$
-		PyQgsDelimitedTextProvider$
-		PyQgsEditWidgets$
-		PyQgsElevationProfileCanvas$
-		PyQgsEmbeddedSymbolRenderer$
-		PyQgsExternalStorageAwsS3$
-		PyQgsExternalStorageWebDav$
-		PyQgsFileDownloader$
-		PyQgsFloatingWidget$
-		PyQgsGeometryTest$
-		PyQgsGoogleMapsGeocoder$
-		PyQgsGroupLayer$
-		PyQgsLayerDefinition$
-		PyQgsLayoutHtml$
-		PyQgsLayoutLegend$
-		PyQgsLayoutMap$
-		PyQgsLineSymbolLayers$
-		PyQgsMapBoxGlStyleConverter$
-		PyQgsMapLayerComboBox$
-		PyQgsMapLayerProxyModel$
-		PyQgsMemoryProvider$
-		PyQgsNetworkAccessManager$
-		PyQgsOGRProvider$
-		PyQgsOGRProviderGpkg$
-		PyQgsPainting$
-		PyQgsPalLabelingCanvas$
-		PyQgsPalLabelingLayout$
-		PyQgsPalLabelingPlacement$
-		PyQgsPlot$
-		PyQgsPointCloudAttributeByRampRenderer$
-		PyQgsPointCloudClassifiedRenderer$
-		PyQgsPointCloudRgbRenderer$
-		PyQgsProcessExecutablePt1$
-		PyQgsProcessExecutablePt2$
-		PyQgsProcessingAlgRunner$
-		PyQgsProcessingInPlace$
-		PyQgsProcessingPackageLayersAlgorithm$
-		PyQgsProcessingParameters$
-		PyQgsProject$
-		PyQgsPythonProvider$
-		PyQgsRasterFileWriter$
-		PyQgsRasterLayer$
-		PyQgsRasterLayerRenderer$
-		PyQgsSelectiveMasking$
-		PyQgsSettings$
-		PyQgsSettingsEntry$
-		PyQgsShapefileProvider$
-		PyQgsSpatialiteProvider$
-		PyQgsStyleModel$
-		PyQgsSvgCache$
-		PyQgsSymbolLayerReadSld$
-		PyQgsTextRenderer$
-		PyQgsVectorFileWriter$
-		PyQgsVectorLayerCache$
-		PyQgsVectorLayerEditBuffer$
-		PyQgsVectorLayerEditUtils$
-		PyQgsVectorLayerProfileGenerator$
-		PyQgsWFSProvider$
-		TestQgsRandomMarkerSymbolLayer$
-		qgis_sip_uptodate$
-		test_3d_3drendering$
-		test_3d_layout3dmap$
-		test_3d_mesh3drendering$
-		test_3d_pointcloud3drendering$
-		test_3d_tessellator$
-		test_analysis_gcptransformer$
-		test_app_advanceddigitizing$
-		test_authmethod_authoauth2method$
-		test_core_mapdevicepixelratio$
-		test_core_ogcutils$
-		test_core_openclutils$
-		test_core_vectortilelayer$
-		test_gui_dockwidget$
-		test_gui_ogrprovidergui$
-
-		PyQgsDocCoverage$
-		PyQgsSipCoverage$
-	)
-
-	CMAKE_SKIP_TESTS+=(
-		test_core_blendmodes$
-		test_core_callout$
-		test_core_compositionconverter$
-		test_core_dataitem$
-		test_core_expression$
-		test_core_gdalutils$
-		test_core_labelingengine$
-		test_core_layoutmap$
-		test_core_layoutmapoverview$
-		test_core_layoutpicture$
-		test_core_linefillsymbol$
-		test_core_maprendererjob$
-		test_core_maprotation$
-		test_core_meshlayer$
-		test_core_meshlayerrenderer$
-		test_core_networkaccessmanager$
-		test_core_pointcloudlayerexporter$
-		test_core_project$
-		test_core_rastercontourrenderer$
-		test_core_rasterlayer$
-		test_core_simplemarker$
-		test_core_tiledownloadmanager$
-		test_gui_processinggui$
-		test_gui_filedownloader$
-		test_gui_newdatabasetablewidget$
-		test_gui_queryresultwidget$
-		test_analysis_processingalgspt2$
-		test_analysis_meshcontours$
-		test_analysis_triangulation$
-		test_analysis_processing$
-		test_provider_wcsprovider$
-		test_app_maptoolcircularstring$
-		test_app_vertextool$
-	)
-
-	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+=(
-			ProcessingGrassAlgorithmsRasterTestPt2$
-			ProcessingCheckValidityAlgorithmTest$
-			ProcessingGdalAlgorithmsGeneralTest$
-			ProcessingGdalAlgorithmsRasterTest$
-			ProcessingGdalAlgorithmsVectorTest$
-			ProcessingGeneralTest$
-			ProcessingGenericAlgorithmsTest$
-			ProcessingGrassAlgorithmsImageryTest$
-			ProcessingGrassAlgorithmsRasterTestPt1$
-			ProcessingGrassAlgorithmsVectorTest$
-			ProcessingGuiTest$
-			ProcessingModelerTest$
-			ProcessingParametersTest$
-			ProcessingProjectProviderTest$
-			ProcessingQgisAlgorithmsTestPt1$
-			ProcessingQgisAlgorithmsTestPt2$
-			ProcessingQgisAlgorithmsTestPt3$
-			ProcessingQgisAlgorithmsTestPt4$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingScriptUtilsTest$
-			ProcessingToolsTest$
-		)
-	fi
-
-	local myctestargs=(
-		--output-on-failure
-		-j1
-	)
-
-	xdg_environment_reset
-
-	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
-	virtx 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
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     174cfbda58acad36982c09c0ec6cd5aa2f7123a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:33:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:09:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174cfbda

sci-geosciences/qgis: drop 3.36.1, 3.36.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.36.1.ebuild | 285 --------------------------------
 sci-geosciences/qgis/qgis-3.36.3.ebuild | 285 --------------------------------
 3 files changed, 571 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d7ccf995079b..72a22013d4f5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273
 DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild
deleted file mode 100644
index f0cc12843e19..000000000000
--- a/sci-geosciences/qgis/qgis-3.36.1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 flag-o-matic 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 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/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport: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,spatialite,sqlite]
-	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/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[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-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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() {
-	# -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=(
-		-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_QTWEBKIT=OFF
-		-DWITH_DRACO=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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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-3.36.3.ebuild b/sci-geosciences/qgis/qgis-3.36.3.ebuild
deleted file mode 100644
index f0cc12843e19..000000000000
--- a/sci-geosciences/qgis/qgis-3.36.3.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 flag-o-matic 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 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/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport: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,spatialite,sqlite]
-	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/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[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-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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() {
-	# -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=(
-		-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_QTWEBKIT=OFF
-		-DWITH_DRACO=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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d56bf228f11edefb5573d71c491d16a5cd17a356
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:32:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:09:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56bf228

sci-geosciences/qgis: Drop IUSE qt6,polar and ~x86 keyword from 9999

PyQt6 is not yet keyworded for x86.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 98 ++++++++---------------------------
 1 file changed, 21 insertions(+), 77 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 76526560ee61..0284f8d105e8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="~amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
@@ -25,11 +25,10 @@ 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 qt6 test webengine"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
-	qt6? ( polar )
 "
 # 	test? ( postgres )
 
@@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	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-vcs/git
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
@@ -49,6 +56,9 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[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:= )
@@ -78,74 +88,14 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
 		')
 	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-		webengine? ( dev-qt/qtwebengine:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		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
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-		webengine? ( dev-qt/qtwebengine:6 )
-	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
 	test? (
 		python? (
 			app-text/qpdf
@@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
 BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	dev-qt/qttools:6[linguist]
 	app-alternatives/yacc
 	app-alternatives/lex
 	doc? ( app-text/doxygen )
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
@@ -221,7 +165,7 @@ src_configure() {
 
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
-		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT6=ON
 		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
@@ -235,7 +179,7 @@ src_configure() {
 		$(cmake_use_find_package netcdf NetCDF)
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_QWTPOLAR=ON
 		-DWITH_QTWEBENGINE=$(usex webengine)
 		-DWITH_PDAL=$(usex pdal)
 		-DWITH_POSTGRESQL=$(usex postgres)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     7666d09d045925af10b5c7030757a50b34b13024
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 10:32:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 11:01:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7666d09d

sci-geosciences/qgis: add 3.36.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.36.3.ebuild | 285 ++++++++++++++++++++++++++++++++
 2 files changed, 286 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e2761b3b0e7a..e6367e082396 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
 DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273
+DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.36.3.ebuild b/sci-geosciences/qgis/qgis-3.36.3.ebuild
new file mode 100644
index 000000000000..f0cc12843e19
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.36.3.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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 flag-o-matic 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 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/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport: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,spatialite,sqlite]
+	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/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[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-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	app-alternatives/yacc
+	app-alternatives/lex
+	doc? ( app-text/doxygen )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+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() {
+	# -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=(
+		-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_QTWEBKIT=OFF
+		-DWITH_DRACO=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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit:     1184e58af796c9ae0e95211df49290ff47b3f1d8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 13:57:50 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 13:57:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1184e58a

sci-geosciences/qgis: add missing usedep

Closes: https://bugs.gentoo.org/929134
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.36.1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild
index 76add61ac820..f0cc12843e19 100644
--- a/sci-geosciences/qgis/qgis-3.36.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
+	dev-qt/qtmultimedia:5[widgets]
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 1318c361a34f..1c5971b726cc 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
+	dev-qt/qtmultimedia:5[widgets]
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit:     21035cc535fb3513a8d9126daf0c3f49a0e7d715
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Wed Feb 21 06:56:59 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 12:42:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21035cc5

sci-geosciences/qgis: add missing rdep sci-libs/gdal[spatialite,sqlite], add 3.36.1

Co-authored-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/893950
Closes: https://bugs.gentoo.org/918437
Closes: https://bugs.gentoo.org/925126
Closes: https://github.com/gentoo/gentoo/pull/35458
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                          |  1 +
 .../qgis/{qgis-9999.ebuild => qgis-3.36.1.ebuild}      | 18 +++++++++++-------
 sci-geosciences/qgis/qgis-9999.ebuild                  | 16 +++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 67d8a7fa6983..e2761b3b0e7a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
+DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.36.1.ebuild
index c1a65d6983fa..76add61ac820 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
@@ -50,15 +50,17 @@ COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport: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/gdal-3.0.4:=[geos,spatialite,sqlite]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
@@ -89,7 +91,7 @@ COMMON_DEPEND="
 			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/PyQt5[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}]
@@ -100,7 +102,6 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
@@ -112,6 +113,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-qt/linguist-tools:5
 	app-alternatives/yacc
 	app-alternatives/lex
+	doc? ( app-text/doxygen )
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -154,7 +156,7 @@ src_configure() {
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
 		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
+		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
 		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
@@ -172,8 +174,8 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
+		-DWITH_DRACO=OFF
 	)
 
 	# We list all supported versions *by upstream for this version*
@@ -225,6 +227,8 @@ src_configure() {
 
 	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

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index c1a65d6983fa..1318c361a34f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
@@ -50,15 +50,17 @@ COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport: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/gdal-3.0.4:=[geos,spatialite,sqlite]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
@@ -89,7 +91,7 @@ COMMON_DEPEND="
 			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/PyQt5[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}]
@@ -100,7 +102,6 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
@@ -112,6 +113,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-qt/linguist-tools:5
 	app-alternatives/yacc
 	app-alternatives/lex
+	doc? ( app-text/doxygen )
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
@@ -154,7 +156,7 @@ src_configure() {
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
 		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
+		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
 		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
@@ -172,8 +174,8 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
+		-DWITH_DRACO=OFF
 	)
 
 	# We list all supported versions *by upstream for this version*

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     ddad82e4be5662f13ba7d2a58e638128cd4dc8da
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 21:13:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 21:43:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddad82e4

sci-geosciences/qgis: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/862660
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.10.ebuild | 10 +++++++++-
 sci-geosciences/qgis/qgis-9999.ebuild    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index 6659f9219aed..6b2233260c1e 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -18,7 +18,7 @@ else
 		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
+inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -137,6 +137,14 @@ src_prepare() {
 }
 
 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=(
 		-DQGIS_MANUAL_SUBDIR=share/man/
 		-DQGIS_LIB_SUBDIR=$(get_libdir)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index debd8230b8bd..c1a65d6983fa 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -18,7 +18,7 @@ else
 		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
+inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -136,6 +136,14 @@ src_prepare() {
 }
 
 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=(
 		-DQGIS_MANUAL_SUBDIR=share/man/
 		-DQGIS_LIB_SUBDIR=$(get_libdir)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     52ceac17970365e89d461501d5215625cf02ee5a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 19:29:51 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 19:53:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ceac17

sci-geosciences/qgis: drop 3.28.6, 3.28.9

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   2 -
 sci-geosciences/qgis/qgis-3.28.6.ebuild | 272 -------------------------------
 sci-geosciences/qgis/qgis-3.28.9.ebuild | 273 --------------------------------
 3 files changed, 547 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c9da5c5aba8f..67d8a7fa6983 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,2 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-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/qgis-3.28.6.ebuild b/sci-geosciences/qgis/qgis-3.28.6.ebuild
deleted file mode 100644
index 1a561cc37a44..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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}]
-		')
-	)
-"
-
-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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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-3.28.9.ebuild b/sci-geosciences/qgis/qgis-3.28.9.ebuild
deleted file mode 100644
index 9150ce1f55e8..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.9.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Arthur Zamarin]

commit:     9a55cc05444fab69cc5127b8adc926b7e44d07bc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 19:53:36 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 19:53:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a55cc05

sci-geosciences/qgis: Stabilize 3.28.10 amd64, #911210

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index ab7e8a81f77d..0b05c62dcfab 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d88d9e717f119b799033ce00622996d84dd8d877
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 11:57:21 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 12:04:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88d9e71

sci-geosciences/qgis: drop 3.28.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.28.2.ebuild | 272 --------------------------------
 2 files changed, 273 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 22593c224ed0..5bd5fba6dce6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf SHA512 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild b/sci-geosciences/qgis/qgis-3.28.2.ebuild
deleted file mode 100644
index 1a561cc37a44..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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}]
-		')
-	)
-"
-
-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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Arthur Zamarin]

commit:     30260a92d43e43cf5e3c09deb619c64c0839481b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 17:27:49 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 17:27:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30260a92

sci-geosciences/qgis: Stabilize 3.28.6 amd64, #906648

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.6.ebuild b/sci-geosciences/qgis/qgis-3.28.6.ebuild
index 5d1ba6c270f3..1a561cc37a44 100644
--- a/sci-geosciences/qgis/qgis-3.28.6.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     81c359059ce9293bda6dd2f11c3c6cffb55f277e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 19:01:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 20:25:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c35905

sci-geosciences/qgis: drop 3.22.9, 3.22.13, 3.28.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest            |   3 -
 sci-geosciences/qgis/qgis-3.22.13.ebuild | 256 ----------------------------
 sci-geosciences/qgis/qgis-3.22.9.ebuild  | 263 -----------------------------
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 275 -------------------------------
 4 files changed, 797 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7a50d52e1ed4..9c414d6f3696 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,2 @@
-DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637 SHA512 1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
-DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
-DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735 SHA512 f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf SHA512 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild b/sci-geosciences/qgis/qgis-3.22.13.ebuild
deleted file mode 100644
index 0a8abfefa40c..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-6.6:=[${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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=OFF
-		-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 )
-
-	# 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
-		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
-		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
-		--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-3.22.9.ebuild b/sci-geosciences/qgis/qgis-3.22.9.ebuild
deleted file mode 100644
index 5f41bf56fdfa..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.9.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
-			dev-python/six[${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-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 )
-
-	# 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
-		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
-		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
-		--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-3.28.1.ebuild b/sci-geosciences/qgis/qgis-3.28.1.ebuild
deleted file mode 100644
index 2cdb06a4dded..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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 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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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=OFF
-		-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 )
-
-	# 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     78862e3217a917f385b74dd00240ea9ef0d4ddf6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 19:05:21 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 20:25:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78862e32

sci-geosciences/qgis: add 3.28.6, fixes build with GCC-13

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

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.28.6.ebuild | 272 ++++++++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9c414d6f3696..22593c224ed0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf SHA512 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
+DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.6.ebuild b/sci-geosciences/qgis/qgis-3.28.6.ebuild
new file mode 100644
index 000000000000..5d1ba6c270f3
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.6.ebuild
@@ -0,0 +1,272 @@
+# 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}]
+		')
+	)
+"
+
+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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     68d6c12464253740c1a379ac39184d9e64ca0b1b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 01:50:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 01:50:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d6c124

sci-geosciences/qgis: Stabilize 3.28.2 amd64, #904594

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild b/sci-geosciences/qgis/qgis-3.28.2.ebuild
index 5d1ba6c270f3..1a561cc37a44 100644
--- a/sci-geosciences/qgis/qgis-3.28.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     aba4173eddb0994d2f7789c13a5b93f52faa77d7
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sat Jan  7 17:28:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 03:45:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba4173e

sci-geosciences/qgis: add 3.28.2

Closes: https://bugs.gentoo.org/889982
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29005
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.28.2.ebuild | 272 ++++++++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f8098e4b9509..7a50d52e1ed4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637 SHA512 1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735 SHA512 f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
+DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf SHA512 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild b/sci-geosciences/qgis/qgis-3.28.2.ebuild
new file mode 100644
index 000000000000..5a27022fd0e9
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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}]
+		')
+	)
+"
+
+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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     0ae6f84b9a6b630c6faf09be3b929907f635903a
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 10:36:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae6f84b

sci-geosciences/qgis: LTR version bump to 3.22.13

Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest            |   1 +
 sci-geosciences/qgis/qgis-3.22.13.ebuild | 258 +++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 099a3f555f16..e98021b1b3e0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
+DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637 SHA512 1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39 SHA512 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735 SHA512 f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild b/sci-geosciences/qgis/qgis-3.22.13.ebuild
new file mode 100644
index 000000000000..8fc4aabac569
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
+			dev-python/six[${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+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=OFF
+		-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 )
+
+	# 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
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     721bc141e57699e2942e51e7d9bd2e3dfa483a63
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 08:57:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721bc141

sci-geosciences/qgis: drop obsolete dev-python/future dep

Closes: https://bugs.gentoo.org/888301
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.13.ebuild | 1 -
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 1 -
 sci-geosciences/qgis/qgis-9999.ebuild    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild b/sci-geosciences/qgis/qgis-3.22.13.ebuild
index 7d63b5b6005e..ba4275cb7938 100644
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -77,7 +77,6 @@ COMMON_DEPEND="
 		${PYTHON_DEPS}
 		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
 			dev-python/jinja[${PYTHON_USEDEP}]
 			dev-python/markupsafe[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild b/sci-geosciences/qgis/qgis-3.28.1.ebuild
index d0d6458d68c1..c44d1a7c4f97 100644
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -83,7 +83,6 @@ COMMON_DEPEND="
 		${PYTHON_DEPS}
 		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
 			dev-python/jinja[${PYTHON_USEDEP}]
 			dev-python/markupsafe[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index bd6e2fddd082..9b1074f2ccae 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -83,7 +83,6 @@ COMMON_DEPEND="
 		${PYTHON_DEPS}
 		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
 			dev-python/jinja[${PYTHON_USEDEP}]
 			dev-python/markupsafe[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     bc8f24cb375cfd4a812207ef24cba60b2be3d9dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 08:56:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8f24cb

sci-geosciences/qgis: drop obsolete dev-python/six dep

Closes: https://bugs.gentoo.org/879487
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.13.ebuild | 3 +--
 sci-geosciences/qgis/qgis-3.28.1.ebuild  | 3 +--
 sci-geosciences/qgis/qgis-9999.ebuild    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.13.ebuild b/sci-geosciences/qgis/qgis-3.22.13.ebuild
index 8fc4aabac569..7d63b5b6005e 100644
--- a/sci-geosciences/qgis/qgis-3.22.13.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -91,7 +91,6 @@ COMMON_DEPEND="
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild b/sci-geosciences/qgis/qgis-3.28.1.ebuild
index d5f9a8600ee7..d0d6458d68c1 100644
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -97,7 +97,6 @@ COMMON_DEPEND="
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index abb712bc7c43..bd6e2fddd082 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -97,7 +97,6 @@ COMMON_DEPEND="
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     5c3ec3f9cab0b894341dd475c257f67d13ab526f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 08:58:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3ec3f9

sci-geosciences/qgis: style tweak

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.28.1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild b/sci-geosciences/qgis/qgis-3.28.1.ebuild
index c44d1a7c4f97..1e37e3fdad44 100644
--- a/sci-geosciences/qgis/qgis-3.28.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite"
 # We could package more but would ideally only stabilise the LTS ones
 # at least.
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9b1074f2ccae..528ffbb45d2e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite"
 # We could package more but would ideally only stabilise the LTS ones
 # at least.
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     097a352d616974c36acce4ff99b80f0918822f8f
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 10:36:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097a352d

sci-geosciences/qgis: removed old

Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28546
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest            |   2 -
 sci-geosciences/qgis/qgis-3.22.11.ebuild | 258 ----------------------------
 sci-geosciences/qgis/qgis-3.26.3.ebuild  | 277 -------------------------------
 3 files changed, 537 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e98021b1b3e0..f8098e4b9509 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
-DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.13.tar.bz2 143469989 BLAKE2B 1007b26745fd2e8c8b636024a3202e5b1160244952135ae45827708feba8c4b3390a6d5116e0dadc901a3cb482bd372cbdb378677ebb01a302d896606a0fc637 SHA512 1b145488d62fda4e1599bbaeb253d34a3f6cb47c2288ba004610d15e76a8837ca824a922cc260f09b04c32af9575ff647e55494cc221f760f919260b414c4a7e
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
-DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39 SHA512 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735 SHA512 f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.11.ebuild b/sci-geosciences/qgis/qgis-3.22.11.ebuild
deleted file mode 100644
index 8fc4aabac569..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.11.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-RESTRICT="!test? ( test )"
-
-# See bug #850787 re sip-6.6.
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
-			dev-python/six[${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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=OFF
-		-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 )
-
-	# 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
-		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
-		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
-
-		--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-3.26.3.ebuild b/sci-geosciences/qgis/qgis-3.26.3.ebuild
deleted file mode 100644
index d5f9a8600ee7..000000000000
--- a/sci-geosciences/qgis/qgis-3.26.3.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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 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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			dev-python/six[${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-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=OFF
-		-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 )
-
-	# 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     6fc571aca6ad492deb7d07d0d7d464161db99c76
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 10:35:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:01:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc571ac

sci-geosciences/qgis: version bump to 3.28.1

Closes: https://bugs.gentoo.org/648946
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.28.1.ebuild | 277 ++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5a04f79ee961..099a3f555f16 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39 SHA512 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
+DIST qgis-3.28.1.tar.bz2 158612624 BLAKE2B d8e0091de14b599391b2178d6c540006fdcdee937e98853d738704ad0a225dcb900645c797fc03f5a5e8bfc54a054e6324a8c8548347e3560c081416312fe735 SHA512 f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.28.1.ebuild b/sci-geosciences/qgis/qgis-3.28.1.ebuild
new file mode 100644
index 000000000000..d5f9a8600ee7
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			dev-python/six[${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+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=OFF
+		-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 )
+
+	# 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit:     342f19d05dbea37cfde0fb0da2bcc257664b3a49
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 15:03:47 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 15:04:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342f19d0

sci-geosciences/qgis: add 3.26.3, sync live

Closes: https://bugs.gentoo.org/844754
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                      |  1 +
 .../qgis/{qgis-9999.ebuild => qgis-3.26.3.ebuild}  | 25 +++++++++++++++++-----
 sci-geosciences/qgis/qgis-9999.ebuild              | 23 ++++++++++++++++----
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2b7cdae32bd0..5a04f79ee961 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
+DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39 SHA512 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.26.3.ebuild
similarity index 93%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.26.3.ebuild
index 0003264601b5..d5f9a8600ee7 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.26.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -25,14 +25,19 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+IUSE="3d examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+	test? ( postgres )
+"
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
-# See bug #850787 re sip-6.6.
+# 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
@@ -91,7 +96,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
@@ -122,6 +127,16 @@ BDEPEND="
 
 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() {

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 0003264601b5..abb712bc7c43 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 # We only package the LTS releases right now
@@ -27,12 +27,17 @@ LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+	test? ( postgres )
+"
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
-# See bug #850787 re sip-6.6.
+# 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
@@ -91,7 +96,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
@@ -122,6 +127,16 @@ BDEPEND="
 
 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() {

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     86bd7873a238ba34faff349332737b03fc66e9f1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 18:27:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 18:27:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bd7873

sci-geosciences/qgis: add 3.22.11

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest            |   1 +
 sci-geosciences/qgis/qgis-3.22.11.ebuild | 258 +++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 896fb51b57b0..0d5861607665 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
+DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91

diff --git a/sci-geosciences/qgis/qgis-3.22.11.ebuild b/sci-geosciences/qgis/qgis-3.22.11.ebuild
new file mode 100644
index 000000000000..8fc4aabac569
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.11.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
+			dev-python/six[${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+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=OFF
+		-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 )
+
+	# 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
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     174c7a9d429e2d703e08c70e54289a2177d8fd52
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 13:15:25 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 13:15:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174c7a9d

sci-geosciences/qgis: amd64 stable wrt bug #868939

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.9.ebuild b/sci-geosciences/qgis/qgis-3.22.9.ebuild
index 59c0806b22a8..38250e1276b1 100644
--- a/sci-geosciences/qgis/qgis-3.22.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.9.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake python-single-r1 virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     e09bf99503f0faf1275d90e20c4edb705a0cedcb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 02:31:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:32:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09bf995

sci-geosciences/qgis: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 8d7ea9e307f6..b4793f185721 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -26,4 +26,7 @@
 		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
 		<flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">qgis/QGIS</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     945213e0cbd59c85890fd46e1ac613b22e5a3ca1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 14:25:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:50:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945213e0

sci-geosciences/qgis: add 3.22.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                                 | 1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.22.9.ebuild} | 9 +++++++--
 sci-geosciences/qgis/qgis-9999.ebuild                         | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4af32a9f42cd..896fb51b57b0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,4 +3,5 @@ DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
 DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0 SHA512 80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
+DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.22.9.ebuild
similarity index 65%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.22.9.ebuild
index 2d3c9b473c26..59c0806b22a8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.9.ebuild
@@ -6,7 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = *9999* ]]; then
+# 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
@@ -212,7 +216,8 @@ 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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$)'
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
 
 		--output-on-failure
 	)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 2d3c9b473c26..0003264601b5 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -6,6 +6,10 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 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

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     441d620b130bdbd97b4a43e1e0e422e5a1842b36
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 23:26:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 23:28:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441d620b

sci-geosciences/qgis: add 3.22.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.8.ebuild | 259 ++++++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ac3abe949829..4af32a9f42cd 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e6
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
+DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0 SHA512 80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.8.ebuild b/sci-geosciences/qgis/qgis-3.22.8.ebuild
new file mode 100644
index 000000000000..1124e0d0de93
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.8.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# See bug #850787 re sip-6.6.
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
+			dev-python/six[${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-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 )
+
+	# 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
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     9356b0721f4cae0864ce34a5dfd519fd7a3d7d20
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 02:24:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 02:27:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9356b072

sci-geosciences/qgis: allow newer sip; sync live

Closes: https://bugs.gentoo.org/850787
Thanks-to: José de Paula Rodrigues <espinafre <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.22.7-r2.ebuild} | 8 +++++---
 sci-geosciences/qgis/qgis-9999.ebuild                            | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
similarity index 64%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
index 4bfe90fabac7..1124e0d0de93 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
+# See bug #850787 re sip-6.6.
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -86,7 +87,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
@@ -211,7 +212,8 @@ 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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$)'
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
 
 		--output-on-failure
 	)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 4bfe90fabac7..2d3c9b473c26 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
+# See bug #850787 re sip-6.6.
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -86,7 +87,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			<dev-python/sip-6.6:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     3722f754633302fb67148de678233460fe231896
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 02:02:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 02:02:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3722f754

sci-geosciences/qgis: adapt to gdal python-single-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../qgis/{qgis-9999.ebuild => qgis-3.22.7-r1.ebuild}      | 15 +++++++++++----
 sci-geosciences/qgis/qgis-9999.ebuild                     |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
similarity index 62%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
index b37b4735abda..20f78cf866b8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -57,7 +63,7 @@ COMMON_DEPEND="
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
+	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
 	mapserver? ( dev-libs/fcgi )
 	netcdf? ( sci-libs/netcdf:= )
@@ -71,6 +77,7 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
@@ -87,7 +94,6 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			<dev-python/sip-5:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
@@ -211,7 +217,8 @@ 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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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$)'
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
 
 		--output-on-failure
 	)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index b37b4735abda..4bfe90fabac7 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -71,6 +71,7 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
@@ -87,7 +88,6 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			<dev-python/sip-5:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     5cb1afafe6e0b9d9adc129e78e4738b0afea4a72
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Sun Apr 17 17:12:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 03:14:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb1afaf

sci-geosciences/qgis: add support for grass 8

Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25732
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index cf05d8a1fd83..b37b4735abda 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -28,12 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
-# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
-# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
-# Keep an eye on that bug / a fixed GRASS release and readd support
-# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
-# (No need to change the supported GRASS versions in src_configure b/c
-# it won't find GRASS 8 with this dependency set.)
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -63,7 +57,7 @@ COMMON_DEPEND="
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
+	grass? ( sci-geosciences/grass:= )
 	hdf5? ( sci-libs/hdf5:= )
 	mapserver? ( dev-libs/fcgi )
 	netcdf? ( sci-libs/netcdf:= )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     762f6ff7f6cf467aca82e85948d9c43f933d74a3
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Tue Apr  5 22:10:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 03:14:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762f6ff7

sci-geosciences/qgis: improve tests on live

Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index b952ea37d5d7..cf05d8a1fd83 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -217,8 +217,7 @@ src_configure() {
 src_test() {
 	local myctestargs=(
 		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
-		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
-		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+		-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_c
 ore_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$|PyQgsDelimited
 TextProvider$|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$|PyQgsVec
 torLayerProfileGenerator$|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
 	)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     a351fe59dce9742e624a33607a89827f8d452d02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 01:55:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 01:55:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a351fe59

sci-geosciences/qgis: Stabilize 3.22.5 amd64, #825670

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.5.ebuild b/sci-geosciences/qgis/qgis-3.22.5.ebuild
index 7aca973d344b..3489bad447fe 100644
--- a/sci-geosciences/qgis/qgis-3.22.5.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake python-single-r1 xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     020717b8fb1c5cd72eb8af5e630a0c305d9b3f83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 06:32:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:22:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020717b8

sci-geosciences/qgis: add 3.22.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                                 | 1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.22.7.ebuild} | 8 ++------
 sci-geosciences/qgis/qgis-9999.ebuild                         | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5e841dfec8e1..ac3abe949829 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
+DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.22.7.ebuild
similarity index 99%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.22.7.ebuild
index 52cef87319b2..30e49896a601 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.7.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else
@@ -121,10 +121,6 @@ BDEPEND="
 	)
 "
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	cmake_src_prepare
 }

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 52cef87319b2..b952ea37d5d7 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -121,10 +121,6 @@ BDEPEND="
 	)
 "
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     111d3bf44081bfaee86e16289171e654487a59a8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 05:46:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  4 23:28:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111d3bf4

sci-geosciences/qgis: drop 3.20.3-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-3.20.3-r1.ebuild | 205 -----------------------------
 2 files changed, 206 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 309af158fefe..5e841dfec8e1 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20

diff --git a/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
deleted file mode 100644
index 29d2851b45d4..000000000000
--- a/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     0b5fa408b79db256f5900c2fdca729320f17df2e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 19:21:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 19:21:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5fa408

sci-geosciences/qgis: add 3.22.6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.6.ebuild | 264 ++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f459dfa92367..309af158fefe 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
+DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.6.ebuild b/sci-geosciences/qgis/qgis-3.22.6.ebuild
new file mode 100644
index 000000000000..b6874427c4be
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.6.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	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}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-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 )
+
+	# 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
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+		--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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     5e3a20709c45d84207b84381a908582b19513764
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 20:08:34 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 20:14:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3a2070

sci-geosciences/qgis: Drop 3.22.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.22.4.ebuild | 207 --------------------------------
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ca7d54d59dc4..f459dfa92367 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
-DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.4.ebuild b/sci-geosciences/qgis/qgis-3.22.4.ebuild
deleted file mode 100644
index 12e8cd68f1e8..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-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 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	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}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     2f275a47a864b0c18984da0b02d968ff1361920e
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Sun Apr  3 20:14:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 01:28:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f275a47

sci-geosciences/qgis: add test

Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24885
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 157d86c11aaf..2ef1f49d303e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -14,19 +14,19 @@ else
 		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 xdg
+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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 # Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 # 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
 # https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
@@ -112,6 +112,13 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 	sys-devel/bison
 	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+			dev-python/nose2[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 pkg_setup() {
@@ -137,7 +144,7 @@ src_configure() {
 		-DWITH_GUI=ON
 		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
+		-DENABLE_TESTS=$(usex test)
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GSL=$(usex georeferencer)
 		$(cmake_use_find_package hdf5 HDF5)
@@ -202,8 +209,7 @@ src_configure() {
 		done
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
@@ -234,6 +240,17 @@ src_install() {
 	fi
 }
 
+src_test() {
+	myctestargs+=( -j1 )
+	myctestargs+=( -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_networkaccessmana
 ger|test_core_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQg
 sDataItem|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShap
 efile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' )
+	# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
+	# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+
+	myctestargs+=( --output-on-failure )
+
+	virtx cmake_src_test
+}
+
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     16201d020579e6eb6638bae75650b6090f2b2714
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 01:29:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 01:29:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16201d02

sci-geosciences/qgis: style tweaks for src_test

Mainly to put src_test before src_install to match
phase execution order.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 2ef1f49d303e..52cef87319b2 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -218,6 +218,18 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	local myctestargs=(
+		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
+		# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
+		-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_
 offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQg
 sDelimitedTextProvider|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVir
 tualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)'
+
+		--output-on-failure
+	)
+
+	virtx cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
@@ -240,17 +252,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	myctestargs+=( -j1 )
-	myctestargs+=( -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_networkaccessmana
 ger|test_core_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQg
 sDataItem|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShap
 efile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' )
-	# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
-	# test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059
-
-	myctestargs+=( --output-on-failure )
-
-	virtx cmake_src_test
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     02c1e76e5314bfa9597c017a0de3b57f96fe9fba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:23:45 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:39:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c1e76e

sci-geosciences/qgis: Drop 3.22.1, 3.22.2, 3.22.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   3 -
 sci-geosciences/qgis/qgis-3.22.1.ebuild | 205 --------------------------------
 sci-geosciences/qgis/qgis-3.22.2.ebuild | 205 --------------------------------
 sci-geosciences/qgis/qgis-3.22.3.ebuild | 205 --------------------------------
 4 files changed, 618 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 11bc127abd83..ca7d54d59dc4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
-DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
-DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
-DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild b/sci-geosciences/qgis/qgis-3.22.1.ebuild
deleted file mode 100644
index af65e82db8df..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-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 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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-3.22.2.ebuild b/sci-geosciences/qgis/qgis-3.22.2.ebuild
deleted file mode 100644
index af65e82db8df..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-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 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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-3.22.3.ebuild b/sci-geosciences/qgis/qgis-3.22.3.ebuild
deleted file mode 100644
index 424d7ec8847e..000000000000
--- a/sci-geosciences/qgis/qgis-3.22.3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-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 xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     4436dfcd4b7449fb3880f72cc0f94db509ff7457
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 19:42:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 22:47:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4436dfcd

sci-geosciences/qgis: add 3.22.4

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.4.ebuild | 205 ++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 940303f8523d..9e380ed22b73 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,4 +3,5 @@ DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e6
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
+DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.4.ebuild b/sci-geosciences/qgis/qgis-3.22.4.ebuild
new file mode 100644
index 000000000000..424d7ec8847e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.4.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+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 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     4852dd64d179a60eca9ee5c3d0e3f1642106a52e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 15:41:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 15:41:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4852dd64

sci-geosciences/qgis: add 3.22.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.3.ebuild | 205 ++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8853bd11ead4..940303f8523d 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a11
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
+DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.3.ebuild b/sci-geosciences/qgis/qgis-3.22.3.ebuild
new file mode 100644
index 000000000000..424d7ec8847e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+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 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     43161b5fcf0be912493a63bb49b33048ae828f7e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 03:56:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 03:56:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43161b5f

sci-geosciences/qgis: add 3.22.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.2.ebuild | 205 ++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1f703bc557ef..8853bd11ead4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
+DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.2.ebuild b/sci-geosciences/qgis/qgis-3.22.2.ebuild
new file mode 100644
index 000000000000..af65e82db8df
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+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 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     f31a945e9510fa8003687808dd9f27688780e78a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 18:27:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 18:27:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31a945e

sci-geosciences/qgis: Stabilize 3.22.0-r4 amd64, #828399

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index c8150cce4fe3..19fa8cd32b85 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     edfccc36b88cde6d517bb8528ae9c37ef0041c24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 10:56:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 11:12:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfccc36

sci-geosciences/qgis: fix UnusedInherits, add Python 3.10

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.22.1.ebuild | 4 ++--
 sci-geosciences/qgis/qgis-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild b/sci-geosciences/qgis/qgis-3.22.1.ebuild
index c8150cce4fe3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-3.22.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -14,7 +14,7 @@ else
 		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 desktop python-single-r1 qmake-utils xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index c8150cce4fe3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -14,7 +14,7 @@ else
 		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 desktop python-single-r1 qmake-utils xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     9de6df5e358a5b7e158ce54e5f29b9586e1344e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 10:46:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:55:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de6df5e

sci-geosciences/qgis: add 3.22.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.1.ebuild | 205 ++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b3e361a14acb..d4a7736de149 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
+DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild b/sci-geosciences/qgis/qgis-3.22.1.ebuild
new file mode 100644
index 000000000000..c8150cce4fe3
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${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/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     a219f9ecf57b46d3f6f12834ab1e6a1be100b357
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 15:23:35 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 17:15:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a219f9ec

sci-geosciences/qgis: Drop 3.20.0-r2, 3.20.2-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   2 -
 sci-geosciences/qgis/qgis-3.20.0-r2.ebuild | 204 ----------------------------
 sci-geosciences/qgis/qgis-3.20.2-r1.ebuild | 205 -----------------------------
 3 files changed, 411 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 27954b25e10..b3e361a14ac 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
-DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
-DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
deleted file mode 100644
index 4cf3bfb4587..00000000000
--- a/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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-3.20.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
deleted file mode 100644
index 29d2851b45d..00000000000
--- a/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-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/qtsvg:5
-	dev-qt/qtsql: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:=
-	>=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-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${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
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		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}
-		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     edce817d1509321b845206b181dc050013d0fd5d
Author:     Daniel M. Weeks <dan <AT> danweeks <DOT> net>
AuthorDate: Wed Oct 27 14:05:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:53:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edce817d

sci-geosciences/qgis: Fix qtserialport dependency

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel M. Weeks <dan <AT> danweeks.net>
Closes: https://github.com/gentoo/gentoo/pull/22726
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.20.0-r1.ebuild => qgis-3.20.0-r2.ebuild} | 1 -
 sci-geosciences/qgis/{qgis-3.20.2.ebuild => qgis-3.20.2-r1.ebuild}    | 1 -
 sci-geosciences/qgis/{qgis-3.20.3.ebuild => qgis-3.20.3-r1.ebuild}    | 1 -
 sci-geosciences/qgis/{qgis-3.22.0-r3.ebuild => qgis-3.22.0-r4.ebuild} | 1 -
 sci-geosciences/qgis/qgis-9999.ebuild                                 | 1 -
 5 files changed, 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
rename to sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
index 5c5913d97ad..4cf3bfb4587 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.2.ebuild
rename to sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
index c9e0381c5f2..29d2851b45d 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.3.ebuild
rename to sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
index c9e0381c5f2..29d2851b45d 100644
--- a/sci-geosciences/qgis/qgis-3.20.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index bb5286e0d88..c8150cce4fe 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index bb5286e0d88..c8150cce4fe 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     9cfc9af0ea3d0ca1864ad44bdfca16267770149b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 22:31:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 22:31:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfc9af0

sci-geosciences/qgis: Stabilize 3.20.3 amd64, #820089

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild b/sci-geosciences/qgis/qgis-3.20.3.ebuild
index ba166c28197..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     f98a5004a73f29d01f7901f3158a51f5a26cbc15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:25:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:26:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98a5004

sci-geosciences/qgis: once again change PyQt5 dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0-r2.ebuild => qgis-3.22.0-r3.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
index 005eb4fb7cb..bb5286e0d88 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 005eb4fb7cb..bb5286e0d88 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     34aab6c54a181582d488e62145264cec28f405ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:04:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:04:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34aab6c5

sci-geosciences/qgis: add more PyQt5 dependencies

Closes: https://bugs.gentoo.org/820269
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0-r1.ebuild => qgis-3.22.0-r2.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
index a5cfa1cb17a..005eb4fb7cb 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r2.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a5cfa1cb17a..005eb4fb7cb 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     362a4d1bbe6d8731b422e3055d032c110f70dccc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 05:56:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 05:57:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362a4d1b

sci-geosciences/qgis: depend on dev-python/PyQt5[positioning]

Thanks-to: Bernd Feige <Bernd.Feige <AT> gmx.net>
Closes: https://bugs.gentoo.org/820401
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.22.0.ebuild => qgis-3.22.0-r1.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.22.0.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-3.22.0.ebuild
rename to sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
index ba166c28197..a5cfa1cb17a 100644
--- a/sci-geosciences/qgis/qgis-3.22.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r1.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index ba166c28197..a5cfa1cb17a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,positioning,sql,svg,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     d03c4a59a9ce447af26fffe3052e8d150ee19a55
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 00:04:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 00:36:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03c4a59

sci-geosciences/qgis: add 3.22.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.22.0.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c5380f06630..27954b25e10 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf2
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
+DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.22.0.ebuild b/sci-geosciences/qgis/qgis-3.22.0.ebuild
new file mode 100644
index 00000000000..ba166c28197
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtserialport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michał Górny]

commit:     0fef24c1f5b80fe480f8e0980711a1574513c5c3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 06:35:52 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 07:08:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fef24c1

sci-geosciences/qgis: Drop to ~x86 due to arch team slacking

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index d8e8430113f..9f48c0bfa4e 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index 51cd2ec672e..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     836f749e817408e7eda9e34292b2f82bec09c379
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 21:38:12 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 21:39:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836f749e

sci-geosciences/qgis: x86 stable wrt bug #813171

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index c9e0381c5f2..51cd2ec672e 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     ff5b61ab9d4080f42213a480c9b818bd50646a8e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 14:14:54 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 14:14:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5b61ab

sci-geosciences/qgis: amd64 stable wrt bug #813171

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index ba166c28197..c9e0381c5f2 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     0fad94b2e8bdfcaa7048a7e4048a2f6752e0eeb6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 00:55:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 01:17:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad94b2

sci-geosciences/qgis: add 3.20.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                                 | 1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.20.3.ebuild} | 1 +
 sci-geosciences/qgis/qgis-9999.ebuild                         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 11e99a964bb..c5380f06630 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
+DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.20.3.ebuild
similarity index 99%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.20.3.ebuild
index 5c5913d97ad..ba166c28197 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3.ebuild
@@ -123,6 +123,7 @@ src_configure() {
 		-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

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 5c5913d97ad..ba166c28197 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -123,6 +123,7 @@ src_configure() {
 		-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

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     31abd35ca06a1f115470af72538574e29cf07376
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 00:20:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 01:57:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31abd35c

sci-geosciences/qgis: add 3.20.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.20.2.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d96957089cb..11e99a964bb 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
+DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
new file mode 100644
index 00000000000..ba166c28197
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+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/qtserialport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql: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:=
+	>=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-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${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
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[David Seifert]

commit:     c234acc551591776f4d0d1a582e4fe21655b7cde
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 18:17:02 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 18:17:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234acc5

sci-geosciences/qgis: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild    | 32 +++++++++++++-------------
 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 36 +++++++++++++++---------------
 sci-geosciences/qgis/qgis-9999.ebuild      | 36 +++++++++++++++---------------
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 7e4e3237f9f..d8e8430113f 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999 ]]; then
@@ -73,21 +73,21 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index d7f5ec4633f..5c5913d97ad 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -72,23 +72,23 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index d7f5ec4633f..5c5913d97ad 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ ${PV} = *9999* ]]; then
@@ -72,23 +72,23 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     aa01d5339cce93fa58abea6248e848a0159197fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 12:06:17 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 12:32:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa01d533

sci-geosciences/qgis: Drop 3.16.4, 3.16.8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   2 -
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 207 --------------------------------
 sci-geosciences/qgis/qgis-3.16.8.ebuild | 207 --------------------------------
 3 files changed, 416 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index a0c7a13da32..d96957089cb 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
-DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
-DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301 SHA512 4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
deleted file mode 100644
index 7e4e3237f9f..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	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-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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-3.16.8.ebuild b/sci-geosciences/qgis/qgis-3.16.8.ebuild
deleted file mode 100644
index b9241f08516..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.8.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	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-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     cba4fa349314ab1a4d59ec75f19bc6a324cfc455
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 12:04:21 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 12:32:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba4fa34

sci-geosciences/qgis: Disable WITH_QGIS_PROCESS if IUSE="-python"

Drop unused cmake variable.
Drop outdated QT_MIN_VER variable.

See also: https://bugs.gentoo.org/753236

Closes: https://bugs.gentoo.org/796821
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 57 +++++++++++++++---------------
 sci-geosciences/qgis/qgis-9999.ebuild      | 57 +++++++++++++++---------------
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 54363b3b17a..d7f5ec4633f 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else
@@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -40,18 +36,18 @@ COMMON_DEPEND="
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
 	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	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/qtserialport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
@@ -60,7 +56,7 @@ COMMON_DEPEND="
 	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -95,19 +91,22 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
+	dev-qt/qttest:5
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -134,7 +133,6 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
@@ -159,7 +157,8 @@ src_configure() {
 		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 54363b3b17a..d7f5ec4633f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 	inherit git-r3
 else
@@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -40,18 +36,18 @@ COMMON_DEPEND="
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
 	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	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/qtserialport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
@@ -60,7 +56,7 @@ COMMON_DEPEND="
 	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -95,19 +91,22 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
+	dev-qt/qttest:5
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -134,7 +133,6 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
@@ -159,7 +157,8 @@ src_configure() {
 		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     afa1ddd188a722f60925a4f14ed57c1d28946056
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 21:46:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 21:46:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa1ddd1

sci-geosciences/qgis: Stabilize 3.18.3 x86, #798297

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 29a4f949adc..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     7055261bb1046ca7bec5b2cb29251fcfd7887c26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 21:42:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 21:42:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7055261b

sci-geosciences/qgis: Stabilize 3.18.3 amd64, #798297

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index b9241f08516..29a4f949adc 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     cfdaed855bf24e2b9cd961d8d857b4ba70f8ca9c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 08:51:21 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 08:51:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdaed85

sci-geosciences/qgis: Drop 3.16.2-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-3.16.2-r1.ebuild | 207 -----------------------------
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 05d84be13d3..a0c7a13da32 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301 SHA512 4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef

diff --git a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
deleted file mode 100644
index 7e4e3237f9f..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	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-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     d0027e6499f6174664e09ec9bdf98b7338f00887
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 23:56:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 23:56:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0027e64

sci-geosciences/qgis: sync live ebuild

Add dev-libs/protobuf dependency here too.

Bug: https://bugs.gentoo.org/796770
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 4c2bb3fd009..1d740be8086 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
+	dev-libs/protobuf:=
 	dev-libs/qtkeychain[qt5(+)]
 	>=dev-qt/designer-${QT_MIN_VER}:5
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     e75d8d174545d9f72b1ac36caa220be1946a1458
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 23:58:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 23:58:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75d8d17

sci-geosciences/qgis: restore IUSE=serial

Closes: https://bugs.gentoo.org/796785
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 4 +++-
 sci-geosciences/qgis/qgis-9999.ebuild      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 1d740be8086..54363b3b17a 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -96,6 +96,7 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -145,6 +146,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
 	)
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 1d740be8086..54363b3b17a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -96,6 +96,7 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -145,6 +146,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
 	)
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     a227fe57173f1b88da147fed47e845d7d839fc50
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 23:47:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 23:48:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a227fe57

sci-geosciences/qgis: add missing protobuf dep

Closes: https://bugs.gentoo.org/796770
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.20.0.ebuild => qgis-3.20.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.20.0.ebuild
rename to sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
index 4c2bb3fd009..1d740be8086 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
+	dev-libs/protobuf:=
 	dev-libs/qtkeychain[qt5(+)]
 	>=dev-qt/designer-${QT_MIN_VER}:5
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     5f0af375f318ccd4f1781c342fa52bf3c3aa1873
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 02:10:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 02:10:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0af375

sci-geosciences/qgis: guard sci-libs/gsl dep behind USE=georeferencer

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0.ebuild | 1 +
 sci-geosciences/qgis/qgis-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild b/sci-geosciences/qgis/qgis-3.20.0.ebuild
index 09e35f71d47..4c2bb3fd009 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -131,6 +131,7 @@ src_configure() {
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 09e35f71d47..4c2bb3fd009 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -131,6 +131,7 @@ src_configure() {
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     b7edc52ce77711610c6c1ff89909023b3a587c21
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 00:04:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 00:04:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7edc52c

sci-geosciences/qgis: fix IncorrectCopyright

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.20.0.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.20.0.ebuild b/sci-geosciences/qgis/qgis-3.20.0.ebuild
index 389d43b1494..09e35f71d47 100644
--- a/sci-geosciences/qgis/qgis-3.20.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 389d43b1494..09e35f71d47 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     00f77af5ca55b979e14e1466648e57e6ca67ea10
Author:     José de Paula Rodrigues <espinafre <AT> gmail <DOT> com>
AuthorDate: Fri May 28 20:54:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 00:03:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f77af5

sci-geosciences/qgis: fixes for paths, adds PDAL option

Closes: https://bugs.gentoo.org/693074
Signed-off-by: José de Paula Rodrigues <espinafre <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 87 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index b1e1845009f..60ed73da843 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -17,48 +18,47 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
+HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	sys-devel/bison
 	sys-devel/flex
 "
 COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
+	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:=
-	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/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -69,21 +69,23 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
 			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
 			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
 			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -91,10 +93,12 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( dev-qt/qtdeclarative:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
@@ -103,22 +107,12 @@ RDEPEND="${COMMON_DEPEND}
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="test"
 
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -149,13 +143,16 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
+		-DWITH_QTWEBKIT=$(usex webkit)
 	)
 
 	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
-		)
+		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}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
 	fi
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     ee1db344d0746f7f1e340777a5698acd6491109b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 23:50:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 00:03:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1db344

sci-geosciences/qgis: add 3.20.0, adjust live

* Drop USE=webkit (adds a deprecated dependency on qtwebkit)
* Restore zlib dependency

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                                 |  1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.20.0.ebuild} | 10 +++++-----
 sci-geosciences/qgis/qgis-9999.ebuild                         | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index bdaa699fbd8..05d84be13d3 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301 SHA512 4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
+DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.20.0.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.20.0.ebuild
index 60ed73da843..389d43b1494 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -55,6 +55,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
+	sys-libs/zlib
 	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
@@ -81,7 +82,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
@@ -94,7 +95,6 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -143,7 +143,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if use grass; then

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 60ed73da843..389d43b1494 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -55,6 +55,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
+	sys-libs/zlib
 	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
@@ -81,7 +82,7 @@ COMMON_DEPEND="
 			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
@@ -94,7 +95,6 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
@@ -143,7 +143,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if use grass; then

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     e6172682bc3a8a6f33625d21ca3976dd1e8499c9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 23:43:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 23:50:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6172682

sci-geosciences/qgis: add 3.16.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.16.8.ebuild | 207 ++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index be8c6dd9130..bdaa699fbd8 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
+DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301 SHA512 4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7
 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.8.ebuild b/sci-geosciences/qgis/qgis-3.16.8.ebuild
new file mode 100644
index 00000000000..b9241f08516
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.8.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andrew Ammerlaan]

commit:     87904651acf8af647a7d5259a17d798a1eb95239
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 19:19:19 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 19:19:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87904651

sci-geosciences/qgis: restrict to <dev-python/sip-5

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2-r1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.16.4.ebuild    | 2 +-
 sci-geosciences/qgis/qgis-3.18.3.ebuild    | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
index eb880dfdcb7..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
 			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index eb880dfdcb7..7e4e3237f9f 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
 			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index 80d2d316881..b9241f08516 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -84,7 +84,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
 			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a7669d52a7e..b1e1845009f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -85,7 +85,7 @@ COMMON_DEPEND="
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
 			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     6ef85b2cf63603b176d100f4d05b1c7a2089a02c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 27 06:56:48 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 27 06:56:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef85b2c

sci-geosciences/qgis: x86 stable wrt bug #790698

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index 455fe2bc8c3..eb880dfdcb7 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     829b8c27c9661b35f4ae4fdd1519b9c64546b168
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 15:09:18 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 26 15:09:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829b8c27

sci-geosciences/qgis: amd64 stable wrt bug #790698

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index 80d2d316881..455fe2bc8c3 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     9ca12402d402ccae0d6968c586c224847dd1b09d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 22:24:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 22:24:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca12402

sci-geosciences/qgis: add 3.18.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.18.3.ebuild | 207 ++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d7a5855a3f6..be8c6dd9130 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
+DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
new file mode 100644
index 00000000000..80d2d316881
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     c24f4ab513106b77f36df89a0cf5d00dfe071b9c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 20:42:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 20:42:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24f4ab5

sci-geosciences/qgis: fix IncorrectCopyright in 9999

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 921c9439ce9..a7669d52a7e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     138f05b842b0ee3a89b97550c8f02c998d3ccad8
Author:     t0b3 <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 18:56:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 20:39:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138f05b8

sci-geosciences/qgis: adapt path for grass78 (current ebuild)

Closes: https://bugs.gentoo.org/775245
Signed-off-by: t0b3 <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20082
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 2 +-
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 6217f4f7590..ec3f713c80a 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
 		)
 	fi
 

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index fbfc6e31fbf..de610e62b0f 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
 		)
 	fi
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e895dc65581..921c9439ce9 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
 		)
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     5e1231be59417d7a35a50639b1e610ea1741590e
Author:     Daniel M. Weeks <dan <AT> danweeks <DOT> net>
AuthorDate: Sun Dec 27 15:25:02 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 17 20:40:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1231be

sci-geosciences/qgis: Make qtserialport optional

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Daniel M. Weeks <dan <AT> danweeks.net>
Closes: https://github.com/gentoo/gentoo/pull/18836
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/metadata.xml                                  | 1 +
 sci-geosciences/qgis/{qgis-3.16.2.ebuild => qgis-3.16.2-r1.ebuild} | 5 +++--
 sci-geosciences/qgis/qgis-3.16.4.ebuild                            | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 6d6203f5cea..c54d1821656 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -23,5 +23,6 @@
 		<flag name="opencl">Enable OpenCL support</flag>
 		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
 		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
+		<flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
similarity index 97%
rename from sci-geosciences/qgis/qgis-3.16.2.ebuild
rename to sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
index ec3f713c80a..eb880dfdcb7 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
@@ -92,6 +91,7 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
@@ -149,6 +149,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
 	)
 

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
index de610e62b0f..80d2d316881 100644
--- a/sci-geosciences/qgis/qgis-3.16.4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/en/site/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
@@ -92,6 +91,7 @@ COMMON_DEPEND="
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
@@ -149,6 +149,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
 		-DWITH_QTWEBKIT=OFF
 	)
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     c8693e91a608a5b4e94498ffc48419b7acfe04df
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 21:23:51 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 21:48:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8693e91

sci-geosciences/qgis: Drop 3.16.3

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.16.3.ebuild | 206 --------------------------------
 2 files changed, 207 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7b0272bd550..d7a5855a3f6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
-DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild b/sci-geosciences/qgis/qgis-3.16.3.ebuild
deleted file mode 100644
index fbfc6e31fbf..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	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/qtserialport: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-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     da21c3eb7772fa65bba01c80496a0a83336b2ee6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 11:49:37 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 12:50:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da21c3eb

sci-geosciences/qgis: 3.16.4 version bump

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.16.4.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f6515188344..7b0272bd550 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
+DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
new file mode 100644
index 00000000000..fbfc6e31fbf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport: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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Sam James]

commit:     091317329fd6236b12e2d101a94fc00c933bd9e5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:45:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:45:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09131732

sci-geosciences/qgis: Stabilize 3.16.2 x86, #765562

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 2a1d767d336..6217f4f7590 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     37b9e6d989dc3b0ec30b9724f2633a752a729e38
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 13:31:47 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 13:31:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b9e6d9

sci-geosciences/qgis: amd64 stable wrt bug #765562

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index c27cdfcd10c..2a1d767d336 100644
--- a/sci-geosciences/qgis/qgis-3.16.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     6912d81d22746fc548f52aad7cf6593b1621de28
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 11:15:40 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 11:16:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6912d81d

sci-geosciences/qgis: Revert "Remove old"

This reverts commit 64e9a4ada230757c61483c86b3bd19582402043d.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.16.2.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 3fa616c6251..89be781dcfc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
+DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
new file mode 100644
index 00000000000..c27cdfcd10c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport: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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     775c5b91f58214b816771d76774e390cc0f474ef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 21:12:27 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 21:38:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775c5b91

sci-geosciences/qgis: 3.16.3 version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.16.3.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 123680b6b75..89be781dcfc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
+DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild b/sci-geosciences/qgis/qgis-3.16.3.ebuild
new file mode 100644
index 00000000000..fbfc6e31fbf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport: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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     39786e95cbbf3c3c1af00a003ceff9b7ef52a51a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 12:15:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 22:53:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39786e95

sci-geosciences/qgis: 3.16.2 version bump

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.16.2.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d86c91000ad..eab8f63ecd9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
 DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
+DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
new file mode 100644
index 00000000000..c27cdfcd10c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/en/site/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2[ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport: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-6.3.1:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     462e3c7a44f86565824aae4c587e9b4f56606f89
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 06:51:00 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 06:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462e3c7a

sci-geosciences/qgis: amd64 stable wrt bug #753236

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index 4e9d9ce8674..d952288f81f 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     1f5fc4790468b1c57fafb5edd317e3467e480afd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 22:00:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 22:01:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5fc479

sci-geosciences/qgis: x86 stable (bug #753236)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index cbedc2d578d..4e9d9ce8674 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="~amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     bafd33c2871256466aeb327bcd47c64c15be9a5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 21:47:03 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 21:57:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafd33c2

sci-geosciences/qgis: Disable WITH_QGIS_PROCESS if IUSE="-python"

Workaround until upstream issue #39973 is fixed.

Bug: https://bugs.gentoo.org/753236
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index f6b820db0fd..cbedc2d578d 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -158,7 +158,8 @@ src_configure() {
 		)
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     3f3fe48b4afac3673c1c36db8717c6b0a6afe3a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 20:57:14 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 00:06:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3fe48b

sci-geosciences/qgis: Add missing DEPENDs

Reported-by: Denis Lisov <dennis.lissov <AT> gmail.com>
Closes: https://bugs.gentoo.org/751220
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/{qgis-3.16.0.ebuild => qgis-3.16.0-r1.ebuild} | 4 +++-
 sci-geosciences/qgis/qgis-9999.ebuild                              | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.16.0.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-3.16.0.ebuild
rename to sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index 21e60cc41b1..f6b820db0fd 100644
--- a/sci-geosciences/qgis/qgis-3.16.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
+	dev-libs/protobuf:=
 	dev-libs/qtkeychain:=
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
@@ -45,8 +46,8 @@ COMMON_DEPEND="
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtserialport:5
-	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/exiv2:=
@@ -54,6 +55,7 @@ COMMON_DEPEND="
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-6.3.1:=
+	sys-libs/zlib
 	>=x11-libs/qscintilla-2.10.3:=
 	>=x11-libs/qwt-6.1.3-r2:6=[svg]
 	3d? ( dev-qt/qt3d:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 21e60cc41b1..f6b820db0fd 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
+	dev-libs/protobuf:=
 	dev-libs/qtkeychain:=
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
@@ -45,8 +46,8 @@ COMMON_DEPEND="
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtserialport:5
-	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/exiv2:=
@@ -54,6 +55,7 @@ COMMON_DEPEND="
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-6.3.1:=
+	sys-libs/zlib
 	>=x11-libs/qscintilla-2.10.3:=
 	>=x11-libs/qwt-6.1.3-r2:6=[svg]
 	3d? ( dev-qt/qt3d:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     562ebfa9a1be3944267a1ce8cc76fbc95d4bf13f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:16:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 15:01:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562ebfa9

sci-geosciences/qgis: Drop 3.10.7

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.10.7.ebuild | 203 --------------------------------
 2 files changed, 204 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 86ffd5a417b..e377493e5a9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
deleted file mode 100644
index 65bdc947394..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     34da8243af1a488d333974dca9146bbc2f7cff5b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 09:25:56 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 09:25:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da8243

sci-geosciences/qgis: amd64 stable wrt bug #747694

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 14cb6a77eff..65bdc947394 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     e9ee09de3bc0a09af6cbfdbc21436e09f2576b6c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 12:05:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:05:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ee09de

sci-geosciences/qgis: x86 stable wrt bug #747694

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 5009332eb58..14cb6a77eff 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="~amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michał Górny]

commit:     0e2dccc68fd287312604ecfd55c8c674f14bca3a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 06:02:15 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 06:07:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2dccc6

sci-geosciences/qgis: Fix PkgMetadataXmlInvalidPkgRef

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-geosciences/qgis/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 56b0fd7a351..6d6203f5cea 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -16,7 +16,7 @@
 	<use>
 		<flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
-		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+		<flag name="grass">Add support for grass</flag>
 		<flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
 		<flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     33249b4d842e1b4e12719aefbebbab62a5c461b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 17:18:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 17:48:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33249b4d

sci-geosciences/qgis: 3.10.9 version bump

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.10.9.ebuild | 203 ++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index a03eee960aa..86ffd5a417b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
+DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
new file mode 100644
index 00000000000..5009332eb58
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QTMIN="5.9.4"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QTMIN}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-6.3.1:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     2b474974ca406ef51ed0b287a9925c354acb0077
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 20:39:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 21:33:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b474974

sci-geosciences/qgis: Drop 3.10.2-r1

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-3.10.2-r1.ebuild | 206 -----------------------------
 2 files changed, 207 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 713481d0d5b..a03eee960aa 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
deleted file mode 100644
index cc6d86b4b70..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     4a21851f13d5bda0bf9047cbabe3c066e2e9b763
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 06:40:27 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 06:40:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a21851f

sci-geosciences/qgis: amd64 stable wrt bug #729020

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
index 14cb6a77eff..65bdc947394 100644
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     4e25ea3cb323750094fb68cadba3f32d9e54b346
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 07:43:33 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 07:43:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e25ea3c

sci-geosciences/qgis: x86 stable wrt bug #729020

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
index 5009332eb58..14cb6a77eff 100644
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="~amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     aeb25a0fac193d63c9e318b150af67d125614b69
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 15:30:05 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 15:30:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb25a0f

sci-geosciences/qgis: Actually fix unused DEPEND

Thanks-to: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://bugs.gentoo.org/716486
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.7.ebuild | 1 -
 sci-geosciences/qgis/qgis-9999.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
index 1d92f9dc32d..5009332eb58 100644
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -73,7 +73,6 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
 			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
 			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 1d92f9dc32d..5009332eb58 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -73,7 +73,6 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
 			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
 			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     5a3b0128f314a3dfba2527b8894d0b40b03b23ef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 14:20:43 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 15:24:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3b0128

sci-geosciences/qgis: Drop 3.10.3

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.10.3.ebuild | 206 --------------------------------
 2 files changed, 207 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ed4b3916543..713481d0d5b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
-DIST qgis-3.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
 DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.3.ebuild b/sci-geosciences/qgis/qgis-3.10.3.ebuild
deleted file mode 100644
index 74129055f6b..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     292e1386ca002aa1bea44374924204e8ebd5c9fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 13:06:40 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 15:24:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292e1386

sci-geosciences/qgis: 3.10.7 version bump

Contains upstream fixes for build with Qt 5.15 and PyQt5 5.15.

Closes: https://bugs.gentoo.org/712684
Closes: https://bugs.gentoo.org/716486
Closes: https://bugs.gentoo.org/727746
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                      |  1 +
 .../qgis/{qgis-9999.ebuild => qgis-3.10.7.ebuild}  | 40 ++++++++++------------
 sci-geosciences/qgis/qgis-9999.ebuild              | 40 ++++++++++------------
 3 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index a651738f867..ed4b3916543 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
+DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
similarity index 87%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.10.7.ebuild
index 74129055f6b..1d92f9dc32d 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -39,26 +38,26 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
+	>=sci-libs/proj-6.3.1:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -92,12 +91,11 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
+	>=dev-qt/qttest-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 74129055f6b..1d92f9dc32d 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
+QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -26,9 +26,8 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -39,26 +38,26 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
+	>=sci-libs/proj-6.3.1:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -92,12 +91,11 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
+	>=dev-qt/qttest-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     23b9f0ca4420569abd748f51ae3331bf578539d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 23:50:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 00:12:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b9f0ca

sci-geosciences/qgis: 3.10.3 version bump

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.10.3.ebuild | 206 ++++++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4716dc2a28a..a651738f867 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
+DIST qgis-3.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.3.ebuild b/sci-geosciences/qgis/qgis-3.10.3.ebuild
new file mode 100644
index 00000000000..74129055f6b
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michał Górny]

commit:     bf6ba2fa05581e64b9a63a4e3f77c73f3c6218bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 19:03:29 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:35:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6ba2fa

sci-geosciences/qgis: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{qgis-3.10.2.ebuild => qgis-3.10.2-r1.ebuild}  | 34 ++++++++++++----------
 sci-geosciences/qgis/qgis-3.4.12.ebuild            | 34 ++++++++++++----------
 sci-geosciences/qgis/qgis-9999.ebuild              | 34 ++++++++++++----------
 3 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
similarity index 84%
rename from sci-geosciences/qgis/qgis-3.10.2.ebuild
rename to sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
index 232d4a5b49c..cc6d86b4b70 100644
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
@@ -73,22 +73,24 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )

diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index ae1b97d37ba..d5cb18ca5d4 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -71,22 +71,24 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 14ca3c37210..74129055f6b 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -73,22 +73,24 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     8a1fe7cff994425b92fcdf98d80123054b2d0fac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 09:48:26 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 10:36:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1fe7cf

sci-geosciences/qgis: Drop 3.10.1

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.10.1.ebuild | 204 --------------------------------
 2 files changed, 205 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 26fbefbbf6c..0065053e9ae 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536
 DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.1.ebuild b/sci-geosciences/qgis/qgis-3.10.1.ebuild
deleted file mode 100644
index cffda470c4a..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-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 desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(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_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     ab6ef8a59735564c80b49e6191de8cf40b3be1e1
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 09:00:29 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 09:00:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6ef8a5

sci-geosciences/qgis: amd64 stable wrt bug #707010

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild
index 7c4d85e782c..232d4a5b49c 100644
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     1074a36d60058973f09a452a8f444e2f79ac1b54
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 07:06:31 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 07:06:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1074a36d

sci-geosciences/qgis: x86 stable wrt bug #707010

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild
index cffda470c4a..7c4d85e782c 100644
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="~amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     322aec728f4d153522fed2ceab61b5d46ac36b3b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 22:48:38 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 22:48:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322aec72

sci-geosciences/qgis: Raise minimum sci-libs/gdal version to 3.0.4

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index cffda470c4a..14ca3c37210 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
 	>=dev-qt/qtxml-${QT_MIN_VER}:5
 	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
+	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     559dbb598859d4ac98792cbd18f75b606d0fb836
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 20:41:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 21:27:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559dbb59

sci-geosciences/qgis: 3.10.2 version bump

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.10.2.ebuild | 204 ++++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index bb6361f8c5f..26fbefbbf6c 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536
+DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild
new file mode 100644
index 00000000000..cffda470c4a
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+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 desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(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_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     a0b3a86a045d645e7a0845c02dbba74c5da07733
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 09:18:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 09:18:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b3a86a

sci-geosciences/qgis: Drop 3.10.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 -
 sci-geosciences/qgis/qgis-3.10.0.ebuild | 204 --------------------------------
 2 files changed, 205 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7aea84c9771..bb6361f8c5f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.10.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c
 DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.0.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
deleted file mode 100644
index 365b9209d05..00000000000
--- a/sci-geosciences/qgis/qgis-3.10.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-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-utils desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake-utils_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake-utils_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e00e9ed6a268483671cf55c5b724b1444628640c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 09:16:02 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 09:16:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00e9ed6

sci-geosciences/qgis: Fix minimum sci-libs/proj version to >=4.9.3

Reported-by: Jean-Claude Repetto <jrepetto <AT> 9online.fr>
Closes: https://bugs.gentoo.org/701910
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.1.ebuild | 4 ++--
 sci-geosciences/qgis/qgis-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.1.ebuild b/sci-geosciences/qgis/qgis-3.10.1.ebuild
index 365b9209d05..f3f9c8e4e2f 100644
--- a/sci-geosciences/qgis/qgis-3.10.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj:=
+	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 365b9209d05..f3f9c8e4e2f 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj:=
+	>=sci-libs/proj-4.9.3:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     b46b32f461271c02c97b777eda4a9ad15f44a073
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 22:22:30 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 07:55:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46b32f4

sci-geosciences/qgis: Use appropriate cmake patch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9813d2056fe..365b9209d05 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -106,7 +106,7 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
 	# TODO upstream
 	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
 	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     ed301d6b21b4b0c7fe221ee48402e17c6db191d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 22:12:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 07:55:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed301d6b

sci-geosciences/qgis: 3.10.1 version bump

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-3.10.1.ebuild | 204 ++++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5b7a90c2d8c..7aea84c9771 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.10.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c
+DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.10.1.ebuild b/sci-geosciences/qgis/qgis-3.10.1.ebuild
new file mode 100644
index 00000000000..365b9209d05
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+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-utils desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(cmake-utils_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake-utils_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Aaron Bauman]

commit:     7ed7bc312dffd4602d34ebe0a6e6cbc176613d53
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 20:56:01 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 04:17:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed7bc31

sci-geosciences/qgis: python3_8

Package-Manager: Portage-2.3.80, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/13834
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.10.0.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.10.0.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
index f2da3eb9a47..365b9209d05 100644
--- a/sci-geosciences/qgis/qgis-3.10.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 6172fb371cc..9813d2056fe 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     8f9ddacb5fa48c2744e39007a1a10fdcf02f3b66
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 19:52:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 20:16:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9ddacb

sci-geosciences/qgis: python3_7

Package-Manager: Portage-2.3.80, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 73aa5dd5022..6172fb371cc 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     bf29e19761d49532ef74976509d5a9012447320e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 15:51:58 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 15:51:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf29e197

sci-geosciences/qgis: amd64 stable wrt bug #700040

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.4.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index e3210886844..e26eca9f9a2 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     fef0defbfcb9a3303fb51e36fe79e20cb61aa348
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 15:41:47 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 15:41:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef0defb

sci-geosciences/qgis: x86 stable wrt bug #700040

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.4.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index e0c6822fbdd..e3210886844 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="~amd64 x86"
 fi
 inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     567699c1e23dc53dd85f75f25689af945419ef35
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Thu May  9 19:23:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 23:32:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567699c1

sci-geosciences/qgis: Update dependencies, mycmakeargs and install

- Python 3 is required for building QGIS
- media-gfx/exiv2 required for analysis/raster/qgsexiftools.cpp
- dev-qt/qtxmlpatterns was never used and now not required
- explicitly enable WITH_ANALYSIS and WITH_GUI
- icons and desktop file are now installed by CMake
- optimize Python installed in site-packages
Closes: https://github.com/gentoo/gentoo/pull/11932

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e7a74b82fac..73aa5dd5022 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -27,6 +27,7 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	sys-devel/bison
 	sys-devel/flex
@@ -50,6 +51,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtsql-${QT_MIN_VER}:5
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
 	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
@@ -93,7 +95,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -128,7 +129,9 @@ src_configure() {
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
 		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
@@ -166,18 +169,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
 	insinto /usr/share/mime/packages
 	doins debian/qgis.xml
 
@@ -188,6 +179,7 @@ src_install() {
 	fi
 
 	if use python; then
+		python_optimize
 		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d23e4cc4428526de9dfaa8e3345b956901e0abac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 13:16:30 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:19:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23e4cc4

sci-geosciences/qgis: Add slot operator on sci-libs/proj

Closes: https://bugs.gentoo.org/691008
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.4.12.ebuild | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index dc087c07090..e0c6822fbdd 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj
+	sci-libs/proj:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 682733a10dd..e7a74b82fac 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj
+	sci-libs/proj:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     37415d0ad86d1b5b62e70aab20fa6c3c4bc3cc6a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:06:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:19:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37415d0a

sci-geosciences/qgis: Drop 3.4.7

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest          |   1 -
 sci-geosciences/qgis/qgis-3.4.7.ebuild | 218 ---------------------------------
 2 files changed, 219 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 3c21f68de4e..e7ea19d711f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
-DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.7.ebuild
deleted file mode 100644
index c4b4335cecb..00000000000
--- a/sci-geosciences/qgis/qgis-3.4.7.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-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-utils desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \
-		-i CMakeLists.txt || die # TODO fixed in master
-}
-
-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
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake-utils_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake-utils_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	xdg_pkg_postinst
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d646351b6774cc3eb7b3bac920a086c8e87e722b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 23:05:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d646351b

sci-geosciences/qgis: 3.4.7 version bump

Bug: https://bugs.gentoo.org/672952
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest          |   1 +
 sci-geosciences/qgis/qgis-3.4.7.ebuild | 218 +++++++++++++++++++++++++++++++++
 2 files changed, 219 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index aa60e32de73..7619af99327 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
+DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.7.ebuild
new file mode 100644
index 00000000000..c4b4335cecb
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.4.7.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+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-utils desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${P}-featuresummary.patch"
+	"${FILESDIR}/${P}-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \
+		-i CMakeLists.txt || die # TODO fixed in master
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(cmake-utils_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake-utils_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	xdg_pkg_postinst
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     09b59bc06697355114cfd40a521e379a1cbdcec6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 22:22:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b59bc0

sci-geosciences/qgis: Set WITH_INTERNAL_MDAL=ON, add USE hdf5, netcdf

As long as sci-libs/mdal is not packaged.

Upstream commits:
50422a116516cfb7e05f2e60062eb9d7555592ae
14fa499ed3ce0358dd4835cd1f43b4b93df8f473
97c95803c623f234b13a921325b050f235170d00

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/metadata.xml     | 2 ++
 sci-geosciences/qgis/qgis-9999.ebuild | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 868a026b6c1..56b0fd7a351 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -17,7 +17,9 @@
 		<flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
 		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+		<flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
+		<flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
 		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
 		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index ab077fc720a..6aa2463ff1c 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass mapserver opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -59,7 +59,9 @@ COMMON_DEPEND="
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
 	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
 	opencl? ( virtual/opencl )
 	oracle? (
 		dev-db/oracle-instantclient:=
@@ -126,12 +128,15 @@ src_configure() {
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
 		-DWITH_APIDOC=OFF
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
+		$(cmake-utils_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
+		$(cmake-utils_use_find_package netcdf NetCDF)
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     c2c1a49c753ed42fcad9e5f422d2556cecca7276
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 22:26:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c1a49c

sci-geosciences/qgis: Add new DEPEND on dev-qt/qtserialport:5

Upstream commit 212cffcab1c93f899b1acd81bda71f7d0fcd8ef8

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e52d6bd4802..e8cba614b61 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -45,6 +45,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
 	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
 	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
 	>=dev-qt/qtsvg-${QT_MIN_VER}:5
 	>=dev-qt/qtsql-${QT_MIN_VER}:5
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     89430661217c0394fa0a7c26c38d6984ee22d5e1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 21:39:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89430661

sci-geosciences/qgis: Drop obsolete cmake hacks, fix icons install

Upstream commit 618c3ce368a93aa614b534af7b1f867c25d7aabe

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9a778816327..a1d962905d6 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -110,16 +110,6 @@ pkg_setup() {
 
 src_prepare() {
 	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
 }
 
 src_configure() {
@@ -165,14 +155,14 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	domenu debian/qgis.desktop
+	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
 
 	local size type
 	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
 		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
 		done
 	done
 	newicon -s scalable images/icons/qgis_icon.svg qgis.svg

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     90966d7cab1db324be04710b330d68d10e808a05
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 22:32:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90966d7c

sci-geosciences/qgis: Add new DEPEND on virtual/opencl

Upstream commit 05be622c3043f45892e3901218fae711753117bd

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/metadata.xml     | 1 +
 sci-geosciences/qgis/qgis-9999.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 162cbbaa3de..868a026b6c1 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
 		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
+		<flag name="opencl">Enable OpenCL support</flag>
 		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
 		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e8cba614b61..ab077fc720a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass mapserver opencl oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -60,6 +60,7 @@ COMMON_DEPEND="
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	mapserver? ( dev-libs/fcgi )
+	opencl? ( virtual/opencl )
 	oracle? (
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
@@ -131,6 +132,7 @@ src_configure() {
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
+		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
 		-DWITH_POSTGRESQL=$(usex postgres)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     40c0022324cce624eb8b47eed466d77f1e3965ec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 21:30:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c00223

sci-geosciences/qgis: EAPI-7 bump

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 36 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9e1e9a34acb..9a778816327 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
-if [[ ${PV} != *9999 ]]; then
+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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 fi
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
+inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -27,6 +26,11 @@ IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -84,11 +88,8 @@ COMMON_DEPEND="
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	>=dev-qt/qttest-${QT_MIN_VER}:5
 	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -124,7 +125,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
 		-DQGIS_LIB_SUBDIR=$(get_libdir)
 		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
 		-DQWT_INCLUDE_DIR=/usr/include/qwt6
@@ -187,11 +187,11 @@ src_install() {
 	fi
 
 	if use python; then
-		python_optimize "${ED%/}"/usr/share/qgis/python
+		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 
 	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
 	fi
 }
 
@@ -210,13 +210,5 @@ pkg_postinst() {
 		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
 	fi
 
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Mikle Kolyada]

commit:     d2284fbffc8f5d998da3f1b1cbf4b263554db93e
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 18:16:24 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 18:16:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2284fbf

sci-geosciences/qgis: amd64 stable wrt bug #665300

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sci-geosciences/qgis/qgis-3.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
index dd5ca532732..7c4de2ebd69 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.2.3.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     03cc24abb29a1830074879530e568800d08fb6d0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 01:37:51 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 01:37:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cc24ab

sci-geosciences/qgis: x86 stable (bug #665300)

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sci-geosciences/qgis/qgis-3.2.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
index 23afe352fad..dd5ca532732 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="~amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d2416a856e16ae2671ae10a0e716588959727e98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 20:04:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 21:24:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2416a85

sci-geosciences/qgis: Drop 3.2.1

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-geosciences/qgis/Manifest          |   1 -
 sci-geosciences/qgis/qgis-3.2.1.ebuild | 220 ---------------------------------
 2 files changed, 221 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4383dfbacdc..8ad97a048eb 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
-DIST qgis-3.2.1.tar.bz2 72064255 BLAKE2B 7811726c3c8e84e9d2e0f2cd500d3373895bd2f91b093943d451f65de5d722ae986df59754f6d1ca6bb1a0597a841c568b40113498cb9ef707c878184387fe44 SHA512 737aa95f71661c4b2738a9db8fea49ce21f04a94768130f33b063dbca17f04119a74508211257510196b239d3acc9019e17478820534a4353519f91fbb0bc27f
 DIST qgis-3.2.2.tar.bz2 71947443 BLAKE2B a6fc159ce6d90f4273483159831c9b89db40c3bd5fb34ec90d799978aae11a609509d5fd5189dc1edfb9fb72cd9ccd9298414d024db3c43561ea096774b7be17 SHA512 d19d44f71285e1d8a1d365a406550c68cd48215c7f9f67a979052f1f115d636c66c6a291e1a108b19a641f357b27e104ac642158f375fb631c141e844f468949
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.2.1.ebuild b/sci-geosciences/qgis/qgis-3.2.1.ebuild
deleted file mode 100644
index d5ad55122d0..00000000000
--- a/sci-geosciences/qgis/qgis-3.2.1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	"${FILESDIR}/${P}-qtwebkit-optional.patch" # bug 663394
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     c7087e365164a309dad26cff1036cb2ef2245b44
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 20:03:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 21:24:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7087e36

sci-geosciences/qgis: 3.2.3 version bump

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-geosciences/qgis/Manifest          |   1 +
 sci-geosciences/qgis/qgis-3.2.3.ebuild | 220 +++++++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 49bff775474..4383dfbacdc 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis-3.2.1.tar.bz2 72064255 BLAKE2B 7811726c3c8e84e9d2e0f2cd500d3373895bd2f91b093943d451f65de5d722ae986df59754f6d1ca6bb1a0597a841c568b40113498cb9ef707c878184387fe44 SHA512 737aa95f71661c4b2738a9db8fea49ce21f04a94768130f33b063dbca17f04119a74508211257510196b239d3acc9019e17478820534a4353519f91fbb0bc27f
 DIST qgis-3.2.2.tar.bz2 71947443 BLAKE2B a6fc159ce6d90f4273483159831c9b89db40c3bd5fb34ec90d799978aae11a609509d5fd5189dc1edfb9fb72cd9ccd9298414d024db3c43561ea096774b7be17 SHA512 d19d44f71285e1d8a1d365a406550c68cd48215c7f9f67a979052f1f115d636c66c6a291e1a108b19a641f357b27e104ac642158f375fb631c141e844f468949
+DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
new file mode 100644
index 00000000000..23afe352fad
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.2.3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d4610556b9784f1487f93d0dbf7835be8189dadc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 11:05:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 15:27:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4610556

sci-geosciences/qgis: eutils -> desktop

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sci-geosciences/qgis/qgis-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 7ea4905841a..afbd37bc704 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -15,7 +15,7 @@ else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
 fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
 unset GIT_ECLASS
 
 DESCRIPTION="User friendly Geographic Information System"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d01958f4031cdbab28596fbeddcfadbcaab59593
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 12:00:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 15:27:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d01958f4

sci-geosciences/qgis: 3.2.2 version bump

Reported-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://bugs.gentoo.org/663884
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sci-geosciences/qgis/Manifest          |   1 +
 sci-geosciences/qgis/qgis-3.2.2.ebuild | 220 +++++++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8289becae93..49bff775474 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis-3.2.1.tar.bz2 72064255 BLAKE2B 7811726c3c8e84e9d2e0f2cd500d3373895bd2f91b093943d451f65de5d722ae986df59754f6d1ca6bb1a0597a841c568b40113498cb9ef707c878184387fe44 SHA512 737aa95f71661c4b2738a9db8fea49ce21f04a94768130f33b063dbca17f04119a74508211257510196b239d3acc9019e17478820534a4353519f91fbb0bc27f
+DIST qgis-3.2.2.tar.bz2 71947443 BLAKE2B a6fc159ce6d90f4273483159831c9b89db40c3bd5fb34ec90d799978aae11a609509d5fd5189dc1edfb9fb72cd9ccd9298414d024db3c43561ea096774b7be17 SHA512 d19d44f71285e1d8a1d365a406550c68cd48215c7f9f67a979052f1f115d636c66c6a291e1a108b19a641f357b27e104ac642158f375fb631c141e844f468949
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.2.2.ebuild b/sci-geosciences/qgis/qgis-3.2.2.ebuild
new file mode 100644
index 00000000000..23afe352fad
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.2.2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Liffey]

commit:     4de8ae50ab4e6546207b89e0d3f632158f59a703
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  3 16:53:07 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 16:57:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de8ae50

sci-geosciences/qgis: version bump 3.2.1

Closes: https://bugs.gentoo.org/659656
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/Manifest          |   1 +
 sci-geosciences/qgis/qgis-3.2.1.ebuild | 219 +++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c4045bb1504..8289becae93 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
+DIST qgis-3.2.1.tar.bz2 72064255 BLAKE2B 7811726c3c8e84e9d2e0f2cd500d3373895bd2f91b093943d451f65de5d722ae986df59754f6d1ca6bb1a0597a841c568b40113498cb9ef707c878184387fe44 SHA512 737aa95f71661c4b2738a9db8fea49ce21f04a94768130f33b063dbca17f04119a74508211257510196b239d3acc9019e17478820534a4353519f91fbb0bc27f
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.2.1.ebuild b/sci-geosciences/qgis/qgis-3.2.1.ebuild
new file mode 100644
index 00000000000..d5c984cfc17
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.2.1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     2ba5d4fc1e97ec307c4137cd2d449d2c6a0bc1e4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 03:01:44 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:00:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba5d4fc

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/Manifest          |   1 -
 sci-geosciences/qgis/qgis-3.0.2.ebuild | 221 ---------------------------------
 2 files changed, 222 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d81dfa8c495..c4045bb1504 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
deleted file mode 100644
index cd2fb0afe94..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Aaron Bauman]

commit:     14351e9b32fbbbe7d58ac548cf42aa46b4fa3a16
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 01:29:47 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 02:04:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14351e9b

sci-geosciences/qgis: amd64 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
index 0b227040e11..df0980c51a1 100644
--- a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     c77e04588fce7069eaacd56cb9ef0d2a3135eefa
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 22:58:06 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 23:20:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77e0458

sci-geosciences/qgis: x86 stable (bug #658948)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
index ff58cbbac4d..0b227040e11 100644
--- a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="~amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     334fcaeb7fb8fed1cc0d0cd20d874223d7d99935
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 11:02:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334fcaeb

sci-geosciences/qgis: Disable ccache

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 2b4443c3425..efdffd87518 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -131,6 +131,7 @@ src_configure() {
 		-DQWT_INCLUDE_DIR=/usr/include/qwt6
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
 		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
 		-DWITH_APIDOC=OFF
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     da09f45c7dbdb3760cdbc304c70b73ebfaa63f64
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 11:07:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da09f45c

sci-geosciences/qgis: Add USE=qml

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/metadata.xml     | 1 +
 sci-geosciences/qgis/qgis-9999.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index f25562d2fc9..162cbbaa3de 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -19,5 +19,6 @@
 		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
 		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
+		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index efdffd87518..7ea4905841a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -80,6 +80,7 @@ COMMON_DEPEND="
 		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -144,6 +145,7 @@ src_configure() {
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
 		-DWITH_QTWEBKIT=$(usex webkit)
 	)
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     9e98d2e177081d06467178a1090a3790a74f1f21
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 11:01:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e98d2e1

sci-geosciences/qgis: Add python3_6 support

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.0.3-r1.ebuild} | 2 +-
 sci-geosciences/qgis/qgis-9999.ebuild                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
similarity index 99%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
index a64e21fa38a..2b4443c3425 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a64e21fa38a..2b4443c3425 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     9dab50c5c86f9196357d001ac1e53228620fc012
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 12:51:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dab50c5

sci-geosciences/qgis: Drop 3.0.3 (r0)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.3.ebuild | 221 ---------------------------------
 1 file changed, 221 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.3.ebuild b/sci-geosciences/qgis/qgis-3.0.3.ebuild
deleted file mode 100644
index 0b888637f80..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e12ccf4e38b42bd4e4dd118eb6010bd7edb79002
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 10:48:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12ccf4e

sci-geosciences/qgis: Always depend on python

Reported-by: Sławomir Nizio <slawomir.nizio <AT> sabayon.org>
Thanks-to: Kalin KOZHUHAROV <kalin <AT> ThinRope.net>
Closes: https://bugs.gentoo.org/658250
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-9999.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 0b888637f80..a64e21fa38a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -25,10 +25,7 @@ LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
@@ -48,7 +45,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtsql-${QT_MIN_VER}:5
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
 	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	sci-libs/proj
@@ -64,7 +61,8 @@ COMMON_DEPEND="
 	)
 	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
 	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
+	python? (
+		${PYTHON_DEPS}
 		dev-python/future[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
@@ -79,6 +77,7 @@ COMMON_DEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
@@ -89,6 +88,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
 	sys-devel/bison
 	sys-devel/flex
+	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
@@ -105,7 +105,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -187,10 +187,10 @@ src_install() {
 
 	if use python; then
 		python_optimize "${ED%/}"/usr/share/qgis/python
+	fi
 
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		fi
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     97fec39d83c1fe581c0f0ffec195e1ea90f79e71
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 22:48:36 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May 25 23:58:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fec39d

sci-geosciences/qgis: x86 stable (bug #656090)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index ee1a3c82ea4..cd2fb0afe94 100644
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     6665aa02a0dd5feb009231b65143ae3fbd523099
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 14:31:07 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 24 14:31:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6665aa02

sci-geosciences/qgis: amd64 stable wrt bug #656090

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 sci-geosciences/qgis/qgis-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index 0b888637f80..ee1a3c82ea4 100644
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     7ad7ae78baeccf9910e62884a508209bfc2b1ef5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 19 06:19:03 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 23 12:28:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad7ae78

sci-geosciences/qgis: 3.0.3 version bump

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 sci-geosciences/qgis/Manifest          |   1 +
 sci-geosciences/qgis/qgis-3.0.3.ebuild | 221 +++++++++++++++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index df5faa8b23d..83c6586a07c 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
 DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
+DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-3.0.3.ebuild b/sci-geosciences/qgis/qgis-3.0.3.ebuild
new file mode 100644
index 00000000000..0b888637f80
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.0.3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
+
+REQUIRED_USE="
+	grass? ( python )
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${ED%/}"/usr/share/qgis/python
+
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     3fc25a22193c3dc265c9dde733bd50d65dab29a9
Author:     Kalin KOZHUHAROV <me.kalin <AT> gmail <DOT> com>
AuthorDate: Sun Apr 22 19:23:37 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 23:11:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc25a22

sci-geosciences/qgis: Fix USE=-python building

Closes: https://bugs.gentoo.org/653712
Closes: https://github.com/gentoo/gentoo/pull/8102

 sci-geosciences/qgis/qgis-3.0.2.ebuild | 11 +++++++----
 sci-geosciences/qgis/qgis-9999.ebuild  | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index cc3eaaa7055..9c686b0dc1a 100644
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -26,6 +26,7 @@ SLOT="0"
 IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
+	grass? ( python )
 	mapserver? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -104,7 +105,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -185,10 +186,12 @@ src_install() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	python_optimize "${ED%/}"/usr/share/qgis/python
+	if use python; then
+		python_optimize "${ED%/}"/usr/share/qgis/python
 
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
 	fi
 }
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index cc3eaaa7055..9c686b0dc1a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -26,6 +26,7 @@ SLOT="0"
 IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
+	grass? ( python )
 	mapserver? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -104,7 +105,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -185,10 +186,12 @@ src_install() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	python_optimize "${ED%/}"/usr/share/qgis/python
+	if use python; then
+		python_optimize "${ED%/}"/usr/share/qgis/python
 
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     8fd3069bffafbc3c77440170c41609d225404766
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 20:20:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 23:11:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd3069b

sci-geosciences/qgis: Fix USE=grass

Upstream commit eb6301e023e8cfa9d83fbbfc6ca5797b62d8d535
Thanks-to: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://bugs.gentoo.org/653718
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.2.ebuild | 5 ++---
 sci-geosciences/qgis/qgis-9999.ebuild  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index 9c686b0dc1a..0b888637f80 100644
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	grass? ( =sci-geosciences/grass-7*:= )
 	mapserver? ( dev-libs/fcgi )
 	oracle? (
 		dev-db/oracle-instantclient:=
@@ -136,7 +136,7 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
+		-DWITH_GRASS7=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
@@ -148,7 +148,6 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DWITH_GRASS7=ON
 			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
 		)
 	fi

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9c686b0dc1a..0b888637f80 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	grass? ( =sci-geosciences/grass-7*:= )
 	mapserver? ( dev-libs/fcgi )
 	oracle? (
 		dev-db/oracle-instantclient:=
@@ -136,7 +136,7 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
+		-DWITH_GRASS7=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
@@ -148,7 +148,6 @@ src_configure() {
 
 	if use grass; then
 		mycmakeargs+=(
-			-DWITH_GRASS7=ON
 			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
 		)
 	fi

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     8c363e2c89b69cd47dc3102c00e002d48fcc8dbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 20:06:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 23:11:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c363e2c

sci-geosciences/qgis: 3.0.2 version bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sci-geosciences/qgis/Manifest                                | 1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.0.2.ebuild} | 4 ++--
 sci-geosciences/qgis/qgis-9999.ebuild                        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1834d00be28..df5faa8b23d 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
+DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
similarity index 98%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.0.2.ebuild
index a76181e1f87..cc3eaaa7055 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.4"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a76181e1f87..cc3eaaa7055 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.4"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     5c20c93a7d56bb67a901475f2a871d166ed9a5b0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 19:02:36 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 19:06:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c20c93a

sci-geosciences/qgis: x86 stable (bug #635798)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
index 882d915e20e..79614147766 100644
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.1.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.1"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Aaron Bauman]

commit:     d69750c26dba37dab2743ed1a30116df6866376d
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 00:49:30 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 00:49:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69750c2

sci-geosciences/qgis: amd64 stable

Bug: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-geosciences/qgis/qgis-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
index fcf4f8846c7..882d915e20e 100644
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.1.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.1"
 if [[ ${PV} != *9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     fb926d945dd36a4f836ea49cb90903bf379a6c41
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 16:49:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 16:51:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb926d94

sci-geosciences/qgis: Drop 3.0.0-r2

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 sci-geosciences/qgis/Manifest             |   1 -
 sci-geosciences/qgis/qgis-3.0.0-r2.ebuild | 219 ------------------------------
 2 files changed, 220 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9893d00a449..12f160796e2 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,5 @@
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
 DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
-DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78

diff --git a/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
deleted file mode 100644
index e0aa6bdd7b9..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     0a2e8183a0b23aefe1818b9384e95fb4881f0a33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 16:48:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 16:51:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2e8183

sci-geosciences/qgis: Drop 2.8.14, aborting stabilisation

Closes: https://bugs.gentoo.org/647864
Closes: https://bugs.gentoo.org/648132
Closes: https://bugs.gentoo.org/641406
Package-Manager: Portage-2.3.27, Repoman-2.3.9

 sci-geosciences/qgis/Manifest            |   1 -
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 207 -------------------------------
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9b2a249d1e5..9893d00a449 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
-DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
 DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
deleted file mode 100644
index 2f935622f68..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-SRC_URI="
-	https://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/qjson
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt4(-)]
-	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
-	>=x11-libs/qwtpolar-1[qt4(-)]
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# TODO upstream
-	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \
-		CMakeLists.txt || die "Failed to fix lrelease path"
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if has_version '<x11-libs/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
-		)
-	fi
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
-
-	# bug 612956
-	addpredict /dev/dri/renderD128
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	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
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     f02628bd399f2def9900270ea38339e1ad96ab1e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 19:42:57 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 22:36:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02628bd

sci-geosciences/qgis: DEPENDs on dev-qt/qtnetwork[ssl]

Reported-by: Luis Ressel <aranea <AT> aixah.de>
Closes: https://bugs.gentoo.org/650262
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.0.0-r2.ebuild} | 6 +++---
 sci-geosciences/qgis/qgis-9999.ebuild                           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
similarity index 97%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
index e1f95949f66..e0aa6bdd7b9 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
 	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
 	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
 	>=dev-qt/qtsvg-${QT_MIN_VER}:5
@@ -70,7 +70,7 @@ COMMON_DEPEND="
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -100,7 +100,7 @@ PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+	"${FILESDIR}/${P}-featuresummary.patch"
 )
 
 pkg_setup() {

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e1f95949f66..a76181e1f87 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
 	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
 	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
 	>=dev-qt/qtsvg-${QT_MIN_VER}:5
@@ -70,7 +70,7 @@ COMMON_DEPEND="
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     92e2001f250974aba40805150e998ad1ebbf6e53
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 19:43:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 22:36:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e2001f

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/qgis-3.0.0-r1.ebuild | 219 ------------------------------
 1 file changed, 219 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
deleted file mode 100644
index 84a8a75f10b..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     5aec0ff4c1cee9c9368201245f14ff4a9708b3d9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 01:01:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 06:06:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aec0ff4

sci-geosciences/qgis: Fix sandbox violation

Closes: https://bugs.gentoo.org/648726
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/qgis-3.0.0-r1.ebuild | 3 ++-
 sci-geosciences/qgis/qgis-9999.ebuild     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
index 4f627756c81..84a8a75f10b 100644
--- a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
@@ -154,8 +154,9 @@ src_configure() {
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
-	# bug 612956
+	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
 
 	cmake-utils_src_configure
 }

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3c190c67ffb..e1f95949f66 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -154,8 +154,9 @@ src_configure() {
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
-	# bug 612956
+	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
 
 	cmake-utils_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     ad1d80646408f0bfbc46df4b7b63ea4cf62e6971
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 00:59:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 06:06:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1d8064

sci-geosciences/qgis: Add USE=3d, drop USE=designer

Closes: https://bugs.gentoo.org/649526
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/metadata.xml      |   1 -
 sci-geosciences/qgis/qgis-3.0.0.ebuild | 214 ---------------------------------
 2 files changed, 215 deletions(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index da9f159f45d..f25562d2fc9 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -15,7 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
-		<flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
 		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>

diff --git a/sci-geosciences/qgis/qgis-3.0.0.ebuild b/sci-geosciences/qgis/qgis-3.0.0.ebuild
deleted file mode 100644
index d773dd57187..00000000000
--- a/sci-geosciences/qgis/qgis-3.0.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bug 612956
-	addpredict /dev/dri/renderD128
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Davide Pesavento]

commit:     df3878970f58a1789dca25b70055c432f6a626d0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 21:36:11 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 22:15:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df387897

sci-geosciences/qgis: fix qt4 USE dep default on qscintilla-python

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.16.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index 3dcd7a697d1..94f4a69b124 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index 6a6e8c383ad..2f935622f68 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]

diff --git a/sci-geosciences/qgis/qgis-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild
index 1471c7e45cf..2f935622f68 100644
--- a/sci-geosciences/qgis/qgis-2.18.16.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.16.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     75c011e1af02a364d4f3ae9e93f8695658eb3cdc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 14:49:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 16:13:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c011e1

sci-geosciences/qgis: Add overly considerate pkg_postinst info

Closes: https://bugs.gentoo.org/648948
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/qgis-3.0.0.ebuild | 3 +++
 sci-geosciences/qgis/qgis-9999.ebuild  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-3.0.0.ebuild b/sci-geosciences/qgis/qgis-3.0.0.ebuild
index b4e04b7ffbc..d773dd57187 100644
--- a/sci-geosciences/qgis/qgis-3.0.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0.ebuild
@@ -198,6 +198,9 @@ pkg_postinst() {
 		elog "If you do not need these plugins just disable them"
 		elog "in the Plugins menu, else you need to set USE=\"postgres\""
 	fi
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
 
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index b4e04b7ffbc..d773dd57187 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -198,6 +198,9 @@ pkg_postinst() {
 		elog "If you do not need these plugins just disable them"
 		elog "in the Plugins menu, else you need to set USE=\"postgres\""
 	fi
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
 
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     41fbca8199f8e5e7ea9ef48723dfed9eafb6ccb7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 22:31:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:48:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fbca81

sci-geosciences/qgis: 3.0.0 version bump

Bug: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/Manifest                                | 1 +
 sci-geosciences/qgis/{qgis-9999.ebuild => qgis-3.0.0.ebuild} | 2 --
 sci-geosciences/qgis/qgis-9999.ebuild                        | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 59bf2f70799..3c03fb62317 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,6 @@
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
 DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
+DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.0.ebuild
similarity index 98%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.0.0.ebuild
index 13ed091c52e..b4e04b7ffbc 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0.ebuild
@@ -96,8 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	# Taken from redhat
-	"${FILESDIR}/${PN}-2.18.12-sip.patch"
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 13ed091c52e..b4e04b7ffbc 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -96,8 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	# Taken from redhat
-	"${FILESDIR}/${PN}-2.18.12-sip.patch"
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     f48a93835bb952f93ddc49726007e242d9eac91e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 17:15:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 17:46:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48a9383

sci-geosciences/qgis: 2.18.16 version bump

Closes: https://bugs.gentoo.org/641456
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/Manifest            |   1 +
 sci-geosciences/qgis/qgis-2.18.16.ebuild | 207 +++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 78c94523c88..59bf2f70799 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
 DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
+DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78

diff --git a/sci-geosciences/qgis/qgis-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild
new file mode 100644
index 00000000000..1471c7e45cf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.16.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+SRC_URI="
+	https://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt4(-)]
+	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
+	>=x11-libs/qwtpolar-1[qt4(-)]
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# TODO upstream
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \
+		CMakeLists.txt || die "Failed to fix lrelease path"
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	# bug 612956
+	addpredict /dev/dri/renderD128
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	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
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e0d16e3b9b47bbe6adb304afa859bb2f22c1671e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 17:17:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 17:46:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d16e3b

sci-geosciences/qgis: Drop 2.18.12-sip.patch

It appears to serve no purpose now.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/qgis/qgis-2.18.14.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index eb148f3d4fe..6a6e8c383ad 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -81,8 +81,6 @@ RESTRICT="test"
 PATCHES=(
 	# TODO upstream
 	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	# Taken from redhat
-	"${FILESDIR}/${PN}-2.18.12-sip.patch"
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     7d9e5d07f23a859401c17600a7cae046ea040f7d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 22:44:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 22:48:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9e5d07

sci-geosciences/qgis: Drop gnome2_icon_savelist

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 6 +-----
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 6 +-----
 sci-geosciences/qgis/qgis-9999.ebuild    | 4 ----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index bd5c16407bf..3dcd7a697d1 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -185,10 +185,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index badd711d115..eb148f3d4fe 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -185,10 +185,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a167a5305cf..13ed091c52e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -189,10 +189,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     4a3139b374f944c0b945b1eb2e6410aedccc4555
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 22:40:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 23:04:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3139b3

sci-geosciences/qgis: Depends on dev-python/owslib

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/qgis/qgis-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3bb8a29f239..a167a5305cf 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.1"
 
@@ -67,6 +67,7 @@ COMMON_DEPEND="
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     6432ed5ee50c855f498cdce56741ecc792206fb6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 09:01:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 09:02:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6432ed5e

sci-geosciences/qgis: Drop obsolete cmake options

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/qgis/qgis-9999.ebuild | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index fab55e1093c..704f228f1f8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -148,18 +148,7 @@ src_configure() {
 		)
 	fi
 
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
 	# bug 612956
 	addpredict /dev/dri/renderD128

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     bb71de2361f1cbdb6020b8369e952c3645d949eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 02:22:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 02:34:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb71de23

sci-geosciences/qgis: Add Qt5-based live ebuild

Bug: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/qgis/metadata.xml     |  39 +++---
 sci-geosciences/qgis/qgis-9999.ebuild | 226 ++++++++++++++++++++++++++++++++++
 2 files changed, 246 insertions(+), 19 deletions(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index b08b019390e..c64b2c6468e 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Quantum GIS (QGIS) is a user friendly Open Source Geographic
-  Information System (GIS). QGIS supports vector, raster, and database
-  formats. QGIS lets you browse and create map data on your
-  computer. It supports many common spatial data formats (e.g. ESRI
-  ShapeFile, geotiff). QGIS supports plugins to do things like display
-  tracks from your GPS. 
-</longdescription>
-  <use>
-    <flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
-    <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
-    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
-    <flag name="mapserver">Determines whether mapserver should be built</flag>
-    <flag name="touch">Enable support for touch input devices</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	Quantum GIS (QGIS) is a user friendly Open Source Geographic
+	Information System (GIS). QGIS supports vector, raster, and database
+	formats. QGIS lets you browse and create map data on your
+	computer. It supports many common spatial data formats (e.g. ESRI
+	ShapeFile, geotiff). QGIS supports plugins to do things like display
+	tracks from your GPS.
+	</longdescription>
+	<use>
+		<flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
+		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+		<flag name="mapserver">Determines whether mapserver should be built</flag>
+		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
+		<flag name="touch">Enable support for touch input devices</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
new file mode 100644
index 00000000000..fab55e1093c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.1"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+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-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# Taken from redhat
+	"${FILESDIR}/${PN}-2.18.12-sip.patch"
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	# bug 612956
+	addpredict /dev/dri/renderD128
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e091a6773c3205090a6ad6d766a46501250e56ad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 08:32:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 08:33:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e091a677

sci-geosciences/qgis: Fix USE=examples SRC_URI

Reported-by: zyliwax <zyliwax <AT> protonmail.com>
Gentoo-bug: 633908
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sci-geosciences/qgis/Manifest            | 1 +
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index bc3b5bb4239..dd2900938d5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
 DIST qgis-2.18.14.tar.bz2 84935301 SHA256 d82176ab71ce3e70aae1bbb65478a730ef85b6263a186fddea0eb599466136a5 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 WHIRLPOOL 2d43a673e77c460eca9a2a87e914b7ebe1c20315e9ce3133f8285c0c5e5db89e25144a672453fc0ca1441bd1f52cd3bcc507904e3f215def619ef7155487aa35
+DIST qgis_sample_data-2.8.14.tar.gz 22119181 SHA256 cb1d92ce42df1e7c1cc2e25d02cb86e51a007a07f7f9d046123e80b0d4815d66 SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d WHIRLPOOL d17970636b1aad6f25ee5334b9bd9809c4c2f91c69ccf1cf4cc4b158c4484504cf718f18207c24c1865fec3d43f4ea74fa16ff8c8f9a55a65a29aa49aaadef0c
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index 43b0b81e778..badd711d115 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
 SRC_URI="
 	https://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( https://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e37d84b520ce9c806cb4a38cccddd866fe4b1435
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 21:39:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 07:40:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37d84b5

sci-geosciences/qgis: 2.18.14 version bump, switch to https

Gentoo-bug: 633652, 633708
Package-Manager: Portage-2.3.12, Repoman-2.3.4

 sci-geosciences/qgis/Manifest            |   1 +
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 213 +++++++++++++++++++++++++++++++
 2 files changed, 214 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f99aee0df07..bc3b5bb4239 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
+DIST qgis-2.18.14.tar.bz2 84935301 SHA256 d82176ab71ce3e70aae1bbb65478a730ef85b6263a186fddea0eb599466136a5 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 WHIRLPOOL 2d43a673e77c460eca9a2a87e914b7ebe1c20315e9ce3133f8285c0c5e5db89e25144a672453fc0ca1441bd1f52cd3bcc507904e3f215def619ef7155487aa35
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
new file mode 100644
index 00000000000..43b0b81e778
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+SRC_URI="
+	https://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( https://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt4(-)]
+	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
+	>=x11-libs/qwtpolar-1[qt4(-)]
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# TODO upstream
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	# Taken from redhat
+	"${FILESDIR}/${PN}-2.18.12-sip.patch"
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \
+		CMakeLists.txt || die "Failed to fix lrelease path"
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	# bug 612956
+	addpredict /dev/dri/renderD128
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michael Palimaka]

commit:     7f20e5465146e4a0d5d98605cd0d0ef1a9cab701
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 01:31:41 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 01:32:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f20e546

sci-geosciences/qgis: remove 2.18.3-r1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/Manifest              |   1 -
 sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 195 -----------------------------
 2 files changed, 196 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9cc949f848b..f99aee0df07 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
 DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
-DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
deleted file mode 100644
index 81e16bdc05f..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/qjson
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt4(-)]
-	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
-	>=x11-libs/qwtpolar-1[qt4(-)]
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-app-icon.patch
-	"${FILESDIR}"/${P}-webkit.patch
-	"${FILESDIR}"/${P}-sip-4.19.patch
-	"${FILESDIR}"/${P}-qscintilla-2.10.patch
-	"${FILESDIR}"/${P}-sip-4.19.1.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
-		-DWITH_INTERNAL_DATEUTIL=OFF
-		-DWITH_INTERNAL_FUTURE=OFF
-		-DWITH_INTERNAL_HTTPLIB2=OFF
-		-DWITH_INTERNAL_JINJA2=OFF
-		-DWITH_INTERNAL_MARKUPSAFE=OFF
-		-DWITH_INTERNAL_PYGMENTS=OFF
-		-DWITH_INTERNAL_PYTZ=OFF
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DWITH_INTERNAL_SIX=OFF
-		-DWITH_INTERNAL_YAML=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_BINDINGS="$(usex python)"
-		-DWITH_GRASS7="$(usex grass)"
-		-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		-DWITH_ORACLE="$(usex oracle)"
-		-DWITH_POSTGRESQL="$(usex postgres)"
-		-DWITH_PYSPATIALITE="$(usex python)"
-		-DWITH_SERVER="$(usex mapserver)"
-		-DWITH_QTWEBKIT="$(usex webkit)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		fi
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Michael Palimaka]

commit:     aa75e44b86caf336bbbf2d878e54d0419cd8d7ad
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 01:30:52 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 01:32:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa75e44b

sci-geosciences/qgis: stabilise 2.18.12 for amd64/x86

Bug: https://bugs.gentoo.org/620748
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index 4a9dcacb532..bd5c16407bf 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples georeferencer grass mapserver oracle postgres python"
 
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     6c51c1d4e1e44305498560564423ffedc05afa05
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 13:04:14 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 13:04:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c51c1d4

sci-geosciences/qgis: Try to fix sandbox violation, bug #612956

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index d60dbf692ec..4a9dcacb532 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -148,6 +148,9 @@ src_configure() {
 		)
 	fi
 
+	# bug 612956
+	addpredict /dev/dri/renderD128
+
 	cmake-utils_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e8b0b37c7952cbe143cab3620829ffec39334456
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 23:15:39 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 23:17:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b0b37c

sci-geosciences/qgis: Try to fix bug #612956

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index 7a2dbf01e06..d60dbf692ec 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -81,7 +81,6 @@ RESTRICT="test"
 PATCHES=(
 	# TODO upstream
 	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	"${FILESDIR}/${PN}-2.18.6-python.patch"
 	# Taken from redhat
 	"${FILESDIR}/${P}-sip.patch"
 	# git master

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     36920beabdb32e72dde1214430df67d7c8eb7cf2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 12:39:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 12:39:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36920bea

sci-geosciences/qgis: Drop USE=webkit

Gentoo-bug: 620748
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index d0a0f668239..7a2dbf01e06 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
 
 REQUIRED_USE="
 	mapserver? ( python )
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -66,7 +66,6 @@ COMMON_DEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
-	webkit? ( dev-qt/qtwebkit:4 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/bison
@@ -121,7 +120,7 @@ src_configure() {
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if has_version '<x11-libs/qscintilla-2.10'; then

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     92eccb1f95fd5128335793e909f69190063ddadd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 19:24:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 19:24:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92eccb1f

sci-geosciences/qgis: Add missing qtnetwork[ssl] usedep

Reported-by: stephane.goujet <AT> wanadoo.fr
Gentoo-bug: 625942
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
index fcac2124558..2e8591032de 100644
--- a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     3bc0c699f570b220cdab4bd152b7d36c2ca2cf00
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 19:09:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 19:18:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc0c699

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/Manifest            |   1 -
 sci-geosciences/qgis/qgis-2.18.10.ebuild | 221 -------------------------------
 2 files changed, 222 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ec2e8bd6ae2..9cc949f848b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
 DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.10.ebuild b/sci-geosciences/qgis/qgis-2.18.10.ebuild
deleted file mode 100644
index f0faa9bfedf..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.10.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	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/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt5]
-	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
-	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
-	designer? ( dev-qt/designer:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# TODO upstream
-	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	"${FILESDIR}/${PN}-2.18.6-python.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DENABLE_QT5=ON
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_TOUCH="$(usex touch)"
-	)
-#	# FIXME: Re-add when segfaults were figured out upstream, bug #612070
-#	-DWITH_QTWEBKIT=$(usex webkit)
-
-	if has_version '<x11-libs/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
-		)
-	fi
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     5dae93c529beba6e5b34c5a3adedcb71c160799b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 18:43:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 19:18:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dae93c5

sci-geosciences/qgis: 2.18.12-r100 version bump (qt5-based)

Fix lrelease/lupdate paths
Switch to xdg-utils

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/qgis/qgis-2.18.12-r100.ebuild | 234 ++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
new file mode 100644
index 00000000000..fcac2124558
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt5]
+	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
+	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
+	designer? ( dev-qt/designer:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# TODO upstream
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	"${FILESDIR}/${PN}-2.18.6-python.patch"
+	# Taken from redhat
+	"${FILESDIR}/${P}-sip.patch"
+	# git master
+	"${FILESDIR}/${P}-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DENABLE_QT5=ON
+		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_TOUCH="$(usex touch)"
+	)
+#	# FIXME: Re-add when segfaults were figured out upstream, bug #612070
+#	-DWITH_QTWEBKIT=$(usex webkit)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     1b57d5d74d8290e8b539016972eaa3e1f0368c8c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 22:12:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  1 15:56:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b57d5d7

sci-geosciences/qgis: 2.18.10 version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 sci-geosciences/qgis/Manifest            |   1 +
 sci-geosciences/qgis/qgis-2.18.10.ebuild | 221 +++++++++++++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 11391f1e144..b5df166015b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
+DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
 DIST qgis-2.18.9.tar.bz2 84453524 SHA256 a922af0e4b3bcf8e790d7fc50752bc96771abfc2d093365cb3260b45c27225a1 SHA512 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 WHIRLPOOL cfc6006eed3e948407eea79c57eb543be700d99ff0eb38e07263ec8659dee4ceafac8879dc95ac7b275efe44708d4a949d71dfd9800e8a9cb013527aabcea8e3

diff --git a/sci-geosciences/qgis/qgis-2.18.10.ebuild b/sci-geosciences/qgis/qgis-2.18.10.ebuild
new file mode 100644
index 00000000000..f0faa9bfedf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.10.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt5]
+	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
+	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
+	designer? ( dev-qt/designer:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# TODO upstream
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	"${FILESDIR}/${PN}-2.18.6-python.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DENABLE_QT5=ON
+		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_TOUCH="$(usex touch)"
+	)
+#	# FIXME: Re-add when segfaults were figured out upstream, bug #612070
+#	-DWITH_QTWEBKIT=$(usex webkit)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     ea92d3a6c979b64422894c64cd57b74d7bb719a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 19:07:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 19:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea92d3a6

sci-geosciences/qgis: Add missing dependency

Reported-by: Luis Ressel <aranea <AT> aixah.de>
Gentoo-bug: 616444

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/qgis-2.18.7.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild
index c49a2eb3b07..5db53eae7f3 100644
--- a/sci-geosciences/qgis/qgis-2.18.7.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.7.ebuild
@@ -80,6 +80,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
 	sys-devel/bison
 	sys-devel/flex
 "

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     d8ddbd32ac5980a6c2ee4c9fd1075c01ea439982
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 19:19:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 19:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ddbd32

sci-geosciences/qgis: Qt5Webkit unconditional, segfaults without

Reported-by: Andreas Plesch <andreasplesch <AT> netscape.net>
Gentoo-bug: 612070

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/qgis-2.18.7.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild
index 5db53eae7f3..72e00e7022a 100644
--- a/sci-geosciences/qgis/qgis-2.18.7.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.7.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
 
 REQUIRED_USE="
 	mapserver? ( python )
@@ -42,6 +42,7 @@ COMMON_DEPEND="
 	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
@@ -66,7 +67,7 @@ COMMON_DEPEND="
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -76,7 +77,6 @@ COMMON_DEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
@@ -129,8 +129,9 @@ src_configure() {
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_TOUCH="$(usex touch)"
-		-DWITH_QTWEBKIT=$(usex webkit)
 	)
+#	# FIXME: Re-add when segfaults were figured out upstream, bug #612070
+#	-DWITH_QTWEBKIT=$(usex webkit)
 
 	if has_version '<x11-libs/qscintilla-2.10'; then
 		mycmakeargs+=(

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     6860c534e91f6b4b2551c9434d194b6d20561898
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 19:26:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 19:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6860c534

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/Manifest              |   2 -
 sci-geosciences/qgis/qgis-2.18.4.ebuild    | 203 --------------------------
 sci-geosciences/qgis/qgis-2.18.6-r1.ebuild | 223 -----------------------------
 3 files changed, 428 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1126b17af51..30daa171447 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
-DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
-DIST qgis-2.18.6.tar.bz2 84951747 SHA256 8cce11c255f82b29ddf64a84895f7411159de0fe69e85bb6b0767a0c675b8648 SHA512 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 WHIRLPOOL f20c948e44f57f5060319d6b2e46f6b568d5ddccfa6ec18e82c21720893fb2914dd3fb45601f75c791118fa3ffe9cd138e44155e80d0169d2dd09cc47afa9b40
 DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.4.ebuild b/sci-geosciences/qgis/qgis-2.18.4.ebuild
deleted file mode 100644
index 4a1f1c1c736..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.4.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/qjson
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt4(-)]
-	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
-	>=x11-libs/qwtpolar-1[qt4(-)]
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.18.3-qscintilla-2.10.patch
-	"${FILESDIR}"/${PN}-2.18.3-sip-4.19.1.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_HTTPLIB2=OFF
-			-DWITH_INTERNAL_JINJA2=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYGMENTS=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		fi
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
deleted file mode 100644
index 22288131d33..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	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/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt5]
-	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
-	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
-	designer? ( dev-qt/designer:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-python.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DENABLE_QT5=ON
-		-DENABLE_PYTHON3=$(python_is_python3)
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_TOUCH="$(usex touch)"
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if has_version '>=x11-misc/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2-qt5.so
-		)
-	else
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
-		)
-	fi
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     93ad913dfbd073940d2e8e3d3c2b44701b0c345f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 18:47:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 19:27:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ad913d

sci-geosciences/qgis: 2.18.7 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-2.18.7.ebuild | 219 ++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ae7609f86d8..1126b17af51 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
 DIST qgis-2.18.6.tar.bz2 84951747 SHA256 8cce11c255f82b29ddf64a84895f7411159de0fe69e85bb6b0767a0c675b8648 SHA512 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 WHIRLPOOL f20c948e44f57f5060319d6b2e46f6b568d5ddccfa6ec18e82c21720893fb2914dd3fb45601f75c791118fa3ffe9cd138e44155e80d0169d2dd09cc47afa9b40
+DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild
new file mode 100644
index 00000000000..c49a2eb3b07
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.7.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt5]
+	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
+	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
+	designer? ( dev-qt/designer:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	"${FILESDIR}/${PN}-2.18.6-python.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DENABLE_QT5=ON
+		-DENABLE_PYTHON3=$(python_is_python3)
+		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_TOUCH="$(usex touch)"
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     75e0bced1fb122741b48df1a71cbfb7b1f561650
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 22:23:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 22:36:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e0bced

sci-geosciences/qgis: Drop 2.18.6 (r0)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/qgis-2.18.6.ebuild | 226 --------------------------------
 1 file changed, 226 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.6.ebuild b/sci-geosciences/qgis/qgis-2.18.6.ebuild
deleted file mode 100644
index 53dee9ff00e..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.6.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="examples georeferencer grass mapserver oracle postgres python touch webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-qt/designer:5
-	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/qtsvg:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt5]
-	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
-	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-python.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DENABLE_QT5=ON
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_TOUCH="$(usex touch)"
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if has_version '>=x11-misc/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2-qt5.so
-		)
-	else
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
-		)
-	fi
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DENABLE_PYTHON3=OFF
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_HTTPLIB2=OFF
-			-DWITH_INTERNAL_JINJA2=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYGMENTS=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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 "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		fi
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     f8defd947c658f7063d5bc074bb12c9e31686ef0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 21:23:10 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 22:36:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8defd94

sci-geosciences/qgis: Add USE=designer, python setup not optional

Fix cmake warnings, fix deps, install python bindings in global dir

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/metadata.xml          |   1 +
 sci-geosciences/qgis/qgis-2.18.6-r1.ebuild | 223 +++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index e3b55abad7c..b08b019390e 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,6 +14,7 @@
   tracks from your GPS. 
 </longdescription>
   <use>
+    <flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
     <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
     <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
     <flag name="mapserver">Determines whether mapserver should be built</flag>

diff --git a/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
new file mode 100644
index 00000000000..22288131d33
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt5]
+	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
+	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
+	designer? ( dev-qt/designer:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-featuresummary.patch"
+	"${FILESDIR}/${P}-python.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DENABLE_QT5=ON
+		-DENABLE_PYTHON3=$(python_is_python3)
+		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_TOUCH="$(usex touch)"
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if has_version '>=x11-misc/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2-qt5.so
+		)
+	else
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     1abfe54e24614ad9863620688da9f39bc20ab2e0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 10:45:34 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 10:45:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abfe54e

sci-geosciences/qgis: x86 stable wrt bug #610042

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
index 0832ed31782..463a3b19ca1 100644
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
 
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Agostino Sarubbo]

commit:     57f70c1865793c4c263bbf3c865994261ed5961d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 10:29:28 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 10:29:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f70c18

sci-geosciences/qgis: amd64 stable wrt bug #610042

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
index f5fc89568ff..0832ed31782 100644
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
 
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e87c33872010d3b57fa8a8cce77c0ffb4e78ac7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 21:07:43 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 21:08:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87c3387

sci-geosciences/qgis: 2.18.4 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-2.18.4.ebuild | 187 ++++++++++++++++++++++++++++++++
 2 files changed, 188 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 87ad6ae8cc7..5ea73676a83 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea0254
 DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
 DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
+DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.4.ebuild b/sci-geosciences/qgis/qgis-2.18.4.ebuild
new file mode 100644
index 00000000000..5cc7c2eb878
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
+
+REQUIRED_USE="
+	grass? ( python )
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt4(-)]
+	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
+	>=x11-libs/qwtpolar-1[qt4(-)]
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( dev-qt/qtwebkit:4 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
+		-DWITH_INTERNAL_DATEUTIL=OFF
+		-DWITH_INTERNAL_FUTURE=OFF
+		-DWITH_INTERNAL_HTTPLIB2=OFF
+		-DWITH_INTERNAL_JINJA2=OFF
+		-DWITH_INTERNAL_MARKUPSAFE=OFF
+		-DWITH_INTERNAL_PYGMENTS=OFF
+		-DWITH_INTERNAL_PYTZ=OFF
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DWITH_INTERNAL_SIX=OFF
+		-DWITH_INTERNAL_YAML=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_GRASS7="$(usex grass)"
+		-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+		-DWITH_QTWEBKIT="$(usex webkit)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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 "${ED%/}"/usr/share/qgis/python
+
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     a5305c425c3000f1807d9a5f46dba060d77710d0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 18:11:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 18:12:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5305c42

sci-geosciences/qgis: Move opt. gdal[oracle] dep below oracle conditional

Makes repoman happy for stabilisation w/ masked oracle flag.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
index d355be2a099..f5fc89568ff 100644
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtscript:4
 	dev-qt/qtsvg:4
 	dev-qt/qtsql:4
-	sci-libs/gdal:=[geos,oracle?,python?,${PYTHON_USEDEP}]
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	sci-libs/proj
@@ -46,7 +46,10 @@ COMMON_DEPEND="
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( >=sci-geosciences/grass-7.0.0:= )
 	mapserver? ( dev-libs/fcgi )
-	oracle? ( dev-db/oracle-instantclient:= )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS}
 		dev-python/future[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     e4247577fa23d7e956e2df610fad7519c4ac77d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 02:32:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 02:38:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4247577

sci-geosciences/qgis: Depend on x11-libs/qwtpolar[qt4]

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.14.5-r1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.2-r1.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.2-r3.ebuild | 2 +-
 sci-geosciences/qgis/qgis-2.18.3.ebuild    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
index f4fa477..8c73a7c 100644
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
index 9e687a8..1add6e5 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
index 7dc1b69..f85044f 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
index 96193db..7fb7a91 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )

diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild
index 6afa49f..051afe8 100644
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	sci-libs/proj
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     0333e35edc0fe153dcf8227974ee05cec0844ce8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 23:19:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 16:11:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0333e35e

sci-geosciences/qgis: Add USE=webkit, make python really optional

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.18.3.ebuild | 43 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild
index 67371af..b631f4b 100644
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild
@@ -18,13 +18,14 @@ SRC_URI="
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
+IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
 
 REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	mapserver? ( python )"
+	grass? ( python )
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
+COMMON_DEPEND="
 	app-crypt/qca:2[qt4,ssl]
 	>=dev-db/spatialite-4.1.0
 	dev-db/sqlite:3
@@ -36,8 +37,6 @@ RDEPEND="
 	dev-qt/qtscript:4
 	dev-qt/qtsvg:4
 	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	sci-geosciences/gpsbabel
 	>=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
@@ -52,28 +51,31 @@ RDEPEND="
 	mapserver? ( dev-libs/fcgi )
 	oracle? ( dev-db/oracle-instantclient:= )
 	postgres? ( dev-db/postgresql:= )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	python? ( ${PYTHON_DEPS}
 		dev-python/future[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
 	)
+	webkit? ( dev-qt/qtwebkit:4 )
 "
-
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/bison
-	sys-devel/flex"
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="test"
@@ -81,7 +83,7 @@ RESTRICT="test"
 PATCHES=( "${FILESDIR}"/${P}-app-icon.patch )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -118,6 +120,7 @@ src_configure() {
 		-DWITH_POSTGRESQL="$(usex postgres)"
 		-DWITH_PYSPATIALITE="$(usex python)"
 		-DWITH_SERVER="$(usex mapserver)"
+		-DWITH_QTWEBKIT="$(usex webkit)"
 	)
 
 	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
@@ -157,10 +160,12 @@ src_install() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	python_optimize "${ED%/}"/usr/share/qgis/python
+	if use python; then
+		python_optimize "${ED%/}"/usr/share/qgis/python
 
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     47f634e69d4c12058b7f51b7efad1ea1607c66be
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 20:31:13 2017 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 16:29:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f634e6

sci-geosciences/qgis: install full set of icons and MIME types

Closes:#3302

Package-Manager: portage-2.3.3

 sci-geosciences/qgis/qgis-2.18.2-r3.ebuild | 187 +++++++++++++++++++++++++++++
 1 file changed, 187 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
new file mode 100644
index 00000000..084b555
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils fdo-mime gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	x11-libs/qscintilla:=[qt4(-)]
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
+	mapserver? ( dev-libs/fcgi )
+	oracle? ( dev-db/oracle-instantclient:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	>=dev-db/spatialite-4.1.0
+	app-crypt/qca:2[qt4,ssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DWITH_INTERNAL_DATEUTIL=OFF
+		-DWITH_INTERNAL_HTTPLIB2=OFF
+		-DWITH_INTERNAL_JINJA2=OFF
+		-DWITH_INTERNAL_MARKUPSAFE=OFF
+		-DWITH_INTERNAL_PYGMENTS=OFF
+		-DWITH_INTERNAL_PYTZ=OFF
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DWITH_INTERNAL_SIX=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_GRASS7="$(usex grass)"
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
+		else
+			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     7586b3c31b0195b079db37f881ddb28b7e55e53f
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 13:30:07 2017 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 13:30:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7586b3c3

sci-geosciences/qgis: remove old

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/Manifest              |   2 -
 sci-geosciences/qgis/qgis-2.12.1-r1.ebuild | 153 -------------------------
 sci-geosciences/qgis/qgis-2.12.2-r1.ebuild | 172 -----------------------------
 3 files changed, 327 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index cb89ae5..b7bd640 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,4 @@
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
-DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
-DIST qgis-2.12.2.tar.bz2 69110973 SHA256 5fd0e944497d663d836d30670874a80c2e0ae8214d014d08f11e0d2dac2b4931 SHA512 75681f99af713439157df573bea009fc6972e4d869ecd44857101051fda35baae09504426fc726ba0c8d833eb2bf69a4de3f9d6b75e25fb4fde620a8bfce8fd1 WHIRLPOOL 4d9cffb7a861c92a4640b2a156dbb02865c5218c057e48ab8e2ff2ccbb334bb8a42b48c00b517ace279ca9638047037043ceb44cda56e22eec9b045a82ab346f
 DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
 DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
deleted file mode 100644
index a243e54..00000000
--- a/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver postgres python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	gsl? ( sci-libs/gsl )
-	sci-libs/libspatialindex
-	sci-libs/proj
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	dev-qt/designer:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
-	mapserver? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql:* )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	dev-db/spatialite
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-DWITH_SPATIALITE=ON"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with mapserver SERVER)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with python PYSPATIALITE)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_enable test TESTS)
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
-			)
-		else
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc BUGS ChangeLog CODING
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "QGIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python/plugins \
-		"${D}"/$(python_get_sitedir)/qgis
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-		python_optimize "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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"
-	else
-		if use python ; then
-			elog "Support of PostgreSQL is disabled."
-			elog "But some installed python-plugins needs import psycopg2 module."
-			elog "If you do not need this modules just disable them in main menu."
-			elog "Or you need to set USE=postgres"
-		fi
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
deleted file mode 100644
index 3616ead..00000000
--- a/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver postgres python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	gsl? ( sci-libs/gsl )
-	sci-libs/libspatialindex
-	sci-libs/proj
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	dev-qt/designer:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
-	mapserver? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql:* )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	dev-db/spatialite
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.12.0-no-pyqtconfig.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_DATEUTIL=OFF"
-		"-DWITH_INTERNAL_HTTPLIB2=OFF"
-		"-DWITH_INTERNAL_JINJA2=OFF"
-		"-DWITH_INTERNAL_MARKUPSAFE=OFF"
-		"-DWITH_INTERNAL_PYGMENTS=OFF"
-		"-DWITH_INTERNAL_PYTZ=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DWITH_INTERNAL_SIX=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-DWITH_SPATIALITE=ON"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with mapserver SERVER)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with python PYSPATIALITE)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_enable test TESTS)
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
-			)
-		else
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc BUGS ChangeLog CODING
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "QGIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python \
-		"${D}"/$(python_get_sitedir)/qgis \
-		"${D}"/$(python_get_sitedir)/pyspatialite
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-		python_optimize "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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"
-	else
-		if use python ; then
-			elog "Support of PostgreSQL is disabled."
-			elog "But some installed python-plugins needs import psycopg2 module."
-			elog "If you do not need this modules just disable them in main menu."
-			elog "Or you need to set USE=postgres"
-		fi
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     b240880559f28d3175eef3309713d64b467cb447
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Jan  1 20:38:28 2017 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 07:31:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2408805

sci-geosciences/qgis: fix Python and Oracle dependencies and icons

Closes:#3299

Package-Manager: portage-2.3.3

 sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 181 +++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
new file mode 100644
index 00000000..2dddf93
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+		mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	x11-libs/qscintilla:=[qt4(-)]
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
+	mapserver? ( dev-libs/fcgi )
+	oracle? ( dev-db/oracle-instantclient:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	>=dev-db/spatialite-4.1.0
+	app-crypt/qca:2[qt4,ssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+DOCS=( BUGS ChangeLog NEWS )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DWITH_INTERNAL_DATEUTIL=OFF
+		-DWITH_INTERNAL_HTTPLIB2=OFF
+		-DWITH_INTERNAL_JINJA2=OFF
+		-DWITH_INTERNAL_MARKUPSAFE=OFF
+		-DWITH_INTERNAL_PYGMENTS=OFF
+		-DWITH_INTERNAL_PYTZ=OFF
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DWITH_INTERNAL_SIX=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_GRASS7="$(usex grass)"
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+			)
+		else
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+			)
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon -s 16 images/icons/qgis-icon-16x16.png qgis.png
+	newicon -s 512 images/icons/qgis-icon.png qgis.png
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+	make_desktop_entry qgis "QGIS" qgis
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/qgis_sample_data/*
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/$(python_get_sitedir)/pyspatialite
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+		python_optimize "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[David Seifert]

commit:     7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:39 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:26:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaa20c6

sci-geosciences/qgis: Depend on x11-libs/qscintilla[qt4]

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 sci-geosciences/qgis/{qgis-2.12.1.ebuild => qgis-2.12.1-r1.ebuild} | 4 ++--
 sci-geosciences/qgis/{qgis-2.12.2.ebuild => qgis-2.12.2-r1.ebuild} | 4 ++--
 sci-geosciences/qgis/{qgis-2.14.5.ebuild => qgis-2.14.5-r1.ebuild} | 2 +-
 sci-geosciences/qgis/{qgis-2.18.2.ebuild => qgis-2.18.2-r1.ebuild} | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-2.12.1.ebuild
rename to sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
index 04e08cc..a243e54 100644
--- a/sci-geosciences/qgis/qgis-2.12.1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-qt/qtsql:4
 	dev-qt/qtwebkit:4
 	dev-qt/designer:4
-	x11-libs/qscintilla
+	x11-libs/qscintilla:=[qt4(-)]
 	|| (
 		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.12.2.ebuild b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-2.12.2.ebuild
rename to sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
index 01573b3..3616ead 100644
--- a/sci-geosciences/qgis/qgis-2.12.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-qt/qtsql:4
 	dev-qt/qtwebkit:4
 	dev-qt/designer:4
-	x11-libs/qscintilla
+	x11-libs/qscintilla:=[qt4(-)]
 	|| (
 		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-2.14.5.ebuild
rename to sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
index 0e8baaf..3416afd 100644
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qtsql:4
 	dev-qt/qtwebkit:4
-	x11-libs/qscintilla:=
+	x11-libs/qscintilla:=[qt4(-)]
 	|| (
 		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-2.18.2.ebuild
rename to sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
index 4985e33..dec2e4d 100644
--- a/sci-geosciences/qgis/qgis-2.18.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qtsql:4
 	dev-qt/qtwebkit:4
-	x11-libs/qscintilla:=
+	x11-libs/qscintilla:=[qt4(-)]
 	|| (
 		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     0b14c529889e95400a83374ca7f235cd7a45ccb4
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 09:38:52 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 09:38:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b14c529

sci-geosciences/qgis: fix deps

GithubPR: #3136

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.18.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2.ebuild
index ef7bada..4985e33 100644
--- a/sci-geosciences/qgis/qgis-2.18.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	sci-geosciences/gpsbabel
 	>=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
 	sci-libs/geos
-	>=sci-libs/libspatialindex-1.8.5:=
+	sci-libs/libspatialindex:=
 	sci-libs/proj
 	dev-libs/qjson
 	dev-qt/designer:4

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     738d7df08da4f978ead2c0107a749e766e2d061c
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 09:34:18 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 09:34:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738d7df0

sci-geosciences/qgis: fix deps by fedeliallalinea

GithubPR: #3136

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.18.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2.ebuild
index bab1eab..ef7bada 100644
--- a/sci-geosciences/qgis/qgis-2.18.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	sci-geosciences/gpsbabel
 	>=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
 	sci-libs/geos
-	sci-libs/libspatialindex:=
+	>=sci-libs/libspatialindex-1.8.5:=
 	sci-libs/proj
 	dev-libs/qjson
 	dev-qt/designer:4
@@ -64,7 +64,7 @@ RDEPEND="
 		${PYTHON_DEPS}
 	)
 	dev-db/sqlite:3
-	dev-db/spatialite
+	>=dev-db/spatialite-4.1.0
 	app-crypt/qca:2[qt4,ssl]
 "
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     ab146b0cb173db0b72c0ee3a9b76a5680538d962
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Dec 18 09:07:05 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 12:43:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab146b0c

sci-geosciences/qgis: Version bump 2.18.2

Closes: #3136

Package-Manager: portage-2.3.3

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/metadata.xml       |   1 +
 sci-geosciences/qgis/qgis-2.18.2.ebuild | 178 ++++++++++++++++++++++++++++++++
 3 files changed, 180 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ede351c..cb89ae5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,4 +2,5 @@ DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea0254
 DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
 DIST qgis-2.12.2.tar.bz2 69110973 SHA256 5fd0e944497d663d836d30670874a80c2e0ae8214d014d08f11e0d2dac2b4931 SHA512 75681f99af713439157df573bea009fc6972e4d869ecd44857101051fda35baae09504426fc726ba0c8d833eb2bf69a4de3f9d6b75e25fb4fde620a8bfce8fd1 WHIRLPOOL 4d9cffb7a861c92a4640b2a156dbb02865c5218c057e48ab8e2ff2ccbb334bb8a42b48c00b517ace279ca9638047037043ceb44cda56e22eec9b045a82ab346f
 DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
+DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 220280f..dca8b5f 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -18,5 +18,6 @@
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
     <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
     <flag name="mapserver">Determines whether mapserver should be built</flag>
+    <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2.ebuild
new file mode 100644
index 00000000..bab1eab
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+		mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	x11-libs/qscintilla:=
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
+	mapserver? ( dev-libs/fcgi )
+	oracle? ( dev-db/oracle-instantclient:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	dev-db/spatialite
+	app-crypt/qca:2[qt4,ssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+DOCS=( BUGS ChangeLog NEWS )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DWITH_INTERNAL_DATEUTIL=OFF
+		-DWITH_INTERNAL_HTTPLIB2=OFF
+		-DWITH_INTERNAL_JINJA2=OFF
+		-DWITH_INTERNAL_MARKUPSAFE=OFF
+		-DWITH_INTERNAL_PYGMENTS=OFF
+		-DWITH_INTERNAL_PYTZ=OFF
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DWITH_INTERNAL_SIX=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_GRASS7="$(usex grass)"
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+			)
+		else
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+			)
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
+	make_desktop_entry qgis "QGIS" qgis
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/qgis_sample_data/*
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/$(python_get_sitedir)/pyspatialite
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+		python_optimize "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     547c4484c51fc63b5757f48150009ce7b220e9f2
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 21:14:09 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 21:22:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547c4484

sci-geosciences/qgis: fix accidentally added multilib

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.14.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
index 9884dff..0e8baaf 100644
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+inherit eutils gnome2-utils cmake-utils python-single-r1
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     1ec8a98a7e988b2de80d7285834def2c819bbfe8
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 10:57:26 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 10:57:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec8a98a

sci-geosciences/qgis: fix grass flag bug #601380 by Chris Mayo

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/qgis-2.14.5.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
index d4088cd..9884dff 100644
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils gnome2-utils cmake-utils python-single-r1
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -96,12 +96,10 @@ src_configure() {
 		"-DWITH_INTERNAL_SIX=OFF"
 		"-DPEDANTIC=OFF"
 		"-DWITH_APIDOC=OFF"
-		"-DWITH_SPATIALITE=ON"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
+		"-WITH_QSPATIALITE=ON"
 		-DENABLE_TESTS=no
 		-DWITH_BINDINGS="$(usex python)"
-		-DWITH_BINDINGS_GLOBAL_INSTALL="$(usex python)"
-		-DWITH_GRASS="$(usex grass)"
+		-DWITH_GRASS7="$(usex grass)"
 		$(usex grass "-DGRASS_PREFIX=/usr/" "")
 		-DWITH_GSL="$(usex gsl)"
 		-DWITH_ORACLE="$(usex oracle)"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Thomas Deutschmann]

commit:     e245985388006bcd402c21b41985b34f835f63c7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 10:53:39 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 10:56:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2459853

sci-geosciences/qgis: Bump to v2.14.5

 - Version bump to new upstream release v2.14.5 (Fixes Gentoo-Bug #581146,
   #583784, #588994).

 - Bumped to EAPI=6; This makes multilib eclass unnecessary because
   get_libdir is now part of EAPI=6.

 - "oracle" USE flag added (Fixes Gentoo-Bug #585156).

 - Disabling test suite because upstream doesn't allow running from
   install path [Link 1] (Closes Gentoo-Bug #499894).

 - Package license updated after upstream clearified its own license
   [Link 2].

Link 1: https://github.com/qgis/QGIS/blob/final-2_14_5/src/core/qgsapplication.cpp#L374
Link 2: https://github.com/qgis/QGIS/commit/d5bc39cb8ccc047543d37359ae7fc2d34c89a538

Gentoo-Bug: https://bugs.gentoo.org/581146
Gentoo-Bug: https://bugs.gentoo.org/585156
Gentoo-Bug: https://bugs.gentoo.org/588994
Gentoo-Bug: https://bugs.gentoo.org/583784
Gentoo-Bug: https://bugs.gentoo.org/499894

Acked-by: Amy Winston <amynka <AT> gentoo.org>

Package-Manager: portage-2.3.0

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/qgis-2.14.5.ebuild | 175 ++++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b4c9e3b..ede351c 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,5 @@
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
 DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
 DIST qgis-2.12.2.tar.bz2 69110973 SHA256 5fd0e944497d663d836d30670874a80c2e0ae8214d014d08f11e0d2dac2b4931 SHA512 75681f99af713439157df573bea009fc6972e4d869ecd44857101051fda35baae09504426fc726ba0c8d833eb2bf69a4de3f9d6b75e25fb4fde620a8bfce8fd1 WHIRLPOOL 4d9cffb7a861c92a4640b2a156dbb02865c5218c057e48ab8e2ff2ccbb334bb8a42b48c00b517ace279ca9638047037043ceb44cda56e22eec9b045a82ab346f
+DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
new file mode 100644
index 0000000..e5d9e34
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples grass gsl mapserver oracle postgres python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+		mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	gsl? ( sci-libs/gsl:= )
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	x11-libs/qscintilla:=
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
+	mapserver? ( dev-libs/fcgi )
+	oracle? ( dev-db/oracle-instantclient:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	dev-db/spatialite
+	app-crypt/qca:2[qt4,openssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+DOCS=( BUGS ChangeLog NEWS )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DQGIS_MANUAL_SUBDIR=/share/man/"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
+		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+		"-DWITH_INTERNAL_DATEUTIL=OFF"
+		"-DWITH_INTERNAL_HTTPLIB2=OFF"
+		"-DWITH_INTERNAL_JINJA2=OFF"
+		"-DWITH_INTERNAL_MARKUPSAFE=OFF"
+		"-DWITH_INTERNAL_PYGMENTS=OFF"
+		"-DWITH_INTERNAL_PYTZ=OFF"
+		"-DWITH_INTERNAL_QWTPOLAR=OFF"
+		"-DWITH_INTERNAL_SIX=OFF"
+		"-DPEDANTIC=OFF"
+		"-DWITH_APIDOC=OFF"
+		"-DWITH_SPATIALITE=ON"
+		"-DWITH_INTERNAL_SPATIALITE=OFF"
+		-DENABLE_TESTS=no
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_BINDINGS_GLOBAL_INSTALL="$(usex python)"
+		-DWITH_GRASS="$(usex grass)"
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+		-DWITH_GSL="$(usex gsl)"
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+			)
+		else
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+			)
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
+	make_desktop_entry qgis "QGIS " qgis
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/qgis_sample_data/*
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/$(python_get_sitedir)/pyspatialite
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+		python_optimize "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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"
+	else
+		if use python ; then
+			elog "Support of PostgreSQL is disabled."
+			elog "But some installed python-plugins needs import psycopg2 module."
+			elog "If you do not need this modules just disable them in main menu."
+			elog "Or you need to set USE=postgres"
+		fi
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     dcf5b5f7dbee28d9eaad3796ea6b368c76823a0d
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:22:47 2015 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 17:39:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf5b5f7

sci-geosciences/qgis: useflags repaired bug #508320 and bug #476460

Package-Manager: portage-2.2.24

 sci-geosciences/qgis/qgis-1.8.0.ebuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 1fe1c59..5d9d726 100644
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bundled-libs examples gps gsl postgres python spatialite test"
+IUSE="bundled-libs examples gsl postgres python spatialite test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -32,14 +32,14 @@ RDEPEND="
 	sci-geosciences/gpsbabel
 	>=sci-libs/gdal-1.6.1[geos,python?]
 	sci-libs/geos
-	sci-libs/gsl
 	sci-libs/libspatialindex
 	sci-libs/proj
 	x11-libs/qwt:5[svg]
 	!bundled-libs? ( <x11-libs/qwtpolar-1 )
-	postgres? ( >=dev-db/postgresql-8.4 )
+	gsl? ( sci-libs/gsl )
+	postgres? ( >=dev-db/postgresql-8.4:= )
 	python? (
-		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 	)
 	spatialite? (
@@ -91,10 +91,8 @@ src_install() {
 		doins -r "${WORKDIR}"/qgis_sample_data/*
 	fi
 
-	python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
 	python_optimize "${D}"/usr/share/qgis/python/plugins \
-		"${D}"/$(python_get_sitedir)/qgis \
-		"${D}"/usr/share/qgis/grass/scripts
+                "${D}"/$(python_get_sitedir)/qgis
 }
 
 pkg_preinst() {

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Amy Winston]

commit:     5509c0eecdd713de3c148e0eaae5e2b7e55ee42d
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 19:53:48 2015 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 19:53:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5509c0ee

sci-geosciences/qgis: 2.12.1 version bump bug #485868.

Package-Manager: portage-2.2.24

 sci-geosciences/qgis/Manifest           |   1 +
 sci-geosciences/qgis/metadata.xml       |   2 +
 sci-geosciences/qgis/qgis-2.12.1.ebuild | 153 ++++++++++++++++++++++++++++++++
 3 files changed, 156 insertions(+)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 80f4f57..c354b3e 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
+DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 2d85958..c7d2ce3 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -13,5 +13,7 @@
   <use>
     <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
+    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+    <flag name="mapserver">Determines whether mapserver should be built</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1.ebuild
new file mode 100644
index 0000000..119b1cd
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.12.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples grass gsl mapserver postgres python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+		mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	gsl? ( sci-libs/gsl )
+	sci-libs/libspatialindex
+	sci-libs/proj
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	dev-qt/designer:4
+	x11-libs/qscintilla
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
+	mapserver? ( dev-libs/fcgi )
+	postgres? ( dev-db/postgresql:* )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	dev-db/spatialite
+	app-crypt/qca:2[qt4,openssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DQGIS_MANUAL_SUBDIR=/share/man/"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
+		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+		"-DWITH_INTERNAL_QWTPOLAR=OFF"
+		"-DPEDANTIC=OFF"
+		"-DWITH_APIDOC=OFF"
+		"-DWITH_SPATIALITE=ON"
+		"-DWITH_INTERNAL_SPATIALITE=OFF"
+		$(cmake-utils_use_with postgres POSTGRESQL)
+		$(cmake-utils_use_with grass GRASS)
+		$(cmake-utils_use_with mapserver SERVER)
+		$(cmake-utils_use_with python BINDINGS)
+		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+		$(cmake-utils_use_with python PYSPATIALITE)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_enable test TESTS)
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+			)
+		else
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+			)
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc BUGS ChangeLog CODING
+
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
+	make_desktop_entry qgis "QGIS " qgis
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/qgis_sample_data/*
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python/plugins \
+		"${D}"/$(python_get_sitedir)/qgis
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+		python_optimize "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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"
+	else
+		if use python ; then
+			elog "Support of PostgreSQL is disabled."
+			elog "But some installed python-plugins needs import psycopg2 module."
+			elog "If you do not need this modules just disable them in main menu."
+			elog "Or you need to set USE=postgres"
+		fi
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Patrick Lauer]

commit:     4ac4712926538c9465da063f73fdc4c536072536
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 14:29:13 2015 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 14:29:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac47129

sci-geosciences/qgis: Remove unneeded useflag descriptions from metadata.xml

 sci-geosciences/qgis/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index be2c23b..2d85958 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -12,7 +12,6 @@
 </longdescription>
   <use>
     <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
-    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
   </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/

[Pacho Ramos]

commit:     46283e28201ecd2308076760693bf496ee7a231f
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 19:01:05 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 19:01:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46283e28

sci-geosciences/qgis: Drop old

Package-Manager: portage-2.2.20.1

 sci-geosciences/qgis/Manifest          |   1 -
 sci-geosciences/qgis/qgis-1.7.0.ebuild | 100 ---------------------------------
 2 files changed, 101 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e28b1b7..80f4f57 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34 SHA512 76e5bdc66626881c89945923548c1682c3fa4d217a0e26099960b079413caffa266066305c36dab1d7708490428d3670aa3825b4298a173278171b84f9d51279 WHIRLPOOL 67ae67f16140c2a6a1007115dd2202e5b495492167a124bb78d722354900f94e8e61a81479598f6c3f137131992fe95ff5db798e04a3cfe23e62268b4ace2adc
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-1.7.0.ebuild b/sci-geosciences/qgis/qgis-1.7.0.ebuild
deleted file mode 100644
index ddc06c0..0000000
--- a/sci-geosciences/qgis/qgis-1.7.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="python? 2"
-inherit python cmake-utils eutils multilib
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples gps grass gsl postgres python spatialite test"
-
-RDEPEND="
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?]
-	sci-libs/geos
-	sci-libs/gsl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	x11-libs/qwt:5[svg]
-	x11-libs/qwtpolar
-	grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] )
-	postgres? ( >=dev-db/postgresql-8.4 )
-	python? ( dev-python/PyQt4[X,sql,svg] )
-	spatialite? (
-		dev-db/sqlite:3
-		dev-db/spatialite
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-DOCS=( BUGS ChangeLog CODING.pdf README )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
-)
-
-# Does not find the test binaries at all
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DBINDINGS_GLOBAL_INSTALL=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with spatialite SPATIALITE)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon images/icons/qgis-icon.png qgis.png || die
-	make_desktop_entry qgis "Quantum GIS" qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
-	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"
-	fi
-}