gentoo resync : 22.01.2021

30 files changed, 232 insertions, 1012 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f1cfb2f10fc0..116cb8d8acd8 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index 7c7134a502d5..d1a7c10c153c 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,6 +1,5 @@
 AUX jchart2d-3.2.patch 563 BLAKE2B 348a91ce4df3b8c09a08b553a58e66a1515d9a5122299f7a030ef63b8ec323cc5561e221093425520319bd5dd932057f3c8f0aba7cd4f0e339b88969b6cebc14 SHA512 54a95203b7566819e27cae7a0d6ee0a9542817e3b172cfbaf384042c54d1340301114f15b1bcb337ffe7b03a53927cb92be897ef95ede1a4d422d54b00a10419
 DIST BT747_2.1.7_full.zip 9649645 BLAKE2B ec714f90395875c26679ace3ea732effff977dcdf3f7003f6282cd3ac87935956b5fc829a60e98acd8533d7b6fc482bc9c7ee9348f3972b5cf59db5476009730 SHA512 362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d
 DIST bt747.gif 5903 BLAKE2B ae5516dc716ab147b261ea43c0bbb480ae8ab6f3523147fb9fe980e5c53142ac0021448eee3fc7958467a3cd1a38d989f7894112e5a2d5361300e8644b96df00 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252
-EBUILD bt747-2.1.7-r1.ebuild 1686 BLAKE2B ac9407064eb78e8796f269becc75973bc64d10655b61939474b2ee1a96cbf0ee4accb4f5037f98ae3f57e731c164554d7fb9ad9de6c71b237268845e77af35b1 SHA512 d88968187f5219b90dfc4fadd283de43a9d689a1d2f637fe935056198fa81970d8464699facb1832d0888417cdfe328e932db6a10c0f4712670ef2cb29279689
 EBUILD bt747-2.1.7-r2.ebuild 1681 BLAKE2B f694ca9da253b0afa464bcf463cdcf2d241d106d6c22b60c2b47ef61ee847a8efdad0bd1d7a72fa30030b4fbe4700122968099c94b29980e9af42b56ace6a632 SHA512 21ab533fbf8031f47b9cb8fc16b4f108a55c8b6fd0c4a695b60352437668e918b277ced82a0ffba1bd061353c094c76870b9ff7ae0710e9e273bc4616485db1b
 MISC metadata.xml 936 BLAKE2B fe1d0c313ccf8dba751e7b344ead3dfbe3ca148fa57af7348829147353c472865dbec6785442b980ef96ab5e5c7ffd9809bb861d26f6cc959521669bdcd68894 SHA512 2728dc332da587012500de41eecd145f1f9dbbd197612b284be02d7334f67e877fdce8f973e9b3331a03d39653c35f3409dbf3c85a4371c0edb497d0922d2938
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 0d5e3abf4fbe..3720f05b94f9 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,14 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 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
 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
-EBUILD gpxsee-7.35.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
-EBUILD gpxsee-7.36.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
-EBUILD gpxsee-7.37.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
-EBUILD gpxsee-7.38.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-8.1.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
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 74fab763aedb..0a280db879eb 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,6 @@
 AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
-DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
 DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
-EBUILD grass-7.8.3.ebuild 7009 BLAKE2B 2f00bedbadc55b5d323db7918935702b135c14a2e2e2ca536a48bd322ba38186b1f2d511b52d4ebc84ba534bc5d70448bc9b65de7796f16bda8bc3f22b3080f4 SHA512 07d5b4c87ad1b2eb5b2a2193780232f87c6f73e09040e80dbb4d2fb246bbb710f1a79459a7d3e57b35cb715bf0213856ced0a3b146f8e24534bc0b92c6f92dbc
+DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 EBUILD grass-7.8.4.ebuild 6955 BLAKE2B dcfa8baf52539f4ba4463bab98f3229f121738f36fa51f4259011ae5e21f56256022a2d2e3bad442084918985fc6c1a53e0392e4db355e8133fb22be5b6e734b SHA512 dbdad12127ea9558c0a4ed3a22db408f899ef61ad02774f7526fca61409cb22cd66a037136e980e05020faef9083de84660aa6c97513c8d8dd41cef31f1454b7
+EBUILD grass-7.8.5.ebuild 6943 BLAKE2B 64fc8cb0b9cdc76fa3fe37c7f3a5df71317358f555436d6c559adc46ccda9987e942096ada51d0b2a51daad36fbab11c92b5deebb43a83c0f6ea251091e0b4c0 SHA512 836993de1bd2f5c8149930aaa3c289b70eb826ee3222cf7ce2da616d9d1120b7c10c4c03797be6c1acc8754f52054dfaf9d99a18653be968b4aa382bd44301ba
 MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index e8911d37392c..93a559c4a1ee 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..9} )
 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/libtcd/Manifest b/sci-geosciences/libtcd/Manifest
index ce82d5b95562..3dc2b5d6fddb 100644
--- a/sci-geosciences/libtcd/Manifest
+++ b/sci-geosciences/libtcd/Manifest
@@ -1,5 +1,3 @@
-DIST libtcd-2.2.5-r2.tar.bz2 294449 BLAKE2B 82c91beab6f4fe5d6c4ddfdca043a83db01508fca9475576c2f4174d14928acd7c5c56afd2dce2fc741bb2bf61244ed65f63e9298ab5e6d2b3520622b283aa68 SHA512 125b8f4258c576d82f86f75c9dec4e6e0dba8d46e897835ff8ee57cb58495c3f2ae42040719aa8a6f0fa70be40dbc3eb082250cfa197f15f0b23d2ee37a47fbd
-DIST libtcd-2.2.7.tar.bz2 306184 BLAKE2B 77d942adb822d96c86dbda2141acf1e2e30551b70e24bc325f412691149d2dd28a862592d8c0f57a0d528bcfee991613ff81f654a3541be341145a02e5af0164 SHA512 3347539a186c13fd9713752e4c9bb75c50eeee74f85a9126d7ed376f927675af6943fc486ff9396b5504b9d1aa8e33ebdd41663fc1ec5ed8babf4c207be3ce3f
-EBUILD libtcd-2.2.5_p2.ebuild 694 BLAKE2B e0dd4d4644a6b16ee1bcbb38673052c2d88a531c294d52e0e0ccf7abcaaddc48d0d1aefe0be0f7355b7397bfdcfdb2413e0ee5afa651b74506c11affdb4efd2a SHA512 671152db1f356139ecba4fa6e7443372326ed30f405e2bef2b6c8ea29dae2b22b92c49a48f3583b5dd502a6280669378872d5a8c212e414e622bb84e015b65fa
-EBUILD libtcd-2.2.7.ebuild 698 BLAKE2B 9a766231c6f8d8b56c1df9ad3c30faa3363ef5c4b24e3e01c4497ee801f818b8f9dd98c20fdf8631eddf3b7899bbecebcf9237c29f23c2cd5ecacbf41e8b8d53 SHA512 972121b55f67a38180e0b9ebc7e1a19e99f756c1e8c17ab8a7e5eedcdf0b0a774a9beadaf524b5230a841971d866553950ae697d8e8cfbf003f026e61e0b37a5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST libtcd-2.2.7-r2.tar.bz2 308959 BLAKE2B 7c2243cae4c579f71f538be18bb02769149b1a3ba983ea77b1dc84157a2ad494d50e908aaad5ed86cd81d73eee43e0bd6c3b4cebd72113886432ec747ebfd978 SHA512 b67e5b3d43cc51cf7405db5d71bec0a33f884d1a5654b01d7cddf54e7614d3b8d05fafec133e2299ca4687ee9a74295dbd0281c2ddff36906c77cc930bad9ed4
+EBUILD libtcd-2.2.7_p2.ebuild 670 BLAKE2B 44fc4e05f7f071f27c001ae776c470e4a6aa992bbc7041f28275d749a551b3540265bc22e7319bf1d5be647d85a5b31e8f3fd5fc7b8ea8984f3cf57d91147661 SHA512 662056b8bd497dda55f44ffbe0f1a024b6c1b9aead01210639d1b7170d7b7dd1e781a9a032ca92d12c4de47f9c97c8d9752930cb499b93d0e23ff2d624c1b3b6
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7.ebuild
deleted file mode 100644
index 8cd78ebae5bf..000000000000
--- a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune
-
-MY_P=${PN}-${PV/_p/-r}
-DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
-HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P%_*}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-	use doc && dohtml libtcd.html
-}
diff --git a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7_p2.ebuild
index 721ba65e76d7..90837f212398 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.7_p2.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 MY_P=${PN}-${PV/_p/-r}
 DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
 HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
 SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${P%_*}
 
 LICENSE="public-domain"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
 DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${P%_*}
-
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
-	use doc && dohtml libtcd.html
+
+	if use doc ; then
+		docinto html
+		dodoc libtcd.html
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/sci-geosciences/libtcd/metadata.xml
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 5d7cab32079e..3081a0d3cbe7 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,5 +1,3 @@
-DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
-EBUILD mapserver-7.6.0.ebuild 7301 BLAKE2B b9d2f090e15cad539c0976c36c4e2c02456eed16ca725a2ef59ac4cab898f2fd97478f56179a7c606c4d5a8d5aab7bc896c0b0729897a8c0710b26a4245ab1c9 SHA512 36a143de7a376fcee8f3770f22a9be3b5fab29e6df2c438e76000bc8ec144850581735f394dddcb2463d11a60cfedcb558d304a95d863c8137921dfaf5deb175
 EBUILD mapserver-7.6.2.ebuild 7303 BLAKE2B 36c8f9119155751f19d4c693fa305a1f2aa4b7b1c3d8ffcb515888f6c1bf6c32377300ab4f6c9a08644b9eba7d63080c699d8905df3a0ccc16731e036efea9c8 SHA512 ef937ae7b6a16ccf27f52a37bf1731f3731bce6811fac6a22134061a1500a78669e7c1da9e93a8c4738a7267aa94e65a6a13884a5c607c15fdc5416c5708f031
 MISC metadata.xml 496 BLAKE2B 5903d53c86d30548162025cfed484a3405ea3a9bd611d475177a355a374b7a4bbf73d439a1c1457176d3f7f58355da06d842327407437c89cab426473be22bab SHA512 2dc21e4e1a785b4dff3de94bc3c621dfd4c3dfe092761681b4ffc536532f7f87b6a9fbbd0dc82895132ebd3cdb0f5750e6fe77b681c49d5996d9233096478a8e
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 7e15a26e21b7..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} )
-
-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 2cba57561659..ea72b89a2c11 100644
--- a/sci-geosciences/mtkbabel/Manifest
+++ b/sci-geosciences/mtkbabel/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD mtkbabel-0.8.2-r1.ebuild 526 BLAKE2B 7c8a84c8a001322291d424e8349c18c41be4bc69e0da00c01fc4861654e5147d5a6bf8e8e63ee514792dce58a1d3a1898678d99e2b00a1459267b3e7363e003d SHA512 3577edf4c5b46595143d5d6dd4976f5c9ef584bdb6ab2d1b8ca502581ef2fddf723a4775757868b3756d5cdacfebf1d34c4aaaee83e642288faaefae2db85470
 EBUILD mtkbabel-0.8.3.1-r1.ebuild 544 BLAKE2B 3e87d11e714e303be3114a0cb24e2a3fb43c516c3cc1a8fc733483e9d64d953afa8849aa30553986d73e0fdc7eab117cdae81da3aeaf5d6bd0fea2d917f2c680 SHA512 b3f4b1b8fb218021da4a6a49267ca703b8e72bb512bdc6858d266f987546b93081e42364fb014304aedeb0f15e6b15ea31824def73351fe0fa1f34f5b7582275
 MISC metadata.xml 543 BLAKE2B 4a94fcee430a56989882a88042ea7b7585d77458f16775ea2d85c24c86f983be3626f5171e87ac9ef85e60479081e01a75786e52d25c7bd1bf4c5065d5ecae23 SHA512 d12172e151d1f2f0b1b24fe716e8de449067bcd165f25f4ee874881e61dc37c489b41e10753a226626711d744eeb3cf263854d99970bdab3eaed2ad722e0703a
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 b64f76108886..76b76cf510cf 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,12 +1,5 @@
 AUX 5.0.0-CMakeLists.txt.patch 3104 BLAKE2B 33fbedd5960805b783867bc30bc66efe81ce9f0fd839544d23ccbab9b7d50892d8ca6311d01c30bdef83310e8c17210a3564874bf2297832975192cd56e4ddcd SHA512 32e97327c76a5d6028de2026e081b79db279deca45cc3394faf15c632e1567d0bf708f3c81f6d2c0b2d69edd82fd217cf5d0f4970dd27d64d4936c8109eba6ae
-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
-EBUILD opencpn-4.8.0-r1.ebuild 1313 BLAKE2B 7174a87fd86eb26c6b11c01c03e284b479b73c2a4712f999ad4e1c6643c9f4245308522a7782aa34ed9fbfe6cd54cca3b1210f451449732345ac440f79d39123 SHA512 cc59a0eb595d2ae1e17c6d0abddc99991cf21af45b0bd4beb5fd0f6ac40591fa859843866ec25048ab79554302bead1989edb1ebc9440400e90e82e512dd8102
-EBUILD opencpn-4.8.2.ebuild 1306 BLAKE2B aff3eedcf469d37c5caff6ef5a84089c4dc9205ac465d9ffc4ba331c48d761910f734e1f21de4786f5264e8d465bb6307e25960525d15c384310df90521c0fc9 SHA512 51e3b4d7865315afc6d87feee7790b93880f2be7a89067511b1fec67e3b78b56421720e9506f33f9e5fae51ba10fb6cc7f5123b05019ab0ffd14a1307ff88084
-EBUILD opencpn-4.8.8.ebuild 1283 BLAKE2B dee4bc67e81a4f6c2f80bfec70457f7d3da0bb2e50664dc8469f71999f669801ca4008c4081b7b6be3ca2fadb2b36190961dab070707c97b73731ebf278ca843 SHA512 2f9bd6b92ddae00b57a44ac51b08fea06198aa7242dcad41499ad63649da729b328ef3ecdca3683ca774fc972d2c53526cc4292a681a2aa64905894d862cff0c
 EBUILD opencpn-5.0.0.ebuild 1335 BLAKE2B 4e9092ecbd69861a21e16ed83fc8363dbd1efc962653a3f15817ba453729b3079a34f9c0e2891aef66d2f9f5c25f5bf8a0e8eeaaea13e49e9efbbd9ba51c2d5a SHA512 8927a11687c646b349a695cd6060985cb915cdf3e93e164112d69ce69ea5747ab15affcd94e93426f9c16da7c9e51c8a48c4b4169dab8a5eaae012a674faf87b
 MISC metadata.xml 531 BLAKE2B 4c2d7950160138cc8a789d259beb3050af12f9406d376afb70465af18f1a9e979f45e4d6b2bbdb14a9670a936b087b772f29e2dc60289f4ef9e47911e3753e8d SHA512 4315299e7a239d5bdc7edfb6c377217908372e59fe187fe071948fb594100b29bc85116fa458a00233411f47d22780d9c1efeec07cbda6bc3b404a94cab35e3f
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 fd6c3caa99a1..0afa661aeb0d 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,8 +1,6 @@
 AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
-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
-EBUILD osm2pgsql-0.96.0.ebuild 930 BLAKE2B 7a5b8e4557fc0aaa76bbb34abc4dc431e4bf7a8d115fa457a538b0ab124f81cb246d0f340abe7d5366ad63cad42fe875aac570bf3c0cc89357863b0edef3d1de SHA512 3741889922dd3cbebadf15083b56a8a6611c9cec3402f36367f2fc1c510538e05856d8b610e1da06c69f077e67533a909a7a6136cbd5a06c472362c2135b6585
 EBUILD osm2pgsql-1.3.0.ebuild 862 BLAKE2B 2955a1ae1878f95c4a12a822589489a246fa96677b2ec061f02c76d9869cef04023cf728490651b70dd2e63fb74687b9f1802db0478727d799f22e1897a10d48 SHA512 d40667f5eaa3c1f507187b255af0341e7eed3789e9820275a1cca39d9c1cf3eac4dc2be2a4f00ac17cbb9767cfb5e7d6ee56a9cfcf5af36dcc0745d5b9bfcd27
 EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 4988850b6d4b1814b491cc20e709e217ab7b9d5ec6401da434079fe527c39547b7a1f38c8f936bbc21c489d5413e750ea34c4b51158221f9b5ca1555c3f428ca SHA512 b702dc3c08bb55e20940ed7d276f0a20e7cb1ba69b057274f39cc6f00cf91ba2b4717bee0002aa8d7e7c2d0ae584ffd9777b6b1fd43b0bb221a7440d5461e5b7
 EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
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/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
+}
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index 532008a3901c..129099f05e10 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,10 +1,7 @@
-AUX routino-3.1.1.patch 1361 BLAKE2B fd8d68da8ea0d95d434d7b43b3e9ccd89d7b43696e1feea7d6a4440d452b8c4b7f9b6fc684a2683525f4f29c8af6c8b7442f590ceda98be590315f5ace61c174 SHA512 c1f12433b478adc05e74d4da2470c80788b788dd6bef16eec2c76a1d209adece11091b3862ccc4c1d0ee105c209f3f332a05181f0c1f83cb9528369a7f6b14b4
 AUX routino-3.2.patch 1357 BLAKE2B d921a025e377c5a8edb2ae9bd0ba634b7b40b159b97079a64de09ba04cc8b5ec80916fa8e596f85dd2f81959d921ad851537512ebda9a4a7f1d0314d8209ba25 SHA512 f65f123985e858f9c9a1daac0ea0cde3c54387cc7a4c23064630e0e507f90ce767b4c6dd269fd4fddaa3ee1d2b2d55e91f7346f9ca89a001ee5e71155c9cf89d
 AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
-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
-EBUILD routino-3.1.1.ebuild 659 BLAKE2B 6e61c569be646d4970b5c18cd9495988f78cfaed9477008be9d13ce1512d152849b6e12116ef2094cfdc526f6940b27b596b58dc356d53b0db6e2578c89137e9 SHA512 fd1dfd7fc8fc5821e8e7ac976aa04f3d1737509415a5a2451174e6dbe74c8ed5f1638d13cde17bdd1eedfc87c60b638470b49f42cf3e7e0787371395ff92eaba
 EBUILD routino-3.2.ebuild 719 BLAKE2B 2ebcbe7a5356b375512a682696f4bc39eb337f4a9f87362af1f003dd6c99423c4ce168fa2896590abcfc860412068d84ee80face8b3c871499042ab51c092ab6 SHA512 ea8d262efbe278b659b935bce78dcba5b1418d76edaf8f296c62315ee33533e8dd4d218b1f65f87399de63bb7762fe4a0e2cd2752ea3740993d5cdf23e40d1c4
 EBUILD routino-3.3.2.ebuild 1582 BLAKE2B 7c40bf697e1a30b813f5380d3292ac082125e1fe47764f510f6d16b57707e46c4801ccd12c178883293a6922cb521a309a7b2c7502e56dab45a260c37dd836d9 SHA512 204f1baf45703698331da9b38a4f841d18c25ae4383420bc94a5f94ec0771ccdf7021402bcecdc0c795efa732083510a1ac07c8d1bd93872cdd8fa7941967c76
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
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 724e40b20799..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="http://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 .
-}