gentoo resync : 03.03.2021

16 files changed, 365 insertions, 109 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 040e60cec139..01cf509aaa35 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 8c6f69269fcf..ae7f89cff135 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654
 DIST gpxsee-8.4.tar.gz 8156963 BLAKE2B a2bbedf8a64655aad192cf436b762cc99f280f2bee32213a4d63476e48510b4a4697f474202aefa55d74c74e1f3eed48c58dc391aace1b76f431427e42a8a8c7 SHA512 8650e8e7d2bd4cef87f7a6554964b5599223ef2f69a64669c3e6f0fb25dabf93de9278d3016f4f141adb4cdd173a5f3812b7bcf147fd228765e06e23f066a9c4
+DIST gpxsee-8.7.tar.gz 8413467 BLAKE2B 96d4981c48c9d1e3c731a630f6d0d972b19bf23427f00920598854b2e77e3ab41470fdf64450c505a24c401248b169a63e4726ca2f223c4ac72fc81da5bad06d SHA512 6a0dbd6d34df062e8597314a47e0233bf222623fc396272572450b2e7ed624afbfb8f2bf065ab012d836e09fad7675c7338b4eb4d3822ab5780599a90c9df5f7
 EBUILD gpxsee-8.1.ebuild 1120 BLAKE2B 53dd31df042597a342e3495385a922664d7fdc5d6ef902be6af26d7fddf6db68df5c466390ed32f2a64231b0ed12de58c1f411f3c3cf36d746def905819230cc SHA512 47d9b1ffac436772f4bde3eadfa6a00419f973b547b3b8483e453db52f5304a0ba5923c5d88c2650182b3157c0dca71c3ccf3306c2e828c170975b48fd02c40e
 EBUILD gpxsee-8.4.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
+EBUILD gpxsee-8.7.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-8.7.ebuild b/sci-geosciences/gpxsee/gpxsee-8.7.ebuild
new file mode 100644
index 000000000000..950a8b5cfcfa
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-8.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index ceda8c24b0e0..6a5c7296bfe9 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,8 +1,5 @@
 AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
-DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
-EBUILD osm2pgsql-1.3.0.ebuild 862 BLAKE2B 2955a1ae1878f95c4a12a822589489a246fa96677b2ec061f02c76d9869cef04023cf728490651b70dd2e63fb74687b9f1802db0478727d799f22e1897a10d48 SHA512 d40667f5eaa3c1f507187b255af0341e7eed3789e9820275a1cca39d9c1cf3eac4dc2be2a4f00ac17cbb9767cfb5e7d6ee56a9cfcf5af36dcc0745d5b9bfcd27
 EBUILD osm2pgsql-1.4.0-r100.ebuild 1274 BLAKE2B a44e145e366ba8ad8f204d55dd2f058e046c387c334c6982cbb626c98d323db1e31e2d10be049a126616d75711f02449d716804a8254d8c336ed62d42da7f82c SHA512 4b67fa88249ff9c3f4b4c7441d4a97cf4c1e257bc0fc6991f0f5ae0401ecf4b155929d4bd5817556f70aab40fe672a9752c402b8f58c35e12afdfc428e5cae6b
-EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
 EBUILD osm2pgsql-99999999.ebuild 1258 BLAKE2B 5986238e26804a4320bb6e291d68bd112926cb84e64b0046b66f5d7b5f6c2928769214119cb2bb9eccd36a97463b67a110e8b41774c2d4178d481b7616e18073 SHA512 b556c71c67187a100b960968c4d6c7c9ab3a0f46f56dc1949e753c92a8e93fdd41eaece622d135156e290ec9eb5280593d7398acd0b072daa9b42ce65e0f0b89
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
deleted file mode 100644
index 1e47df20181e..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://osm2pgsql.org/"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua luajit"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj:=
-	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-	luajit? ( dev-lang/luajit:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-db/postgis
-"
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LUA=$(usex lua)
-		-DWITH_LUAJIT=$(usex luajit)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
deleted file mode 100644
index 736fa938d656..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://osm2pgsql.org/"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lua luajit"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj:=
-	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-	luajit? ( dev-lang/luajit:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-db/postgis
-"
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LUA=$(usex lua)
-		-DWITH_LUAJIT=$(usex luajit)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ba08726060fa..5bfc88eab3e4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,8 +3,10 @@ AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aa
 AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
 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
 EBUILD qgis-3.16.2.ebuild 5365 BLAKE2B 58033663ec3786fb8f06f7f7b04a608b5ab34d0cba7303811038b70348f54aa7105afb2cdb77b03c63c15e226f2735d5659900bd14b81fea9f3bf50e5fd04280 SHA512 6569a8609016ad07dffe8234e47350cae82b39b032634a6e61a3f6cb7e1c26e9a846ca3e7cf3f8a1839a3afebf102772c250e89b3b0e157fbbb07f22847cddd7
 EBUILD qgis-3.16.3.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
+EBUILD qgis-3.16.4.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.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild
new file mode 100644
index 000000000000..fbfc6e31fbfb
--- /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
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 30262030ec65..669a5e0d66ec 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,6 @@
+AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee
 DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a
 DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c
 EBUILD qmapshack-1.15.1-r1.ebuild 1013 BLAKE2B 630d65db15e9c615d3fe533bac95f1e5730657027ff467324782fc5d90752daf6bcdc0e471e95dcc2f36baec93eb4eab65d272a0c4878e40094a2e906938baba SHA512 9972ce4a907d68d5d7bddf1af3b776cba41b0cb567ba386d6ee8a40dd75c34bb2e4853da6fc7d83320652cd9fe9f03ac63092d19e6051d4c5788ab1154a6b550
-EBUILD qmapshack-1.15.2-r1.ebuild 998 BLAKE2B 8ccf4b9926db3b894dde907519a04ba84926a2967fdbf8d0502226143749cdbb12349e667fb08dbeb09edd650075109ee3aa5ca58539b49ac9981839abdb38ec SHA512 0a84aece442231fae021dae156130ffb30a159efab9dff41a18c364c379490b85d57f5d50447b5a769e2e7791a57f5974ad211f93f6bd3219a0f6de8b404ba78
+EBUILD qmapshack-1.15.2-r2.ebuild 1287 BLAKE2B 3a3af85222de338c70600d6ebc6a02937e20c14ceb636f460b174bf29631f97b8f8cfc1ef64a40a00b0a53ad8125a15e96c61e44139c653a198fb58ef5762a85 SHA512 26389bd2aa043a1fb65c5cfa2f0ea0bac9afa0bee9873c5fa56b6b2723b4b6ec5a6a3e37de44e7f36136e68eb02df77fbcdc1ee14e8b106556926a526b7ee5e4
 MISC metadata.xml 831 BLAKE2B 92b3728e320927f7988568ad8b0c7a7b56dc06e8d354e26960f7002652f0a34b6223631179da2d9213f531d135757f17c68589309a0e1736194231a3567df821 SHA512 d69f75e5c21d93c8f0569c8f7429b14f8c9972dead06ebc5bfedaf280c376029ddf4d5f68904472986a5b6f57d9e6a6ef2bdba1edbe440e21d3eca1c65072ba6
diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
new file mode 100644
index 000000000000..99a55d694fb5
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt	2020-12-07 17:13:38.000000000 +0100
++++ b/CMakeLists.txt	2021-02-20 20:01:41.706789439 +0100
+@@ -18,25 +18,6 @@
+ endif()
+ 
+ ###############################################################################################
+-# Do distribution dependent stuff
+-###############################################################################################
+-string(TIMESTAMP YEAR "%Y")
+-set(EXPIRE_YEAR "2021")
+-set(DEBIAN_RELEASE_INFO "/etc/debian_version")
+-
+-if(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
+-    message( STATUS "Apply patches to fix build system on Debian")
+-    execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindPROJ4.patch"
+-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-                    OUTPUT_QUIET)
+-    execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindQuaZip5.patch"
+-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-                    OUTPUT_QUIET)
+-endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
+-
+-
+-
+-###############################################################################################
+ # Define project name and version tags
+ ###############################################################################################
+ # this is not only the QMS version it will be the package version, too.
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.2-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
index bb3db8f99574..5b54a225f831 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.15.2-r1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	dev-qt/designer:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5[widgets]
@@ -34,10 +34,22 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}"/${PN}-V_${PV}
 
+PATCHES=(
+	"${S}"/FindPROJ4.patch
+	"${FILESDIR}"/${P}-no-hacks-kthxbye.patch
+)
+
 src_prepare() {
-	eapply FindPROJ4.patch
 	cmake_src_prepare
-	xdg_environment_reset
+
+	# TODO: upstream
+	if has_version ">=dev-libs/quazip-1.0"; then
+		sed -e "/^find_package(QuaZip5/s/5          /-Qt5 CONFIG/" \
+			-i CMakeLists.txt || die
+
+		sed -e "s/\${QUAZIP_LIBRARIES}/QuaZip::QuaZip/" \
+			-i src/qmapshack/CMakeLists.txt || die
+	fi
 }
 
 src_install() {
diff --git a/sci-geosciences/readosm/Manifest b/sci-geosciences/readosm/Manifest
index 0bbdbd1925c3..2c1d9aaa0e30 100644
--- a/sci-geosciences/readosm/Manifest
+++ b/sci-geosciences/readosm/Manifest
@@ -1,3 +1,5 @@
 DIST readosm-1.0.0e.tar.gz 1096062 BLAKE2B 4f105dd3db158ea48d40e7ee826467e493595ebb1e8edc2f592c7390e7a7f708e8834d52c4d3ffbc8094ba64553a4d95bb2865798dd48ef0591e9dbdb6a18222 SHA512 fde22e66b8ed80de168ff9302e8f9312a1a3111c7326f2db45d3176df98030f77e6590416ec5a5d0aef445f707a62cb091a47ee7533bede65eebf8ebf0fa4c28
-EBUILD readosm-1.0.0e-r1.ebuild 579 BLAKE2B 379db02f1bdf518c49498eb2689c45c8a77988ec03f89b61e2b8504316a53c721acf269db1fd4282b345c67202bcf2f113e5e77abdb9f04dc016cf08d79231ac SHA512 0a1fa861ba7cf7494997b9c3f0edb25502c178f59b6f4025bd78e53d8b0b57a43f0e4ee9b997803864620c47e9fc72a7face6e662f41749415e81c73268e1471
+DIST readosm-1.1.0a.tar.gz 1099129 BLAKE2B 28062238333fac9cff41aa30cdb606ee2ae3873bd4c251aa3d1abc31aca5003bda1898d8c651dfac499fe1d3e17b7a82bd16028aa873147719ad7c285a0264d6 SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682
+EBUILD readosm-1.0.0e-r1.ebuild 580 BLAKE2B d5651f75588750f32cdee88150546c9a1c38ea4789c9f2bb7b39ff9600cc7b759e64b90536771dc504adbd9e448b8389824363aab4f45d66d8463eb30b84a6eb SHA512 919c5a3ed5991296fddf38bdfb4ded5a5d76734a01d546d004880d26b309f883c7a87358d87a12ca03540a9b8dabbe7891ff7dc47b0d0352cd698e532b010609
+EBUILD readosm-1.1.0a.ebuild 567 BLAKE2B ac19edbfe6f0af3aed8ac30cea0cb5e2a02906cc8426b3d9ee1ca28b6069864f5a83fed9839eb836f96d1e88afb5005347c36e5922f479e2ce67f2e84da81e7b SHA512 9110dc437cfd2c3d7c7c01ad50030416d14112cc35ccac4dc7dd79abbd7c06c34bab5f2105c979387ff55bd09d8d90f821df5dcd4579459fcf28e87195d0b309
 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild b/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
index 84172b249675..0e6c0fee19a0 100644
--- a/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
+++ b/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Library to extract valid data from an Open Street Map input file"
-HOMEPAGE="https://www.gaia-gis.it/spatialite"
+HOMEPAGE="https://www.gaia-gis.it/fossil/readosm"
 SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
diff --git a/sci-geosciences/readosm/readosm-1.1.0a.ebuild b/sci-geosciences/readosm/readosm-1.1.0a.ebuild
new file mode 100644
index 000000000000..2ef7cd525d42
--- /dev/null
+++ b/sci-geosciences/readosm/readosm-1.1.0a.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to extract valid data from an Open Street Map input file"
+HOMEPAGE="https://www.gaia-gis.it/fossil/readosm"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index d4c96f29f3f7..abb611e15775 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -3,5 +3,5 @@ AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3d
 DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
 DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070
 EBUILD routino-3.2.ebuild 719 BLAKE2B 2ebcbe7a5356b375512a682696f4bc39eb337f4a9f87362af1f003dd6c99423c4ce168fa2896590abcfc860412068d84ee80face8b3c871499042ab51c092ab6 SHA512 ea8d262efbe278b659b935bce78dcba5b1418d76edaf8f296c62315ee33533e8dd4d218b1f65f87399de63bb7762fe4a0e2cd2752ea3740993d5cdf23e40d1c4
-EBUILD routino-3.3.2.ebuild 1580 BLAKE2B 31c073b39f9423edefe212250014f96bfbd3f83decd1ac93d80820848164eed5e0f7747ff1cc50dd83fb2f4a811168be0e9bec49fc1681dbba2c11f6d0f14362 SHA512 99d11b799b210a4e97d3635d399ba456a68c427e35539de7ea94c8dfd33e904a26137186a514ce63f0f049e935e818a038dd6a70ea63419597c092b8836b992b
+EBUILD routino-3.3.2.ebuild 1634 BLAKE2B 75fffeac50b909ddb6ee26b9c1a3347fc86ddd8754cd2457c513a1dcc8a3b0526e3679532ee7c4e5ba9b79b9b6c20560ad841c91935eae387b44158b911804cf SHA512 d23c0795affec6903e85a4ef134bd1e6a16948d5ed450e77e5e7c9158002ae01e651f484928794396d239d4b2b3bbd390907a1074ee72547bf23572a51a865ef
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild b/sci-geosciences/routino/routino-3.3.2.ebuild
index c910d4194d2c..0ea8e4a10d4e 100644
--- a/sci-geosciences/routino/routino-3.3.2.ebuild
+++ b/sci-geosciences/routino/routino-3.3.2.ebuild
@@ -1,32 +1,41 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit toolchain-funcs distutils-r1
 
 DESCRIPTION="Routing application based on openstreetmap data"
-HOMEPAGE="http://www.routino.org/"
-SRC_URI="http://www.routino.org/download/${P}.tgz"
+HOMEPAGE="https://routino.org/"
+SRC_URI="https://routino.org/download/${P}.tgz"
+
 LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="python? ( ${PYTHON_DEPS}
-	dev-lang/swig )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
 src_prepare() {
-	eapply "${FILESDIR}"/${P}.patch
+	default
 
 	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
 		-e "s@CC=gcc@CC=$(tc-getCC)@" \
 		-e "s@LD=gcc@LD=$(tc-getCC)@" \
 		Makefile.conf || die "failed sed"
-
-	eapply_user
 }
 
 src_compile() {
@@ -36,7 +45,7 @@ src_compile() {
 	if use python; then
 		pushd python > /dev/null
 		python_compile() {
-			rm -f build/.timestamp
+			rm -f build/.timestamp || die
 			emake PYTHON=${EPYTHON}
 		}
 		python_foreach_impl python_compile