gentoo resync : 22.01.2021

3 files changed, 211 insertions, 3 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0c69a59171d4..cbefc03774a3 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -5,8 +5,10 @@ AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
 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
 EBUILD qgis-3.16.0-r1.ebuild 5355 BLAKE2B b6a9239578ab1f6363dfdd78ac5141a0890a70902bd4ac76f58311a8f57fed841bee5f85368ec620902e17e88cd46dc734d49b722db9522c81de46329c81ccf0 SHA512 c11682d7c7555ba9078344aa3d9cf0624f173dcc151395ae2ae9c765d4baebedbe90d15bcecde01bd48a80d74a4e3609f33dd28bf572b097e5f317ad220cc2de
-EBUILD qgis-3.16.2.ebuild 5367 BLAKE2B 0deb1db585db8c6fbd7077449f5e93588433622b4f6ea01eefa609abf7eb88af77de371e446003301bd665f231a456f6a60d6d2c1bc0a211dc43df1219007dd7 SHA512 7418323687ea5230a18eeffc8426caaa35123531e36ff0110f1bc6d2db13aea82873e18614a02b722ce221e46b8ad7bbc5bf78fb21ceb438f120f75083f2ca58
+EBUILD qgis-3.16.2.ebuild 5365 BLAKE2B 58033663ec3786fb8f06f7f7b04a608b5ab34d0cba7303811038b70348f54aa7105afb2cdb77b03c63c15e226f2735d5659900bd14b81fea9f3bf50e5fd04280 SHA512 6569a8609016ad07dffe8234e47350cae82b39b032634a6e61a3f6cb7e1c26e9a846ca3e7cf3f8a1839a3afebf102772c250e89b3b0e157fbbb07f22847cddd7
+EBUILD qgis-3.16.3.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
 EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index c27cdfcd10c6..6217f4f7590f 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
 
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 000000000000..fbfc6e31fbfb
--- /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
+}