Updating liguros repov21.1.3

27 files changed, 7 insertions, 1212 deletions

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
deleted file mode 100644
index d55b5a6b4038..000000000000
--- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="MTK GPS Datalogger Device Control"
-HOMEPAGE="https://www.bt747.org"
-SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip
-	https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
-
-LICENSE="GPL-3"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/commons-imaging:0
-	dev-java/jcalendar:1.2
-	dev-java/jchart2d:0
-	dev-java/jopt-simple:0
-	>=dev-java/rxtx-2.2_pre2:2
-	dev-java/swing-layout:1
-	dev-java/swingx:1.6
-	dev-java/swingx-ws:bt747
-"
-
-RDEPEND="
-	${CDEPEND}
-	dev-libs/glib:2[dbus]
-	>=virtual/jre-1.7
-"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-"
-
-EANT_BUILD_TARGET="dist.j2se"
-EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo"
-EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple-4.4,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	# Fix for newer jchart2d.
-	epatch "${FILESDIR}/jchart2d-3.2.patch"
-
-	# Remove all the bundled stuff.
-	rm -rv dist/ lib/ || die
-
-	# GraphicsUtilities moved in later SwingX versions.
-	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
-		src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die
-
-	eapply_user
-}
-
-src_install() {
-	dodoc {ChangeLog,README}.txt
-
-	java-pkg_dojar dist/*.jar
-	java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
-		--java-args="-Xmx192m"
-
-	doicon "${DISTDIR}/${PN}.gif"
-	make_desktop_entry ${PN} BT747 bt747.gif
-}
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 1cb9a387269e..beba90be404a 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,2 @@
 DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
-DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae7b9e45455ed79f2c633f33a6311dd3c9a388eae1350dac82ac1e02b811680b15f161cb8a523878698d993aae SHA512 d3346e2ed8593d5b57c2484a2153c9900289380a79799dbbe587879c9fc0b3e95d21f14d178e7e2a4b586062cc22c4ba1d90b3e66e73f0c334360f3b04625f8e
-DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062
-DIST gpxsee-7.37.tar.gz 5406206 BLAKE2B eecc311a89ee94aa1e52cb742802ee78634199d13173106938b559f787029df2496a60642c08109928051cd0d478b794f8ca0db050fe4406b2aca51c290d317e SHA512 891689e78a7cb3ece63d28cc892cadd483770ab88add241021bcee70a6acb744410a9b412e0f2286e63552eadf6398671c25a594ef02b0a09d8ecf89fa9ca278
-DIST gpxsee-7.38.tar.gz 7700995 BLAKE2B 6b2f47bf79501509cdd67ccb5387134fd04b916913cb34eeac54c0c6a60b45ebee534b94771f38c13ad29062b9917acccc412bdcee82e7348ff85368e77ef89f SHA512 9887e9be559eac8c19c4901751f2403b8824aae89c5a159f581f14e4b72154f91e9761eae871cce8b794eb193b2b744b77e6e7b5968bb4a8f9d505220de20cc9
 DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654
diff --git a/sci-geosciences/gpxsee/gpxsee-7.35.ebuild b/sci-geosciences/gpxsee/gpxsee-7.35.ebuild
deleted file mode 100644
index d9d146091a25..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.35.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en 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/gpxsee/gpxsee-7.36.ebuild b/sci-geosciences/gpxsee/gpxsee-7.36.ebuild
deleted file mode 100644
index d9d146091a25..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.36.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en 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/gpxsee/gpxsee-7.37.ebuild b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
deleted file mode 100644
index d9d146091a25..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en 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/gpxsee/gpxsee-7.38.ebuild b/sci-geosciences/gpxsee/gpxsee-7.38.ebuild
deleted file mode 100644
index d9d146091a25..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.38.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en 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/grass/Manifest b/sci-geosciences/grass/Manifest
index 93cc6b1b6941..983f9b9086c7 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,2 @@
-DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
 DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
+DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index db440721de0d..e6abc8ba126a 100644
--- a/sci-geosciences/grass/grass-7.8.3.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.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
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
 WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
+WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs wxwidgets xdg
 
@@ -134,8 +134,6 @@ src_prepare() {
 	fi
 	shopt -u nullglob
 	addpredict /dev/nvidiactl
-
-	eapply_user
 }
 
 src_configure() {
@@ -202,10 +200,6 @@ src_install() {
 	local HTML_DOCS=( docs/html/. )
 	einstalldocs
 
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
 	# translations
 	if use nls; then
 		insinto /usr/share/locale
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index dc400a275408..b154aff6400a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
diff --git a/sci-geosciences/mapserver/mapserver-7.6.0.ebuild b/sci-geosciences/mapserver/mapserver-7.6.0.ebuild
deleted file mode 100644
index cd24bd5d001a..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.6.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: We have to stick with EAPI 6 for now because of the
-# depend.apache eclass.
-EAPI=6
-
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-USE_PHP="php7-2 php7-3 php7-4"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7
-inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2.2.8
-	dev-libs/libxml2:2=
-	dev-libs/libxslt[crypt]
-	>=dev-libs/protobuf-c-1.3.2:=
-	>=media-libs/freetype-2.9.1-r3
-	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
-	>=media-libs/giflib-5.2.1:=
-	>=media-libs/libpng-1.6.37:=
-	>=net-misc/curl-7.69.1
-	>=sci-libs/gdal-3.0.4:=[oracle?]
-	>=sci-libs/proj-6.2.1:=
-	virtual/jpeg
-	virtual/libiconv
-	>=x11-libs/agg-2.5-r3
-	apache? (
-		app-admin/webapp-config
-		dev-libs/fcgi
-	)
-	bidi? (
-		dev-libs/fribidi
-		media-libs/harfbuzz:=
-	)
-	cairo? ( x11-libs/cairo )
-	geos? ( sci-libs/geos )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oracle? ( dev-db/oracle-instantclient:=	)
-	perl? ( dev-lang/perl:= )
-	postgis? (
-		dev-db/postgis
-		dev-db/postgresql:=
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	perl? ( >=dev-lang/swig-4.0 )
-	php? ( >=dev-lang/swig-4.0 )
-	python? (
-		>=dev-lang/swig-4.0
-		>=dev-python/setuptools-44.1.0
-	)
-"
-
-want_apache2 apache
-
-pkg_setup() {
-	use apache && webapp_pkg_setup
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use php && php-ext-source-r3_src_prepare
-	use python && python_copy_sources
-}
-
-_generate_cmake_args() {
-	# Provides a simple, bare config for bindings to build upon
-	# Need WITH_WMS=ON or build fails
-	local args=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CAIRO=OFF"
-		"-DWITH_FCGI=OFF"
-		"-DWITH_FRIBIDI=OFF"
-		"-DWITH_GEOS=OFF"
-		"-DWITH_GIF=OFF"
-		"-DWITH_HARFBUZZ=OFF"
-		"-DWITH_ICONV=OFF"
-		"-DWITH_PROTOBUFC=OFF"
-		"-DWITH_POSTGIS=OFF"
-		"-DWITH_WMS=ON"
-		"-DWITH_WCS=OFF"
-		"-DWITH_WFS=OFF"
-	)
-
-	echo "${args[@]}"
-}
-
-src_configure() {
-	# NOTE: We could make this based on _generate_cmake_args, but
-	# then we wouldn't be as-explicit about what is enabled/not,
-	# and reliant on defaults not changing.
-	# Readability and maintainability is better this way.
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CLIENT_WMS=ON"
-		"-DWITH_CLIENT_WFS=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_KML=ON"
-		"-DWITH_LIBXML2=ON"
-		"-DWITH_PHPNG=OFF"
-		"-DWITH_PROTOBUFC=ON"
-		"-DWITH_SOS=ON"
-		"-DWITH_WMS=ON"
-		"-DWITH_WFS=ON"
-		"-DWITH_WCS=ON"
-		"-DWITH_XMLMAPFILE=ON"
-		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
-		"-DWITH_CAIRO=$(usex cairo ON OFF)"
-		"-DWITH_FCGI=$(usex apache ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
-		"-DWITH_MYSQL=$(usex mysql ON OFF)"
-		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
-		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
-		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
-		"-DWITH_PERL=$(usex perl ON OFF)"
-	)
-
-	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
-	# Configure the standard build first
-	cmake-utils_src_configure
-
-	# Minimal build for bindings
-	# Note that we use _generate_cmake_args to get a clean config each time, then add
-	# in options as appropriate. Otherwise we'd get contamination between bindings.
-	if use python ; then
-		mycmakeargs=(
-			$(_generate_cmake_args)
-			"-DWITH_PYTHON=ON"
-		)
-
-		python_foreach_impl cmake-utils_src_configure
-		python_foreach_impl python_optimize
-	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Take a blank config each time
-			# Add in only *this* slot's PHP includes dir, etc
-			mycmakeargs=(
-				$(_generate_cmake_args)
-				"-DWITH_PHPNG=ON"
-				"-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
-				"-DPHP_INCLUDES=${PHPPREFIX}"
-			)
-
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use python ; then
-		python_foreach_impl cmake-utils_src_compile
-	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Force cmake to build in it
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Needs to be first
-	use apache && webapp_src_preinst
-
-	if use python ; then
-		python_foreach_impl cmake-utils_src_install
-		python_foreach_impl python_optimize
-	fi
-
-	if use php ; then
-		php-ext-source-r3_createinifiles
-
-		local slot=
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-
-			BUILD_DIR="${S}/php${slot}" cmake-utils_src_install
-
-			cd "${S}" || die
-		done
-	fi
-
-	# Install this last because this build is the most "fully-featured"
-	cmake-utils_src_install
-
-	if use apache ; then
-		# We need a mapserver symlink available in cgi-bin
-		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
-		webapp_src_install
-	fi
-}
-
-pkg_preinst() {
-	# We need to cache the value here of HAD_PHP because we want the
-	# original package version, not the result of us installing a new one
-	HAD_PHP=
-	has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
-pkg_postinst() {
-	use apache && webapp_pkg_postinst
-
-	# Let upgrading (from a pre-rewrite version) users know that the PHP module changed
-	local replacing_version=
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "7.6.0" -gt "${replacing_version}" ; then
-			if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
-				elog "Note that MapServer has deprecated the old PHP extension"
-				elog "You can read more at: "
-				elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
-				elog "This may involve porting some of your PHP scripts to use the new module."
-			fi
-
-			# Only show the message once
-			break
-		fi
-	done
-}
-
-pkg_prerm() {
-	use apache && webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mtkbabel/Manifest b/sci-geosciences/mtkbabel/Manifest
index 9fcba4850876..c1550460ffa0 100644
--- a/sci-geosciences/mtkbabel/Manifest
+++ b/sci-geosciences/mtkbabel/Manifest
@@ -1,2 +1 @@
-DIST mtkbabel-0.8.2.tar.gz 27896 BLAKE2B 34c2e996fb031a5236313bcd7e07fca6fe1c24d763f5e278494b08f0060875be91fc19f58aa4e011cd5f20a5a795208d856ec125cb7d9644f205e30f3a60f355 SHA512 b3b6c0c9698c165de9d60bb4d574a174b4ee805dc1cb889770dd7c0001378d94a5722e3bf2132d8f6dd888255247fe5e5635a4ef66a6000c68d58403f9756bdd
 DIST mtkbabel-0.8.3.1.tar.gz 28472 BLAKE2B d17363f0b4e95360910039421a26083ab088f12b56c65b0687f7ee89dc9086f8c122ef7d62091cff9df1fd2c6f34835e6712dd0501d95517963c287e8ddfe1c4 SHA512 795d058bf622b5381600fc82a67aa32258db0ce2d1c22f148b6a1b34a6afe585f31fd0a5fccd2743602b55f53fa3b6b0f8c7269ebee1555a58374e33a80d22d7
diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild
deleted file mode 100644
index 99dcd1ab97d1..000000000000
--- a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger"
-HOMEPAGE="https://sourceforge.net/projects/mtkbabel/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-perl/Device-SerialPort
-	dev-perl/TimeDate
-"
-
-src_install() {
-	doman mtkbabel.1
-	dobin mtkbabel
-	dodoc MtkExtensionsv1.xsd README changelog
-}
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 96b2892dfc57..59f7720f7ed3 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,6 +1,2 @@
-DIST opencpn-4.8.0.tar.gz 53008393 BLAKE2B 79184b678db329e98c704f4f1a132e5d3af4a65b104c6eab1c37738cbbf98d88c21647ce654077a8f4b781221d7e3766c35d7450b81befdad7f269b636263c09 SHA512 1f1ea666566e98ee3af24423985119c1b14e184d4310dbc588b00065878b1dcb8fe73a7331e4ad3f75a905774fff187203fb31253faea7238f3d783a6729ad75
-DIST opencpn-4.8.2.tar.gz 59164504 BLAKE2B fbfa86051845a922a7c642194cd0672fbccd6a75e3897e8b0b3f9b08c091d0933a146060f83265c9a85d0bacf18f57a0f9ba55aa4f26e035a77d39d73e5e5a7d SHA512 231f8ba29f8a0343cb3807e52e8535bdade221de65a169b57e94816b4b464407ba90b605dcec21a5c45c742de076b644f076fee88616ec2867a8ae182105102d
-DIST opencpn-4.8.8.tar.gz 59140674 BLAKE2B a03fd28b26bee46d559d16bf061eac409ca9395fdf1595162a51fe4cdfb30c3151c23b30f3396b645c4b177b3fd3b0f2ea03a850d0ea3fe2258f1abc4956a3db SHA512 4fa94655d7b9d389f5f335c15898e7138c792c71b824720fedd762ccd71c01481e5a24598b85211dba0c7d89d0ad0b2ebc2afc38301235829d4aa6f499c6f9b2
 DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
-DIST opencpn-doc_4.1.1329.1.orig.tar.xz 8739872 BLAKE2B 1d0b1538230488586318212d371669d0dfd6fefb45a49c1405c8749cfc2d5b1ced39c03ad7814954db42644ab5c21a37177e0f315b8d6d49c2200508f27a9899 SHA512 652a932edbf8a6f05fd3c64ddf566f817405cf44697035f58ddbf1a99bf92269b7fd9ee83b7ee065aa60db15b6030d8c5c9a4a4001049ed2def9962bc51746c2
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
diff --git a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild
deleted file mode 100644
index a846188eb7d6..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DOC_VERSION="4.1.1329.1"
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="https://opencpn.org/"
-SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( sci-geosciences/gpsd )
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	need-wxwidgets unicode
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild b/sci-geosciences/opencpn/opencpn-4.8.2.ebuild
deleted file mode 100644
index 4488d324a16b..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DOC_VERSION="4.1.1329.1"
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="https://opencpn.org/"
-SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( sci-geosciences/gpsd )
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	setup-wxwidgets
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild b/sci-geosciences/opencpn/opencpn-4.8.8.ebuild
deleted file mode 100644
index bd242464255b..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DOC_VERSION="4.8.2.0"
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="https://opencpn.org/"
-SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lzma opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	net-misc/curl
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	setup-wxwidgets
-	local mycmakeargs=(
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 918e9f7a7b4e..a077a0e2ab63 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,3 +1,2 @@
-DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
deleted file mode 100644
index 06ec976b36e2..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.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 flag-o-matic
-
-DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql
-	https://github.com/openstreetmap/osm2pgsql"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj:=
-	sys-libs/zlib
-	lua? ( dev-lang/lua:0= )
-"
-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() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
-	local mycmakeargs=(
-		-DWITH_LUA=$(usex lua)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index ac4caa5df5a2..552e4a10ca94 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 89be781dcfc7..f65151883449 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-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/files/qgis-3.4.7-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
deleted file mode 100644
index 97f8ac12858c..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 12:41:51 +0200
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
-       SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
-       SET (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
-       SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
--      SET (DEFAULT_QML_SUBDIR     qml)
-+      SET (DEFAULT_QML_SUBDIR     ${DEFAULT_DATA_SUBDIR}/qml)
- 
-       SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
-     ENDIF (APPLE)
--- 
-2.21.0
-
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
deleted file mode 100644
index ec971cef7792..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 00:10:21 +0200
-Subject: [PATCH] cmake: Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
-   endif(USE_CCACHE)
- endif(NOT MSVC)
- 
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
- IF (UNIX AND NOT APPLE)
-   ADD_SUBDIRECTORY(linux)
- ENDIF (UNIX AND NOT APPLE)
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.21.0
-
diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
deleted file mode 100644
index 7e258589f43c..000000000000
--- a/sci-geosciences/qgis/qgis-3.16.0-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,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 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}/${P}-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
-	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/qgis/qgis-3.16.2.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 20c7ef795f74..605add9b6121 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/routino/Manifest b/sci-geosciences/routino/Manifest
index aeda73e4768f..15dba5f674e0 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,3 +1,2 @@
-DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede
 DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
 DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
deleted file mode 100644
index ac54fcf9f887..000000000000
--- a/sci-geosciences/routino/files/routino-3.1.1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- routino-3.1.1/Makefile.conf	2017-10-22 15:55:10.420531850 +0200
-+++ routino-3.1.1/Makefile.conf.new	2017-10-22 15:55:32.180533067 +0200
-@@ -45,11 +45,11 @@
- # Installation locations (edit if required)
- 
- ifneq ($(HOST),MINGW)
--prefix=/usr/local
-+prefix=/usr
- bindir=$(prefix)/bin
- incdir=$(prefix)/include
- libdir=$(prefix)/lib
--docdir=$(prefix)/doc/routino
-+docdir=$(prefix)/share/doc/$(PF)
- datadir=$(prefix)/share/routino
- else
- prefix="c:/Program Files/Routino"
-@@ -74,16 +74,16 @@
- 
- 
- # Maths library
--LDFLAGS=-lm
-+LDFLAGS+=-lm
- 
- # Language dialect selection
--CFLAGS=-std=c99
-+CFLAGS+=-std=c99
- 
- # Warning options
- CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
- 
- # Optimisation options
--CFLAGS+=-O3
-+#CFLAGS+=-O3
- CFLAGS+=-ffast-math
- 
- # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
-@@ -118,7 +118,7 @@
- endif
- 
- # Put the current directory in the shared library path for the router using libroutino
--LDFLAGS_LDSO=-Wl,-R.
-+#LDFLAGS_LDSO=-Wl,-R.
- 
- 
- # Required for multi-threaded support (comment these two lines out if not required)
-@@ -139,8 +139,8 @@
- 
- 
- # Required for xz support (uncomment these two lines if required)
--#CFLAGS+=-DUSE_XZ
--#LDFLAGS+=-llzma
-+CFLAGS+=-DUSE_XZ
-+LDFLAGS+=-llzma
- 
- 
- # Required to use stdio with files > 2GiB on 32-bit system.
diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild
deleted file mode 100644
index be61b65ad789..000000000000
--- a/sci-geosciences/routino/routino-3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Routing application based on openstreetmap data"
-HOMEPAGE="https://www.routino.org/"
-SRC_URI="http://www.routino.org/download/${P}.tgz"
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=""
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}.patch
-
-	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() {
-	emake -j1
-	rm README.txt
-	mv doc/rm README.txt .
-}