gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-geosciences
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
112 files changed, 982 insertions, 986 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c80c7df122fd..dbebf3b6ea7e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index d1a7c10c153c..2f48f2d5463e 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,5 +1,5 @@
-AUX jchart2d-3.2.patch 563 BLAKE2B 348a91ce4df3b8c09a08b553a58e66a1515d9a5122299f7a030ef63b8ec323cc5561e221093425520319bd5dd932057f3c8f0aba7cd4f0e339b88969b6cebc14 SHA512 54a95203b7566819e27cae7a0d6ee0a9542817e3b172cfbaf384042c54d1340301114f15b1bcb337ffe7b03a53927cb92be897ef95ede1a4d422d54b00a10419
+AUX jchart2d-3.2.patch 490 BLAKE2B c676f77a4d7db06a61b445c85ad551aa1510820599e43e8d98d9803788f829da80485e2e3dfdd0e20c4a57c48acc8a5d2fbad7564930cd849c4adc3c1d615669 SHA512 75f9d1d9cc3cd5c6ce4f99dc6c68b97f4566fd5841d04f5d21fcc44294a8bb6c8046599180564ed9d0e6760bc1bf16a44ae817b07952303fcbd6c1b3ef774641
 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-r2.ebuild 1681 BLAKE2B f694ca9da253b0afa464bcf463cdcf2d241d106d6c22b60c2b47ef61ee847a8efdad0bd1d7a72fa30030b4fbe4700122968099c94b29980e9af42b56ace6a632 SHA512 21ab533fbf8031f47b9cb8fc16b4f108a55c8b6fd0c4a695b60352437668e918b277ced82a0ffba1bd061353c094c76870b9ff7ae0710e9e273bc4616485db1b
+EBUILD bt747-2.1.7-r2.ebuild 1679 BLAKE2B 4996b52ed0eec50728c21a997dc8643d95cf1033fc44ac47ca210db0549f1486bbd25e102bdc759031d9860f4ba871c4b234df1a993c2809cc77f8b221204805 SHA512 4fe7caa4ba468c8959f23466e383aa5b9615b4b5d76d4b89b5899b450e659727e60c4872c927df6c2cc2ca7d9d70cfabbf5ba58d653b26687627a1b91936d6ff
 MISC metadata.xml 936 BLAKE2B fe1d0c313ccf8dba751e7b344ead3dfbe3ca148fa57af7348829147353c472865dbec6785442b980ef96ab5e5c7ffd9809bb861d26f6cc959521669bdcd68894 SHA512 2728dc332da587012500de41eecd145f1f9dbbd197612b284be02d7334f67e877fdce8f973e9b3331a03d39653c35f3409dbf3c85a4371c0edb497d0922d2938
diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
index 33434af2b114..72062ed3a7cf 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils java-pkg-2 java-ant-2
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
 HOMEPAGE="https://www.bt747.org"
@@ -46,7 +46,7 @@ S="${WORKDIR}"
 
 src_prepare() {
 	# Fix for newer jchart2d.
-	epatch "${FILESDIR}/jchart2d-3.2.patch"
+	eapply "${FILESDIR}/jchart2d-3.2.patch"
 
 	# Remove all the bundled stuff.
 	rm -rv dist/ lib/ || die
diff --git a/sci-geosciences/bt747/files/jchart2d-3.2.patch b/sci-geosciences/bt747/files/jchart2d-3.2.patch
index 8f81a5a4a59d..c1dfe9fb2851 100644
--- a/sci-geosciences/bt747/files/jchart2d-3.2.patch
+++ b/sci-geosciences/bt747/files/jchart2d-3.2.patch
@@ -1,5 +1,5 @@
---- src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java.orig	2010-03-08 22:15:41.000000000 +0000
-+++ src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java	2016-02-10 22:17:02.188118721 +0000
+--- a/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
++++ b/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
 @@ -46,9 +46,9 @@
          heightAxis.getAxisTitle().setTitle("Height");
          speedAxis.getAxisTitle().setTitle("Speed");
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
index 15d2c75ca35f..d4ea3d131327 100644
--- a/sci-geosciences/congen/Manifest
+++ b/sci-geosciences/congen/Manifest
@@ -1,3 +1,3 @@
 DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6
-EBUILD congen-1.6.2-r1.ebuild 651 BLAKE2B 5b84a13e541f8abe0b13c97d391ed590e80118470318c8297d94dbdff57ba96ce59897ce6a5ea7738a0dc83f872f87d1b423ed78971e2a50844018d81288dd3e SHA512 e1a7f276e0ae2faf6fa86f1b6071d310024e06e8d82fd84cb059daa294a00551b9005be9bb50d95948ae866b3d08d8c3cb9b097c9f35902baafd818d307f05ee
+EBUILD congen-1.6.2-r1.ebuild 644 BLAKE2B df76ae478b73787083db7d8fac3dded7a6f3db20ef8609ff64eb878be0e703940a37cf2629da092913b09d93501ae7466b633a839ab8f21132f7dfaf123ed0c4 SHA512 21aee012c5b44e4d712872bd25ddc80a982bf31fc4202489f8fad8fc24e42bd35fc99ce3f496e00fbcf58371978d61b1e3fa81106106ae93b9298947dc04e12b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
index 836376243323..9bbfd8b6ee37 100644
--- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild
+++ b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils ltprune
+inherit ltprune
 
 MY_P=${P/_p/-r}
 DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents"
diff --git a/sci-geosciences/gmaptool/Manifest b/sci-geosciences/gmaptool/Manifest
new file mode 100644
index 000000000000..0ec009c96f13
--- /dev/null
+++ b/sci-geosciences/gmaptool/Manifest
@@ -0,0 +1,3 @@
+DIST lgmt08220.zip 272383 BLAKE2B 94746ed28300a1db836993c3bb46def08b7961259d760f9f20c57e132ae5c9e077868dab5f98399d0975f947b78dbc602a5ec3393d01ba63998853c348628f22 SHA512 fba72ea07bdef216f7397a77c1918000492f79f66699aa0b1dda4d154638108237172a85651516c457b8ab7859ed1c5110e9d34247ebf74597329a0ab920c69f
+EBUILD gmaptool-08220.ebuild 472 BLAKE2B 92b28cd21565faff73c9e1d87b5cf89ea684da09db78bf8434edc90fae944889acb75938f00fe83963849da9a8cbfc11ada446391c4c53ec031919c4469473a4 SHA512 aa46802b58600facdf149098c9efad736c70555defe0fec03383841d6336032c325ccb1d4457d7eaf8e9b72d6d448da66539ff41e19cc57e8be6afbe8e8c6279
+MISC metadata.xml 580 BLAKE2B 08da287b418a81f18c7b2a212d7769732dbe12c5041b8436226bdb65ee41605d03e7620f53351a505339634dc607c996c494caca61c26b2085f03474789a369d SHA512 38adbb31a9f85cb9e5f3be75213ca27c3bd22852804275a83f8d57f1a4a19e7964552c4dea5f204f145bc34e1bb280398574333e47ce1ba5bb85edfcebc676de
diff --git a/sci-geosciences/gmaptool/gmaptool-08220.ebuild b/sci-geosciences/gmaptool/gmaptool-08220.ebuild
new file mode 100644
index 000000000000..54e37f3f938a
--- /dev/null
+++ b/sci-geosciences/gmaptool/gmaptool-08220.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Program for splitting and merging maps in Garmin format"
+HOMEPAGE="https://www.gmaptool.eu/"
+SRC_URI="https://www.gmaptool.eu/sites/default/files/lgmt${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-SA-3.0 LGPL-2.1+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="usr/bin/gmt"
+
+src_install() {
+	dobin gmt
+	dodoc readme.txt
+}
diff --git a/sci-geosciences/gmaptool/metadata.xml b/sci-geosciences/gmaptool/metadata.xml
new file mode 100644
index 000000000000..263a3db75259
--- /dev/null
+++ b/sci-geosciences/gmaptool/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		The program makes the following operations on map files in Garmin format:
+		- join several maps into single file.
+		- split map into files for Mapsource,
+		- split map into parts,
+		- write corrections into original files and insert a new unlock code,
+		- display informations about maps.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index abadc1b587c7..eb913d8df40d 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-maps-3.36.4.1.tar.xz 4006432 BLAKE2B c5c51faccee3e67be08279748dde270716ddf773266f678d1fa573ad4dbf9af95ea53c5c4e548e1c2eb296030371bd693f301ad3a43d2d88e00ac77121ca7834 SHA512 e63f8fe0b0c9226e8393bba4f4db6bc655a45cc869bb247ae51bdb06d69ca29785c562f98294c079cc3fc5c56276f10152c8c8e0ec8d46399918d9cd155e63d6
-DIST gnome-maps-3.36.4.tar.xz 4006520 BLAKE2B 4fb76e23580556c357c5a4a246a250521472a4b264264ea0e6172b2a61583f63e297fef29060b1b30a8978e509820d22eda2e6d56eda69f97e25e9795dcf38b2 SHA512 530ccc0a25c0a1fee2411ecc4034981210836664acc7adc6aa9cff9304e2499c1205f9c27b6b692fdee152fe1750541a1966d59a60958f3592682a5e110d490f
 DIST gnome-maps-3.36.6.tar.xz 4006804 BLAKE2B 4d7684a13b5bace21e7a9d6b97b9b4b91a6fc5cbdbc98c1a776f157c5b1747b16669602e6167afd254d4fe72f8c4d7c9ac27c22089efd07839a6f35bf68b1c31 SHA512 bd72ede45edf851fdbd815278838c34b42145fcccb18bd33ff5e732238797eadc0fe4e0279072c0dd9bfd7b5d88329d8e537ceb3072e186fbc213d63cdef1e72
-EBUILD gnome-maps-3.36.4.1.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1
-EBUILD gnome-maps-3.36.4.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
-EBUILD gnome-maps-3.36.6.ebuild 1394 BLAKE2B 9fc4b208bf5956d96b044864d887ca7e43b00d63de07d213d1f1f97d07ae8bc47132b75d84f93167e92a24c6527c32c1146acec2d0b0c396449739eeb0609115 SHA512 38839b6eeac13515120a731552f3a332689afd7520890f43070fa57e8b1e56eb146abc7c77650326677a46920c93409bb7ae60e3db062e3db12497727196dc8f
+DIST gnome-maps-40.0.tar.xz 3540952 BLAKE2B c41a79ce5966a3dac903caa7b98651b7734d8a55b37de5e330e34dd0db0f146a6ca247c82a8d0f07ec5f55b1efaf40d6f86d4fc35ff750f09a565c0edcde6702 SHA512 6ace3c43b1578b278e39fd27dabe9ab62a4ae80ecf1fb42fe3b8e3e208d43e6fd3325b4c61c6de7c05fcc3321178d556d8fafe0e6d2c7c0a924248b9832fa25e
+EBUILD gnome-maps-3.36.6.ebuild 1395 BLAKE2B 9fbc0e4599e1c6471f704eb742c50264a07c61e1f125c2ba48ac9c026489ff9194db57a97d9dc15e88e42555f55e1d60f66c52d1fba4969f709e15ac432d727d SHA512 abf9ea43d5a4dcb4b2549ff99b30e6f3ec243b617631c68024bf5ecc4d773ccf38fa32ab311418665f20586386b2564ac875503c2e3c4fa0e097d674c84b1e7c
+EBUILD gnome-maps-40.0.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild
deleted file mode 100644
index 7927bfa15a56..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	x11-libs/pango[introspection]
-	>=dev-libs/gjs-1.50.0
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.7.90:0.7[introspection]
-
-	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	net-libs/gnome-online-accounts[introspection]
-	net-libs/libgfbgraph[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/webkit-gtk:4[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
index cd66078597a1..1f388bc0f3f1 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
@@ -20,7 +20,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=app-misc/geoclue-0.12.99:2.0[introspection]
 	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
+	>=dev-libs/folks-0.10:=
 	>=sci-geosciences/geocode-glib-3.15.2[introspection]
 	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
 	dev-libs/libxml2:2
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild
index cb8141452d75..eb37149677c7 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.36.4.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="A map application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
@@ -13,14 +14,15 @@ KEYWORDS="~amd64 ~x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
-	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/glib-2.66.0:2
 	x11-libs/pango[introspection]
-	>=dev-libs/gjs-1.50.0
+	>=dev-libs/gjs-1.66.0
 	>=dev-libs/gobject-introspection-0.10.1:=
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-0.84:1=
 	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
+	>=dev-libs/folks-0.10:=
 	>=sci-geosciences/geocode-glib-3.15.2[introspection]
 	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
 	dev-libs/libxml2:2
@@ -37,6 +39,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index ab1aa15445e8..ee8d54f66ac4 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,5 +1,5 @@
 AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079aeb06a3e7db3be5fd47f5b84e38d42a9ef6ff3f5b63913e66ed1b39af7bc821c6d6c13cf33ac4015fca141dd9b66c682005afd SHA512 d7af75d0f513d9104c3a39e191447dc1269cf3fc59c3289703e298f8e671a96849247e2b979153fee9f70469416e249e5dcd6f6ebbacae4eb2d52e1897a326ed
-AUX gpscorrelate-1.6.1-makefile.patch 1609 BLAKE2B 717dce73444a68d09658b5c3c446e27ff1b7666584eadaeeb862d87dd8ad44983e30b1b24fa4387f50032bf2dee671ce84af3bf168d3743768d270c412b36be5 SHA512 274a3db1a2a752338966beae989e2075f81b6d51b1d7f51d9810d7b6e01ea581468e2add05e631f6f8626ee234a6c7e700cf90ce7dc08a7d5c5cad282a6f7f59
+AUX gpscorrelate-1.6.1-makefile.patch 1447 BLAKE2B b48b6de5b627db142ebbadaafe2b4ce22769dae4427212395b99cfc8232c34ce4c058c4c9c588fbc5bb1f75bc81b69123b92c293322085a630557de3618c4153 SHA512 a2fed7e019b5188df59898f194e56d1740e6a46f034595ba40a9280202181615039a2732c51700b1150e152e82c6d644aee0669feb56fd19bed568553a667044
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
-EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
+EBUILD gpscorrelate-1.6.1-r2.ebuild 1082 BLAKE2B a43a77ee072918bda8379376cb49f9594d49a8f1311d903b779e798398f9c4da6500d73b1eba8f581b3a4692f984fc5ac35a96e91e035c8d107bab14a88a1085 SHA512 42dd15a8e4e1ba0956fe61d2f4f7fab0ca67a4a2e9b5cb8422c8e6f64b8a0aa468fa85d80d1e3f9324a30e23a467605ac5bc01d8861222550fcdc89219296c71
 MISC metadata.xml 356 BLAKE2B 5940b7180c605a14dde832a8a7aaf35a6251f8f169d6cfa5a7399dccbc2fb09c8b1c5c9b8b23eb00f7e5ee286ce805b63faa929fb5c7b2066c3d48615e79e5ed SHA512 61e0dacc7a9a3a6b8ae5e485e5174df1b0c8e061419dbc7abadb3c56b5613c2cf8655eab59244cffdff4d0e56b61ca087eaaf9922a45e99014063201f832a631
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
index f48dba1882f2..82bd63545dfc 100644
--- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
@@ -1,6 +1,5 @@
-diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
---- gpscorrelate-1.6.1.old/Makefile	2011-06-08 13:51:06.000000000 +0200
-+++ gpscorrelate-1.6.1/Makefile	2011-06-08 14:13:18.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -4,11 +4,15 @@
  
  COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
@@ -10,13 +9,13 @@ diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
 -OFLAGS   = -Wall
 -override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 -prefix   = /usr/local
-+CFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
-+CXXFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
-+CLIBS = $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++
++CFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
++CXXFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0) -I/usr/include/exiv2
++CLIBS = $(shell ${PKG_CONFIG} --libs libxml-2.0) -lm -lexiv2 -lstdc++
 +ifdef BUILD_GUI
-+CXXFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-+CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-+CLIBS += $(shell pkg-config --libs gtk+-2.0)
++CXXFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
++CFLAGS += $(shell ${PKG_CONFIG} --cflags gtk+-2.0)
++CLIBS += $(shell ${PKG_CONFIG} --libs gtk+-2.0)
 +endif
 +prefix   ?= /usr/local
  bindir   = $(prefix)/bin
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
index 859bf5a9d68f..7f1c8c38fc5e 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ DEPEND="
 	media-gfx/exiv2:=
 	gtk? ( x11-libs/gtk+:2 )
 "
-DEPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_compile() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 	local opts="gpscorrelate gpscorrelate.1"
 	use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
 	emake ${opts}
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 6cb71d741bf8..a2faf6c1cee8 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -4,5 +4,5 @@ AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
 EBUILD gpsd-3.21.ebuild 5665 BLAKE2B 11b5f6aa26daf9a137bc5e28b555b8259c04f8af45aa6b6c259f7bbe6ae3484fde307c81a4c45a8f06e11e002b04f92da44f12670c0ff5faeaad19ba4227db24 SHA512 a57f817fc903d788e656f815ffe585cea0850f027aa525057a04e0191cc79be1d262cff2b87dddd4e4d6b2ccd1254f0d91b2872a8f6cc55ec3def68c4b7601fd
-EBUILD gpsd-9999.ebuild 5520 BLAKE2B fdce2ec80f8fe8303dba2e6d330b7ce30af94e40094842d4b87f94893721223bfa8dade411da2b238249904084fdd4a6cd39d05b072aae46e398df75f163fa55 SHA512 f802d7507acb413d07955d0b5edf6fe285f1949840f84b562330a22e553ab8877e63418c22700511c739cf08239e405dcc4a53d78bd7bd499ef92075b6deac69
+EBUILD gpsd-9999.ebuild 5513 BLAKE2B 8af1ee322dd394339e32468c2c14db1cb3e1f990294591fe018b90c319763e64811e7923d8f8c046b2f0b2e651eecd3f52a231391518336eaa3478edb3739968 SHA512 de4ef72c43eecac310ef856755a7b94547fba023ca1d6fc8a138dab922541c7c4315a8b9ea287b307b99a340b8e3cd4d3fa4d922d5e5063b87820f1cee2b4084
 MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f34a81133689..fd54dc05ae27 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit udev multilib distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 632ad5628f3f..58e94d5b7095 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,10 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654
-DIST gpxsee-8.4.tar.gz 8156963 BLAKE2B a2bbedf8a64655aad192cf436b762cc99f280f2bee32213a4d63476e48510b4a4697f474202aefa55d74c74e1f3eed48c58dc391aace1b76f431427e42a8a8c7 SHA512 8650e8e7d2bd4cef87f7a6554964b5599223ef2f69a64669c3e6f0fb25dabf93de9278d3016f4f141adb4cdd173a5f3812b7bcf147fd228765e06e23f066a9c4
-DIST gpxsee-8.7.tar.gz 8413467 BLAKE2B 96d4981c48c9d1e3c731a630f6d0d972b19bf23427f00920598854b2e77e3ab41470fdf64450c505a24c401248b169a63e4726ca2f223c4ac72fc81da5bad06d SHA512 6a0dbd6d34df062e8597314a47e0233bf222623fc396272572450b2e7ed624afbfb8f2bf065ab012d836e09fad7675c7338b4eb4d3822ab5780599a90c9df5f7
-DIST gpxsee-8.8.tar.gz 8413193 BLAKE2B c497d79174668d3d16e012458d6e0d177d1db4c7bf73b7c1b2ecc24e322b389acd338295a21dcefc0275680e7b6ac2514e922f32c7dba56d37346dae6d0c6905 SHA512 2abf0f67f9199d7db66540a77bdb37859aebc0236562df7d9d7afb221fa6a4546d0e026b312b73ecf5de7ecbed1feaeb4d1e0879d3e8cda78c0fb08090e4d903
+DIST gpxsee-8.9.tar.gz 8414586 BLAKE2B 540dfd52688358413c92580e4213873fedf1cc11418c6e199f67f74f6a4f1b2c9879720cf7f5c791fa6099b88fba0486ec5e516fdf090e04c5ce7b5f4fcf1b75 SHA512 262f1eae598f45196f6f9b167ef522f2af05c2481eb6c7873bae07b35e9eb35da6cf7a067bb3bd32922ec991901f53408040ceba967fb913caf079c1358221df
+DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
 EBUILD gpxsee-8.1.ebuild 1120 BLAKE2B 53dd31df042597a342e3495385a922664d7fdc5d6ef902be6af26d7fddf6db68df5c466390ed32f2a64231b0ed12de58c1f411f3c3cf36d746def905819230cc SHA512 47d9b1ffac436772f4bde3eadfa6a00419f973b547b3b8483e453db52f5304a0ba5923c5d88c2650182b3157c0dca71c3ccf3306c2e828c170975b48fd02c40e
-EBUILD gpxsee-8.4.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
-EBUILD gpxsee-8.7.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
-EBUILD gpxsee-8.8.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
+EBUILD gpxsee-8.9.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
+EBUILD gpxsee-9.0.ebuild 1125 BLAKE2B e62b2c1c8ebd1983d750118349b8384cb23c7a4cafe159c1fe6acc3ccd0efd70eefdc2bb2ddec61d62b661398c86eaffb33a1eceb82f4d52e93d9527042e3d79 SHA512 089e7d6f0ca2f3aec138421512b3d20e363e0e036b46bd1ca71b16228c5dc31821261fde3e78c1175ac5e3818e13b36858239b22d33503e91c581f4736705dbd
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-8.7.ebuild b/sci-geosciences/gpxsee/gpxsee-8.7.ebuild
deleted file mode 100644
index 950a8b5cfcfa..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-8.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
-inherit desktop qmake-utils l10n xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	l10n_find_plocales_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	l10n_for_each_disabled_locale_do rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-8.4.ebuild b/sci-geosciences/gpxsee/gpxsee-8.9.ebuild
index 950a8b5cfcfa..950a8b5cfcfa 100644
--- a/sci-geosciences/gpxsee/gpxsee-8.4.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-8.9.ebuild
diff --git a/sci-geosciences/gpxsee/gpxsee-8.8.ebuild b/sci-geosciences/gpxsee/gpxsee-9.0.ebuild
index 950a8b5cfcfa..6f4915f07d57 100644
--- a/sci-geosciences/gpxsee/gpxsee-8.8.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh"
 inherit desktop qmake-utils l10n xdg
 
 MY_PN="GPXSee"
diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
index 1f728175e789..da23c1614409 100644
--- a/sci-geosciences/gtk-g-rays2/Manifest
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-g-rays2-2.05.tar.xz 898216 BLAKE2B aeba28398ba4be7dcbbfdae48dbf87ab4f6e9e9401981e4626187ccccc352793e39fee5518ece2197207c260b50b76cbfd59cad716fecb12e789a7577b4f1db7 SHA512 673d6e756f1a827e1c0de5384f3228e69a00a56588b81528202e80f5d2067213fd9fdb5af22028fcce0c4ea9e4d1b708accdd5777628ded351e3f2b6f2f57e41
-EBUILD gtk-g-rays2-2.05.ebuild 862 BLAKE2B f3990575eb57b8f50b08497fd711ea29077abea1a2e0f782a0e60fd24f0daa9d27e45287dafef7bf8b3c6ea4ed1eb0b2cbb5a6adca286f1141a4f60125726d83 SHA512 888ffb41b55babc4af9463d1a9da9686548a90af75728361c3463e5657fd23d5a62abd8b02f0c173827621d0ccba29017c04775fac79f674a473bb2300fed877
+EBUILD gtk-g-rays2-2.05.ebuild 863 BLAKE2B 8e0c268965f3427de19617fc7fcc75b6def9f7d457aa6d81ec463ecaa659fb723b2caeb42488c29224f70cc1ae4f717de21919ea78a29fb3cc288a7371b9289f SHA512 ea7d89ae618c29494ce8f83d98eaa2ebb21e42d6cdb9c546c320a88e95a4625ed1824a3d005fa6e42cbb2a54e9d8a3c9bcc6271d58f5fe8ba08d7358ff302f53
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
index cae8a6436b4f..00bc08d3f4cb 100644
--- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="
 	virtual/freedesktop-icon-theme
 	net-wireless/bluez
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext
 "
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index a4a3f402b616..a52dd986914c 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,3 +1,3 @@
 DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134
-EBUILD laszip-3.4.1.ebuild 428 BLAKE2B 50dddb05bf3369dd3f8557191d5149d5758b1b4856b235ec566d923c42c8d76d83967cd02024cab0b2b1bbaeb53b9d7bc9786c41e22538bde2b1b95d774185f4 SHA512 c4b480149e6f228a17f26b05e1928aba922e9b9e3c270f82beecf7f7acb28c162c79f143ddfd81e9fbdf686055817bdcb348808d47b56f3aee06812437a579e6
+EBUILD laszip-3.4.1.ebuild 440 BLAKE2B 1e7ce6c49e4dac3918cb8687ba10a2b723ac23999f410e8082defbda7205e1d46fea73f9f8fe2e6604216a0651db328c413984305a5821c68ddded5d874c9043 SHA512 223509bf00a1474063f00d5d4506cf127ff545a57591641ea8ab3ab9dd4812c39651201130d2cff3ec65bc16c90b293e526398f33136918a68143e0816dfe0ae
 MISC metadata.xml 347 BLAKE2B 9eb14d58c7479bf68117e304a23a243a75a4eac29efeecc2dae49c62bc45779e93ff25b6d9f8f2e7960c8d610c2a7173086dfdddd50e744b1e712e85df3e2202 SHA512 48d9f074036c25c5461cb8c95040ffe768ea2d850395c58932e4ee006fe6caa0ef44d510a66796aa6251e4f60d4096aeac0cc8edf31612ac8dbab9a86f20b0f4
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
index 242f5063c11d..a3586d0fa6c5 100644
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.1.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
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 
 S="${WORKDIR}/${PN}-src-${PV}"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index abd9f4dcbdd9..02c9d06bfb8b 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -6,5 +6,5 @@ AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4e
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r3.ebuild 1381 BLAKE2B c62ff8dd074ba7af4bbc3fc064faf2cfca45c45e31248880af9ccd8af12446cdd7b3aa277004a8d0699cf8bd1287777a3f144f68a34939deabab977718b7a52e SHA512 34712d0608891a4579a6e159dbb6d614fb564f17635f4c301ab133250341fab50097fa302ad4d0486d2ac3ce2a5e8f4809737f37e1e71512ef2ac56059c7754b
+EBUILD liblas-1.8.1-r3.ebuild 1393 BLAKE2B c66c7b17584d630539ed3f0c6e7f0e1d531fc2c4a2f16374779a97d281be3131c9f3544674f1c93591468589cacb42ebe60623b38fe11bbfc61f8e4ca9b5c14b SHA512 bdd272b2c3ae0753d48b61b0cca6df414530174f13ee964e4affc02728d58fd69dc5cee0f6122e0619a1b9635193e48363729175567e905649c1fbf7c5a1f0d4
 MISC metadata.xml 376 BLAKE2B 7e5aa05cd4b685c24db98a22655379d25294b99a9f25570f6ad8e91722ee6e09dd560cfc5af03efc2a467c82beb1120288b144fea35e7d09eab93cd154ed9039 SHA512 7f745f6aaec1b9233539d9cd868100daf1fc5dbde3aae27ee7ccfee681f0a2fa13f427921c1685bdac48f7937a60d9fa0f8db11af26e5af6a65522ea4fb64375
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index cee50e9a5456..0714f93b9b95 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="gdal"
 
 DEPEND="
diff --git a/sci-geosciences/mc2bsbh/Manifest b/sci-geosciences/mc2bsbh/Manifest
index e22b30aa6437..9dc988635d18 100644
--- a/sci-geosciences/mc2bsbh/Manifest
+++ b/sci-geosciences/mc2bsbh/Manifest
@@ -1,3 +1,3 @@
 DIST mc2bsbh-beta09.zip 116369 BLAKE2B e6182ed2c30795b0264db061755bf5793c4174e3e1e7a2fa09a11a4fb339170786db355e94da2ae00106b5e1e913f1ba75fda7b3c779b36ba20bddc04de1f0db SHA512 b3d69535f1e140308a213c66d5146095215ebf4ba0be833340ff675da621deb0c7b9f395f02d3e40be630b6549b5bc1c5d2ae8012c4123f89b1b4132fc0b6fa4
-EBUILD mc2bsbh-0.0.9.ebuild 540 BLAKE2B 77c630a9177f30e7478cc44c2efe86f036ad2cbd7d77a61def27718d7fe6bb6f494843241bf02a476df6f97c7a010ab3d628472cc568fc8b04dd066d540a2832 SHA512 e4aa6d69f146a514a74f5edede3acd2a5902dfb394c4ceb1007567c86d2d7fdc75b0e61b975168692144e9649f4aa3b2e6a189d575ddb97d8733f63d5f5c6b7e
+EBUILD mc2bsbh-0.0.9.ebuild 521 BLAKE2B 067af32ca6acfa296f4052b3a13724073d4a76d3c045dd2dac61c0464aea2cd318a09e49940a8bf13f111aeefd989293b1a549cdd8cce1a52d18eae33b65c158 SHA512 2217e5eabd488baf4aa90f893a437cdcdc9aab9c3026be1866aa51658806cc340d8698228cd56a35a0b5e314dc9ae7e44d42d26dfa7ba9bc187d6983269c2b26
 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild
index e917dead5525..e0cca9298683 100644
--- a/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild
+++ b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.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
@@ -8,16 +8,13 @@ inherit toolchain-funcs
 DESCRIPTION="MapCal to BSBchart Header Utility"
 HOMEPAGE="http://www.dacust.com/inlandwaters/mapcal/"
 SRC_URI="http://www.dacust.com/inlandwaters/mapcal/${PN}/${PN}-beta09.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
 
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_compile() {
 	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -o ${PN} ${PN}.cpp || die
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index b751eab6ab70..f46aba6770a4 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,6 +1,8 @@
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 AUX merkaartor-0.18.4-qt-5.15.patch 831 BLAKE2B c56bfa01bbfdc22aabc6d8686708c21e5c6530647dcca915af41db164db1af47975ad414b060715e5ff6cb29b9b636e68fca6cb9c0d0d2accdc23a1c2d239988 SHA512 ef27cdb17f3c96dbba8e572edfa0e15991950a4bf57ed17f9088b5e0593c1287c68bd907d6683cc2043ef25c4f0c71e084a01c9b7e3e1158fb1934060841a179
 DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34
 EBUILD merkaartor-0.18.4.ebuild 2430 BLAKE2B 12d16caabf19e1eb53eea8d95713f74fce41e50bcc2ec5c75f3a7544a96928504a033a9d1292093a4d0070da0a1eb9f6342f633515e465441433097f4713e4ea SHA512 15c98ac9b2173afbafabb255a5516634c77dbaf127d5233f94551165b69a8216c0cfd8a8abd64376d4a4a1375c4ea8c0bf20377046aadada96fe80c5edf90024
-EBUILD merkaartor-9999.ebuild 2533 BLAKE2B 8962729b3afc4066cfcab4fe076845b919cc17ac725d7c24af1a9b0da7fa5dd23784e27d34fa4c6579a098ef60346e62b4042764a74cf51dd8d5746be5a7a1e1 SHA512 cf5fa7525b1de10b457c1ea28b8f21d3596773302308b2194674242eeabc50190c38111edf3acd54ab9852f4998b8c4c46e979f7ce7a2392fa2c3f8dd0826766
+EBUILD merkaartor-0.18.4_p20210410-r1.ebuild 2899 BLAKE2B b4017262b9ab547dd962aa1dc58e483344e9a1e8fd881a7ccc68c8364dca403f0b8e305a97eea036c7b75d93df6ae34a7ea4a30f4ffa4af99cd53d622f045b15 SHA512 f08fd7cb99dd937f7c9f3dc0a9acc5673cda9744cebfffeedebbc742713bca66e5dd2528076e93e7b0b421014ab3f7595f713dc7d2cd5179444be6cb4ea93726
+EBUILD merkaartor-9999.ebuild 2669 BLAKE2B 9c122ae6d8a68cebd7b87074a7ed72617efcddb56cfba92cd82080a9191e3f3208701d6763c6ee822dcc01ce8481d8930887c57727028c90e260d6726f91dd29 SHA512 3bca50d3694f1289d47c97af46e75194f23b5b3dfc37ff78311c83ec45d1206c1342d1f58f170cdafed11e2216d48edf236e5d4c047623e7869ad5132593e490
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
new file mode 100644
index 000000000000..49fce917fa1c
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+inherit flag-o-matic l10n qmake-utils xdg-utils
+
+if [[ ${PV} != *9999 ]] ; then
+	# Needed for new Proj API support
+	# bug #685234
+	COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c"
+	SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug exif gps libproxy webengine"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
+	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
+}
+
+src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
+	# TRANSDIR_SYSTEM is for bug #385671
+	local myeqmakeargs=(
+		PREFIX="${ED}/usr"
+		LIBDIR="${ED}/usr/$(get_libdir)"
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+		SHARE_DIR_PATH="/usr/share/${PN}"
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations"
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+		SYSTEM_QTSA=1
+		NODEBUG=$(usex debug 0 1)
+		GEOIMAGE=$(usex exif 1 0)
+		GPSDLIB=$(usex gps 1 0)
+		LIBPROXY=$(usex libproxy 1 0)
+		USEWEBENGINE=$(usex webengine 1 0)
+	)
+	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 8ff9caf11e1f..4cdd436ca64a 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg-utils
+inherit flag-o-matic l10n qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -71,6 +71,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
 	# TRANSDIR_SYSTEM is for bug #385671
 	local myeqmakeargs=(
 		PREFIX="${ED}/usr"
diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest
index d872eb0ddb79..1c4c7e20cce7 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/Manifest
+++ b/sci-geosciences/opencpn-plugin-br24radar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-br24radar-2.1.tar.gz 3947426 BLAKE2B a850973caa64ba4855d97e9374a5e40e292fd0df47a783a711453c49a07f3d945e33247a6199c5c1378dcc1ae29c2e4707675a12b02d3abbd8a115eaf107470c SHA512 357553396fd020e192dbbd5a05af1cd9e06c99244b426239a1d0aac4688affc1702bc16b62010236fc3af1ec7356f1dfb49e3afe3a94cb4dd7b1e0a2ef007af3
-EBUILD opencpn-plugin-br24radar-2.1.ebuild 816 BLAKE2B 0933819067e98b59f62af29a65c438f8ad3737fee78405f5c2de7068d34d2b8935c0a9c8651099e2f563f0182cb2c3bbf28ebd1176c7dc0906aea3f87538bc12 SHA512 559debd8b86e561b101d1269de551e53352b243cbcd226a5f5c23e439b737f5e6627596663e742cfc7828d4b57643d361259483d13d9a7de8218f4a11dbe5d1b
-EBUILD opencpn-plugin-br24radar-9999.ebuild 816 BLAKE2B 0933819067e98b59f62af29a65c438f8ad3737fee78405f5c2de7068d34d2b8935c0a9c8651099e2f563f0182cb2c3bbf28ebd1176c7dc0906aea3f87538bc12 SHA512 559debd8b86e561b101d1269de551e53352b243cbcd226a5f5c23e439b737f5e6627596663e742cfc7828d4b57643d361259483d13d9a7de8218f4a11dbe5d1b
+EBUILD opencpn-plugin-br24radar-2.1.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
+EBUILD opencpn-plugin-br24radar-9999.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
 MISC metadata.xml 465 BLAKE2B 3e0c72f423aaecd1092b831028dc7a728047a32a2297283d0877b082b1bd8adf51abed24710cc42222e3ba516b87f62c6bb5ba9c1da4a8d4e16b078d64ab5653 SHA512 42172f62749df96fbef1cf5bea2c1b07375ae435e2151ce086c461956311143658fc7dab4cb78f8e8f1ac4eda27c3bd175513874fc9a998e4b9a13d0ad470ae5
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
index aed41213a94b..72253384403b 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="BR24radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/canboat/BR24radar_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
index aed41213a94b..72253384403b 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="BR24radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/canboat/BR24radar_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest
index f3bdb7d12368..cc766c3a5d45 100644
--- a/sci-geosciences/opencpn-plugin-climatology/Manifest
+++ b/sci-geosciences/opencpn-plugin-climatology/Manifest
@@ -1,5 +1,5 @@
 DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 BLAKE2B 57e781f4d86ec17456e786629ec5b82c9aba872c2f8c26ec628e4ab5314b0a3c6933cc0c7a36616830038add1f95a52b8acd7c6f03cb702c611be255a3b91f1a SHA512 5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3
 DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505 SHA512 cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f
-EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1055 BLAKE2B 832493e351251b92f170513553bb44fdefa416c8b5c8b25ca8e4139a1bed6ce69fcf6146c363cf50a7459bcfed2eb15e40be443bb289efb38d51937005dbfc02 SHA512 a05269e205cc18175de56727fcc6bd98cf6e615e7ca08c6265dd1d532201a5902123a0219edd15bfb40cd0a1ce508019d2b47bbc5c6423c67c29645a129b9680
-EBUILD opencpn-plugin-climatology-9999.ebuild 1055 BLAKE2B 832493e351251b92f170513553bb44fdefa416c8b5c8b25ca8e4139a1bed6ce69fcf6146c363cf50a7459bcfed2eb15e40be443bb289efb38d51937005dbfc02 SHA512 a05269e205cc18175de56727fcc6bd98cf6e615e7ca08c6265dd1d532201a5902123a0219edd15bfb40cd0a1ce508019d2b47bbc5c6423c67c29645a129b9680
+EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
+EBUILD opencpn-plugin-climatology-9999.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
 MISC metadata.xml 532 BLAKE2B 3916a4f03c5b5f8237a5715f1d0f9e4d665f0fdbe6e8c68005a2f73d6aaf094cb153b263f102e5c3b08f78722fcc075e58ce9873a5aceae61c3672459e15bd4d SHA512 12135b8d8c1d890b7462e1defff7573b7da01949d7cbf4b687b18de40ad46c4cb6dd5b494c5e1aaa49549cba2841d7c6a8b2129f03c5ea25c5dd176054c3dd7a
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
index ddf574555659..521e36f33927 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
@@ -1,46 +1,45 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="climatology_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
-SRC_URI="
-	$SRC_URI
-	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
-"
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
 HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+SRC_URI="
+	${SRC_URI}
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
+
 src_install() {
-	cmake-utils_src_install
-	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
-	doins "${S}"/{,../}data/*
+	cmake_src_install
+
+	insinto /usr/share/opencpn/plugins/${MY_PN}/data/
+	doins -r {,../}data/.
 }
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
index ddf574555659..521e36f33927 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
@@ -1,46 +1,45 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="climatology_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
-SRC_URI="
-	$SRC_URI
-	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
-"
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
 HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+SRC_URI="
+	${SRC_URI}
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
+
 src_install() {
-	cmake-utils_src_install
-	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
-	doins "${S}"/{,../}data/*
+	cmake_src_install
+
+	insinto /usr/share/opencpn/plugins/${MY_PN}/data/
+	doins -r {,../}data/.
 }
diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest
index 957a419c85af..9d88aabf2733 100644
--- a/sci-geosciences/opencpn-plugin-dr/Manifest
+++ b/sci-geosciences/opencpn-plugin-dr/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1
-EBUILD opencpn-plugin-dr-1.1.ebuild 774 BLAKE2B c6f3945848da58486993ade9341f3418ecf98b89da4e459eb6469ae822455eb941c63c2b16210b2e9080a95c54fbddfe0adc38f8524cada7852f5c65a8990c2c SHA512 39349398430f65feb28545baea26002f39aa0518cf89ae8df0187f5c593984fb355625164f03c37d61bd686d31931de52ce09e577ac21c39968c856f7dfe77aa
-EBUILD opencpn-plugin-dr-9999.ebuild 774 BLAKE2B 0b51a9ac63f0794765cc4c298cff902298c8e9a3ca4b53be73fd9e2d991a409c2b9ba28ff008301ad2ae049956e6badbda1db9136d548a239afc425da26b1800 SHA512 3638a6b8ccdc158346f945fd7afe35e59e7fe4b87b7d5f14cb3b722db4f97de48c39c1afb40e8432ab811c8aea906c71a1320b111b1f0703b36cde1d306fc16a
+EBUILD opencpn-plugin-dr-1.1.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
+EBUILD opencpn-plugin-dr-9999.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
 MISC metadata.xml 458 BLAKE2B 2fae861ce66a1fa1c2bfb5abb9a65e36105421f290535afeb6e80b7d3faf58de9e2265fc9c08acfde23fd2fa388843bdbb1789b067553b34a0e27479223133b6 SHA512 ac9bd60fd829efeef2b9ecc9e7964a94fd165d9c7bf4f3fa6c4d9419d24f97fe85649569bcfe119f3b90d256f7efa69a2b09196ea52f0b66d53ef4a855517148
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild
index f453203e30f1..96bb44ad6eeb 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="DR_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/DR_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
index 90487153bd03..96bb44ad6eeb 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="DR_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/DR_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-findit/Manifest b/sci-geosciences/opencpn-plugin-findit/Manifest
index 6b095f0b5bee..40ab72b21fc3 100644
--- a/sci-geosciences/opencpn-plugin-findit/Manifest
+++ b/sci-geosciences/opencpn-plugin-findit/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-findit-1.1007.tar.gz 254806 BLAKE2B e76c96f67010d12ba58fa9746d2e1ca0470b6ec94d1c59615436bacfb1eca2c4cb29b3e295ffd90183a86d5717f8901b48916e0f1cd70ea098c00ba19edf1526 SHA512 d22de2541cbfb17b6dc2c88b77f9b90566b5e48638e072a2f376fff7cbc7d849548bd0fba919c0b6d11ab4b12961c79af3c136a124e6543fb4c97d088478cc42
-EBUILD opencpn-plugin-findit-1.1007.ebuild 758 BLAKE2B f6d748e46713484de2e2e88d0c70daa15056b8a7ff6f69313b4987fcaa9c6cc4c02752048055add91d225cb026cffa0486f52a01c5e57b209bfd9e3a90016430 SHA512 cc2370b5ae850422249d1fa635364bb95e9d826fb7461e7ea54b60cc02757d5c9881c057a2be3b4568b7c22e25908bbc2821d12dba667d19311d8e0bd49b192e
-EBUILD opencpn-plugin-findit-9999.ebuild 758 BLAKE2B f6d748e46713484de2e2e88d0c70daa15056b8a7ff6f69313b4987fcaa9c6cc4c02752048055add91d225cb026cffa0486f52a01c5e57b209bfd9e3a90016430 SHA512 cc2370b5ae850422249d1fa635364bb95e9d826fb7461e7ea54b60cc02757d5c9881c057a2be3b4568b7c22e25908bbc2821d12dba667d19311d8e0bd49b192e
+EBUILD opencpn-plugin-findit-1.1007.ebuild 725 BLAKE2B 51cd368614bfd0dc38fdfe0942cf16a929bd86c643a9acc0c69797dfbd001fffa6e328bfc831ddcf001bc82bfc2dbbc63287e3f05ff27026fc133e69ce0c5686 SHA512 e281a7703f2cf666d253a42baba95168c99162cfd7b28f30f08d41f29c2ad20b81c96cf32f324acd55989e907c3670499048c128a7882f451087f9112bb1b802
+EBUILD opencpn-plugin-findit-9999.ebuild 725 BLAKE2B 51cd368614bfd0dc38fdfe0942cf16a929bd86c643a9acc0c69797dfbd001fffa6e328bfc831ddcf001bc82bfc2dbbc63287e3f05ff27026fc133e69ce0c5686 SHA512 e281a7703f2cf666d253a42baba95168c99162cfd7b28f30f08d41f29c2ad20b81c96cf32f324acd55989e907c3670499048c128a7882f451087f9112bb1b802
 MISC metadata.xml 460 BLAKE2B 715b711eeade19ccc523f0e969bf248e8d3d6785395a10053aa48c10618965e3e8dce04130ad55896b466033648f736d2941a24d5e1bf880a7acdc25c89070f9 SHA512 25f9be61f14f93827c7bec4171ebd79cd6908bf25fc8734344dcbca4adf822c1348c09681275932ddfb5d00ccb005ad8688967a3b87150d971d6501ca549ba6d
diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild
index 575d82a35828..eadcfc34d04b 100644
--- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild
+++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="FindIt_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/FindIt_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
index 575d82a35828..eadcfc34d04b 100644
--- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="FindIt_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/FindIt_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-gxradar/Manifest b/sci-geosciences/opencpn-plugin-gxradar/Manifest
index 76803380dc84..ccf703ea86e7 100644
--- a/sci-geosciences/opencpn-plugin-gxradar/Manifest
+++ b/sci-geosciences/opencpn-plugin-gxradar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-gxradar-1.1.tar.gz 297126 BLAKE2B 9e1ab6d0fb525b17d2b8051ae13c75157bc8b12b106d68be5eb9f0f7dfb9d0dbf4b5001c5382b9a902d4ce3a75dbc7bc3bb354cbd97b538b60076829a4c152c8 SHA512 16b361e664323d125872628291bf97c6ac29caee4bae09ec256180aa66591bf9c66b7bdc38cd6d3c0988ed295148c0691bb8e511b5a9b9b6b34046dd419c9d7e
-EBUILD opencpn-plugin-gxradar-1.1.ebuild 779 BLAKE2B c4a40c702024be7540052e2e3a2b8fb4d1c0881148296a409a5879020cd24ac98965c8105a7ff83176a4445126faffdcaaa24bae41803b9c30cdab7d7dd2f59d SHA512 fa26eca20a51f800b7a3c7d82eac3015f1def28f8df78cf5535c7c0f469ad7897a5c311832e93a541d5166c549a252088bd3bd6107a63c432fd95635f03cbb71
-EBUILD opencpn-plugin-gxradar-9999.ebuild 777 BLAKE2B 2d86b79223172a6da5ba43b7df454e21ba646ec8a3eb85f581f31265ccc6f180887760d06a797c90a63d3b16773df6ee00ad192b473bcc6afd29bf48395d1ed3 SHA512 fa3e23b6d8f875926e101683b3b13cc1b710383561f3e0487a627b913e4791d8d24b479a75dbb1aa8aedae4185bfb3e16eae88a441a37743f47ad11d033653d2
+EBUILD opencpn-plugin-gxradar-1.1.ebuild 746 BLAKE2B 0eb2c7fb1ea601880c82736aaad1804c04a117484122934d68a5a09b342e7744ac8c3d39bb12ca512878dbb51c4fcf486da47263a1fcbfad49d026c62791e929 SHA512 ce8bdf534e30cff332e96a4dd0699021d1ce505c24e708a8c3425d160bfeaca34ff57205e190ff19a476c4b87ae6ebdbe6943638ebcda2755b12c86117fe43b1
+EBUILD opencpn-plugin-gxradar-9999.ebuild 746 BLAKE2B 0eb2c7fb1ea601880c82736aaad1804c04a117484122934d68a5a09b342e7744ac8c3d39bb12ca512878dbb51c4fcf486da47263a1fcbfad49d026c62791e929 SHA512 ce8bdf534e30cff332e96a4dd0699021d1ce505c24e708a8c3425d160bfeaca34ff57205e190ff19a476c4b87ae6ebdbe6943638ebcda2755b12c86117fe43b1
 MISC metadata.xml 463 BLAKE2B 2dde3bedd90dfb0fc3069df5b9f547c40b478da3e248f7d479834c88c7a0c21b4bef6264ec4f2ebad60946a65f64181d2a508b1b60bf463851d2ace301bed2c5 SHA512 7541ccf9ba469470bb1174029048053e8be82e7c9eab70d3fa47bff82ebee30f1b040e48e2f7e5bc41e2a4ce164756ead536bbc6f161df26c676bef2e9e1581d
diff --git a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild
index a80898d96156..ed4046ca4fde 100644
--- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="gxradar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-v.${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild
index 2a3f79bf6340..ed4046ca4fde 100644
--- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="gxradar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_PN}-v.${PV}"
 fi
 
 DESCRIPTION="Garmin xHD Radar Plugin for OpenCPN"
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/Manifest b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
index 6ec64e74eb38..8d0004ce9dd7 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/Manifest
+++ b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-iacfleet-0.9.tar.gz 218686 BLAKE2B 6c27fd57e7dc75d0a203a823ec75cacaf6fc351d58176f536542242b20e887ff58596bf114693d740258fd2c1a6af244f53825d0561ae9c396c5f556c0e1217a SHA512 f1e54fb17517dac2442de3bca85042add4a05f0b1caf144901581694403a9d9be9732a66f236f16014522b05108877b0dc530850bdf66b530e71c1b3cc010baf
-EBUILD opencpn-plugin-iacfleet-0.9.ebuild 769 BLAKE2B 53cdcf4b7098d6aa5ccbe428ccb7313fb0870fbca8f8fb7ed1dd592084e79409f68d72e27e60306ecfd138d7676d83f6572eafebfc69b3b77b63aa9741269835 SHA512 795e37e6992240bd0ffaad66979f66c27accc4c78eb5fd5bc11429dfbb79bee0dbd623365c21153ba8751417430154552be37456adf7b179fc2b5e3b21b36e36
-EBUILD opencpn-plugin-iacfleet-9999.ebuild 769 BLAKE2B 53cdcf4b7098d6aa5ccbe428ccb7313fb0870fbca8f8fb7ed1dd592084e79409f68d72e27e60306ecfd138d7676d83f6572eafebfc69b3b77b63aa9741269835 SHA512 795e37e6992240bd0ffaad66979f66c27accc4c78eb5fd5bc11429dfbb79bee0dbd623365c21153ba8751417430154552be37456adf7b179fc2b5e3b21b36e36
+EBUILD opencpn-plugin-iacfleet-0.9.ebuild 736 BLAKE2B ef6c430b7e2066918594fea0d0d08cb53192b2e015c5575e20879b9a2695668cfb74d60155a54cbc9dce05ea8b9f8bbc4a92ecb2d2a361dec2c23c44b8ecc6f1 SHA512 b7d9b6d8088868c2ea0457026e2d7af24cfce4a4bc11990f4bf0585c1017d6417a0c305c61c9d0d323934ea1ea80445f65fbf8c34b9cf80aa67b09a0789259b9
+EBUILD opencpn-plugin-iacfleet-9999.ebuild 736 BLAKE2B ef6c430b7e2066918594fea0d0d08cb53192b2e015c5575e20879b9a2695668cfb74d60155a54cbc9dce05ea8b9f8bbc4a92ecb2d2a361dec2c23c44b8ecc6f1 SHA512 b7d9b6d8088868c2ea0457026e2d7af24cfce4a4bc11990f4bf0585c1017d6417a0c305c61c9d0d323934ea1ea80445f65fbf8c34b9cf80aa67b09a0789259b9
 MISC metadata.xml 462 BLAKE2B d7660fa1ea43df109e760588c9b2c4d439280a2d9682c100c97cb56f80baa4227f9ad74e694ab0afd313f55c3e5eda1fcee929f0976883b962352177426fc0c0 SHA512 54d4824a2cb4d73bfa15402951526b636ff942ebbab71abbe5e30e724c0af9b75f1403c13dc8b2538f4fbb9be692eed6f62d6ec340256fbfa7d849b1fb9bf8c9
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild
index 3345bc42e9b7..d95a70a471e2 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild
+++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="iacfleet_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/iacfleet_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
index 3345bc42e9b7..d95a70a471e2 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="iacfleet_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/iacfleet_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-launcher/Manifest b/sci-geosciences/opencpn-plugin-launcher/Manifest
index 5221c3620b50..f6429251088a 100644
--- a/sci-geosciences/opencpn-plugin-launcher/Manifest
+++ b/sci-geosciences/opencpn-plugin-launcher/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-launcher-1.1.tar.gz 136301 BLAKE2B 4f353fdba9cd1ed15c59bb7becb95245add0ab9b21332524f6916ba08f519933a116bec9997406328bb6088db783d76d8e81d3970716dc986f7ef5f4a8980099 SHA512 67d36849b592d27af34aacb0016bddf961a2a94f7f6e5e0ec404c698bec9bdc2771671ec0772476188f6fd6733327e5e566bcff388583dc2cae578e39e279a16
-EBUILD opencpn-plugin-launcher-1.1.ebuild 764 BLAKE2B bd25831c30f403fbbad19ae16e75a26cd2d4fef009fb0fffb10b8eb5a15c178feed336a6687aee9a300c79cf744770a74f7a28ef91e9a44ffdb2b46a1644c879 SHA512 6804b0146e206ee028949201662d0991665a107c2e4b22032cdc90cd1daf035fb837146f40fbdd13cc4c1270df53ab41cd297469046d472b6899ed67cb104186
-EBUILD opencpn-plugin-launcher-9999.ebuild 764 BLAKE2B bd25831c30f403fbbad19ae16e75a26cd2d4fef009fb0fffb10b8eb5a15c178feed336a6687aee9a300c79cf744770a74f7a28ef91e9a44ffdb2b46a1644c879 SHA512 6804b0146e206ee028949201662d0991665a107c2e4b22032cdc90cd1daf035fb837146f40fbdd13cc4c1270df53ab41cd297469046d472b6899ed67cb104186
+EBUILD opencpn-plugin-launcher-1.1.ebuild 731 BLAKE2B fd70d0ae9712b7617f42ceed3bfabc64f88472de8a2b15d5f8d0cb05fc8ef6990ad56449d162612ee100093779378669aca802eae0c423b5a947a56608d976f1 SHA512 5b91b9ed8f1e1b59865494d72f42c0b8dde18f335162dbaf6fd029abbe99aa834e6bee501cb2c3faa32814e72367193418cff10250289acd8e7f5c0b45c63040
+EBUILD opencpn-plugin-launcher-9999.ebuild 731 BLAKE2B fd70d0ae9712b7617f42ceed3bfabc64f88472de8a2b15d5f8d0cb05fc8ef6990ad56449d162612ee100093779378669aca802eae0c423b5a947a56608d976f1 SHA512 5b91b9ed8f1e1b59865494d72f42c0b8dde18f335162dbaf6fd029abbe99aa834e6bee501cb2c3faa32814e72367193418cff10250289acd8e7f5c0b45c63040
 MISC metadata.xml 462 BLAKE2B 56ec8a180b1462912025f7b88d91ea713278b2b56a0bb96b889c2393b9de8edf9cf083bb8a4b97dd4092e00fec6e5ae9716ee0b95a26a9cb439719833438657d SHA512 06769469f1a722a93d9a1037ca9653dcd413317e734b2cb8ac764d471b26bbb55873eabcc095afc4cac4c0178900f2982e5983bb3bb0d1b4cbe15a9da053d51a
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild
index 4a8ac8778e36..642568c3b3df 100644
--- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="launcher_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/launcher_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
index 4a8ac8778e36..642568c3b3df 100644
--- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="launcher_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/launcher_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
index 3f84f504cadc..cc67aef05feb 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -1,5 +1,5 @@
 DIST opencpn-plugin-logbookkonni-1.3002.tar.gz 3810133 BLAKE2B e22d4fe15e54ce914d97bfb0c660210dddec26ba7e6867708489f042e18b04f2e4832275a7a96a31e5a4f1bc25faca1f8343ce66114751d1c37b525e749f8d15 SHA512 a539e8d01f9e81f859826477c1abbdafeacc1bd0a1e734777698eb471ddf0a1356bcd321b4b3aa27f9593e0d412e52fb8791248a0dfbc20daa7c9214152e8030
 DIST opencpn-plugin-logbookkonni-1.3002_Layouts.zip 1722887 BLAKE2B ba2b966def65930f544aabe1a617c5cc3aac69f578ffb3360388724c78d4c793719d50e577b0571933168f7f5cc55a27dcbb2e5616b90c17d0257052fd052d9f SHA512 f493d9af822a960f3b9a5d557d46b73e89c8179bfbc4d260d133c972e22d4ce5753e64b2d8ced321589a11a0a32efe1c34b574ed850af0673768896cdbb3d9c5
-EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B e236fe3ee40155234c408658292d67534455799e488bba8d315c7018bbcbadc3aed7b775740a5cf046cdfd9d0a0db30ef8cc52478081f766a3c2b814aeae60a2 SHA512 319dc5c38ce6e5ca29d0c685df9b3ba10ccc0b10c7d685edfe4da3192dfaca92ecb4651ae1d3dc795f28db965e0e3cdcde1fd484a58feb4f036225e580955e8c
-EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B e236fe3ee40155234c408658292d67534455799e488bba8d315c7018bbcbadc3aed7b775740a5cf046cdfd9d0a0db30ef8cc52478081f766a3c2b814aeae60a2 SHA512 319dc5c38ce6e5ca29d0c685df9b3ba10ccc0b10c7d685edfe4da3192dfaca92ecb4651ae1d3dc795f28db965e0e3cdcde1fd484a58feb4f036225e580955e8c
+EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
+EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
 MISC metadata.xml 472 BLAKE2B b79d5d4322925eadb22f29139af36e610836888e745a64ebf7005d1ca06e54f9ca4b119162a902d5a3301ce0751e06fde1cdc3fb3b7b6ce363b327bc3e53c17f SHA512 6a2770dd9706b34e4615e3f87b1f393bd0a8ce1be5aa2060e0c5718c11238368320d872418452545591cb0d2464d6b49f27750381e9e30001588948e32e1cddd
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
index 8a0124d6bf0e..88643bb432bf 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="LogbookKonni-1.2"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
 	SRC_URI="
 		https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip
-	"
-	inherit cmake-utils wxwidgets
+		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -23,38 +24,37 @@ HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/zip
-	${RDEPEND}
-"
+	sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
 
 src_install() {
 	# install layouts as zip
-	cmake-utils_src_install
-	cd "$WORKDIR"
-	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
+	cmake_src_install
+
+	cd "${WORKDIR}" || die
+	zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
 }
 
 pkg_postinst() {
 	elog "Installation of logbook layouts"
 	elog "*******************************"
-	elog ""
+	elog
 	elog "The default layouts zip file has been installed to:"
-	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
-	elog ""
+	elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+	elog
 	elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
 	elog "click the install button and choose the above mentioned zip file"
-	elog ""
+	elog
 }
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
index 8a0124d6bf0e..88643bb432bf 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="LogbookKonni-1.2"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
 	SRC_URI="
 		https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip
-	"
-	inherit cmake-utils wxwidgets
+		https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -23,38 +24,37 @@ HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/zip
-	${RDEPEND}
-"
+	sys-devel/gettext"
 
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
 
 src_install() {
 	# install layouts as zip
-	cmake-utils_src_install
-	cd "$WORKDIR"
-	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
+	cmake_src_install
+
+	cd "${WORKDIR}" || die
+	zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
 }
 
 pkg_postinst() {
 	elog "Installation of logbook layouts"
 	elog "*******************************"
-	elog ""
+	elog
 	elog "The default layouts zip file has been installed to:"
-	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
-	elog ""
+	elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+	elog
 	elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
 	elog "click the install button and choose the above mentioned zip file"
-	elog ""
+	elog
 }
diff --git a/sci-geosciences/opencpn-plugin-objsearch/Manifest b/sci-geosciences/opencpn-plugin-objsearch/Manifest
index becaceda7cdf..10073214783e 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/Manifest
+++ b/sci-geosciences/opencpn-plugin-objsearch/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-objsearch-0.7.tar.gz 2047642 BLAKE2B f7e07c93bab6929a9d096b4c39e14842b8069f134e5cb4ba7ff69d79371c1d04754e11592d440832abee8b41eb6de1f6ad9abe3f21ecc892ea3b2f9bf0a7a093 SHA512 9c371bf3a5ef551a68ea7e2569536df37d7ec1241be011c6a313229f3c34697332c967c91855d9ccdd4f0a3412ade130fe241ea22c803f7c37543539602f71b3
-EBUILD opencpn-plugin-objsearch-0.7.ebuild 777 BLAKE2B 84f53fe6b305652a32c93d95edc8fdd3ab8e7b8805f22b40455a879cd1dd0f7b1995ed100f05788590389872db543280f9cdcfe1934c1ca9fc085eee80def0e6 SHA512 d5bd6efc778f43a22c4a9454777595e18b2740e1d4399d4986a6e95fb7090355438d32f68801266cf82152d515cdd726e5ee7fec03b51a4f40b2480fe320fce3
-EBUILD opencpn-plugin-objsearch-9999.ebuild 777 BLAKE2B 84f53fe6b305652a32c93d95edc8fdd3ab8e7b8805f22b40455a879cd1dd0f7b1995ed100f05788590389872db543280f9cdcfe1934c1ca9fc085eee80def0e6 SHA512 d5bd6efc778f43a22c4a9454777595e18b2740e1d4399d4986a6e95fb7090355438d32f68801266cf82152d515cdd726e5ee7fec03b51a4f40b2480fe320fce3
+EBUILD opencpn-plugin-objsearch-0.7.ebuild 744 BLAKE2B efc2a02b9d10a0071be5412ad9f95a92329d1f51734079b68f834e7db320b444bccd80a63550d333343933514fad1be2ebd15b7d5dc6122ad9b133fd343d40a1 SHA512 f8f694d176af568309d3a62562ba74b6a0dc5883ad4e30233f032b5faa36db1590cf2f53364950332e3362dc0ee1c2b9b992806d22f8271e800e599782a87372
+EBUILD opencpn-plugin-objsearch-9999.ebuild 744 BLAKE2B efc2a02b9d10a0071be5412ad9f95a92329d1f51734079b68f834e7db320b444bccd80a63550d333343933514fad1be2ebd15b7d5dc6122ad9b133fd343d40a1 SHA512 f8f694d176af568309d3a62562ba74b6a0dc5883ad4e30233f032b5faa36db1590cf2f53364950332e3362dc0ee1c2b9b992806d22f8271e800e599782a87372
 MISC metadata.xml 463 BLAKE2B 7ae48ec6bc3192b3e6d522e9a8d4e8c09051f9fc453491c3c9e2f2508a6b95b572e3c34daa5dd714cba180df7dce6625351281c39f6aa6d06e68c660e9fcc7e4 SHA512 8a075b8eebde4adb85d11893601a3cc6c620653f63853aff0b2b65c0e887f11434e01fb99599a7312ab40b0ec3ddb2ecdfc0bbe1dc1f3f13ef237f4070a3007c
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild
index 7f8662fc637b..d8a4f05a0de4 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="objsearch_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/objsearch_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
index 7f8662fc637b..d8a4f05a0de4 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="objsearch_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/objsearch_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
index f57dad54571a..b9fb9a403045 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-ocpn_draw-1.3.14.tar.gz 1341500 BLAKE2B 9324a05d4c7772808be9b90e4b9451724eb8b4ed5439e0dcb40eda13d9583246f9ee47e627e09c219c0fb7e8173079e85c2a0f7be2da2f1cc0f7d7d0548ef974 SHA512 8102eda5edc1b198db639a662f3533423e67ee6a3633c1a74b727a56e3176737deb930d77fb9dbbf38b8c8f678fb31c8087ae5636bc3f9ed156dbec77bdbe6cf
-EBUILD opencpn-plugin-ocpn_draw-1.3.14.ebuild 771 BLAKE2B dc73bf82f70fe4ae3af1caaf276b597e88319039717a77b378b7ea663b9e9ce09e70821e2fc6d023d4fc6bf39614f1b9f407dc421c979802ffd1853edd1f50a4 SHA512 7fee64e5f2334092c7439edac84a77083885c59292880328d0b4013320bfbc1b17ee5b43a168db55eb4786bcb455eebdd7f39d5d9d0504755a63a97b4aff6ffb
-EBUILD opencpn-plugin-ocpn_draw-9999.ebuild 770 BLAKE2B 840da62a3f7060c99de922075f1966839288479aefe882bafa5ad1bdb93680e838d1dceb63e16c8706f1724494c3d375548ee2930329b52bb1902eb76cdf47a5 SHA512 d29d5e89ca7e2de9164a9d191313b52f117075eaa91c12fffa6f3a541d3b811ec54dcacf53b4775515d87f3a666efcc94b0ff455911ba7da5d93ccb6c34c3b77
+EBUILD opencpn-plugin-ocpn_draw-1.3.14.ebuild 738 BLAKE2B 2fbcc9938a35a2bc279a2444ce436ad6b4e5257eca60d7ec681e7c5cc40287c005d50ae2efb2583d821478c8f6943ca9db0b44fee8119d8483bb13c5fa453485 SHA512 08d5cfb796bad8753960e0770f4a27f371e7798a11efa4195012dec525dd740e51b01c3bee97b8fb989b55809b3918c85fd3dc9343f8eb65f27d5b3c28baf4c8
+EBUILD opencpn-plugin-ocpn_draw-9999.ebuild 738 BLAKE2B 2fbcc9938a35a2bc279a2444ce436ad6b4e5257eca60d7ec681e7c5cc40287c005d50ae2efb2583d821478c8f6943ca9db0b44fee8119d8483bb13c5fa453485 SHA512 08d5cfb796bad8753960e0770f4a27f371e7798a11efa4195012dec525dd740e51b01c3bee97b8fb989b55809b3918c85fd3dc9343f8eb65f27d5b3c28baf4c8
 MISC metadata.xml 466 BLAKE2B 56c6ce77a0496bbc1c8fbfa8abcf37487bfba38f448cfe139fee70cbf60e64001da61e5bccd59f69074dd28799c077d7882c013495b582aaf508b78a1d90c642 SHA512 018ebc234b7cd3fad579532636a57d8649b20ddafc25a43af81fe79189ce1cdbc6b5c227fa5b2591e114739ae9d48e1943213065ebdad779ea1209f7516c7dcf
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
index 8f665fffa34c..26a9865b3471 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/jongough/ocpn_draw_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
index bf8b08e593af..26a9865b3471 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/jongough/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/jongough/ocpn_draw_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
index 1cd9876c5079..881d797e6e89 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-ocpndebugger-1.3.tar.gz 127623 BLAKE2B 8c09e80916f7e7435ea54b5d0aba82e703ebbffd0fbc3d75282f21fec73c74f39d07ce73aa2f9e4d6f0185935a003c33256c2a1580ae7c36ecdd30a53b90aec6 SHA512 30caf922cc5a5255741b780c8f09ea4de9d7bbbe0b6ff65fe32a7484da4c75e53fd03e6a83966dc70ef4f7f6483dacce7f74392e4b3556b984f90b2eb5f9e01e
-EBUILD opencpn-plugin-ocpndebugger-1.3.ebuild 797 BLAKE2B ce4eaad2c4a8cd1d573861b8c4bb4cd3ccd7df0bdb83c5881af7505b18f2cdf035552d382304964969216918dabc7e1c95f9b24dfac8a4c9f526305420472f5a SHA512 b477754ebe59d66ff264c7726345285adb89b19d909c4948881817ba57cdd74870e0bf4468a28d55abb3bb43be26a1c90bc2e0f53c803a54b2b035daa8f95230
-EBUILD opencpn-plugin-ocpndebugger-9999.ebuild 797 BLAKE2B ce4eaad2c4a8cd1d573861b8c4bb4cd3ccd7df0bdb83c5881af7505b18f2cdf035552d382304964969216918dabc7e1c95f9b24dfac8a4c9f526305420472f5a SHA512 b477754ebe59d66ff264c7726345285adb89b19d909c4948881817ba57cdd74870e0bf4468a28d55abb3bb43be26a1c90bc2e0f53c803a54b2b035daa8f95230
+EBUILD opencpn-plugin-ocpndebugger-1.3.ebuild 764 BLAKE2B 797ca089c40595efbaf58a3146d1fac23c94aeef227565ae5cf2b7bc0d8febf2bac7a1090be53a8a961d58a4a79feb9492ceff6440ef4ece5abe674ce7180048 SHA512 aac90ddc1ed9d284936bd1e394624129a34ac73bf1a4cb6ef57268676da76bfcfaff74058f302828fb33ce67a7631a5e90fb6a48f9610225c3ecb22d26236adc
+EBUILD opencpn-plugin-ocpndebugger-9999.ebuild 764 BLAKE2B 797ca089c40595efbaf58a3146d1fac23c94aeef227565ae5cf2b7bc0d8febf2bac7a1090be53a8a961d58a4a79feb9492ceff6440ef4ece5abe674ce7180048 SHA512 aac90ddc1ed9d284936bd1e394624129a34ac73bf1a4cb6ef57268676da76bfcfaff74058f302828fb33ce67a7631a5e90fb6a48f9610225c3ecb22d26236adc
 MISC metadata.xml 466 BLAKE2B af98096d5c2c128da1ba6074747879d99d10a35732d19a108653d8f616d7da5da942a0aecfaef14e68d3140b83d446c1530106494cd2c2bcd326dd06e89572b3 SHA512 17a5a5e747b2b9c014249d95219ee6dbd634cc2e3bca64578d5fd94e7c054549e59141b541e3d509aea2083b288805e131f28ae244143be3d25f62dcb55e50bc
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild
index 3ad25321c6c7..3db37b30bf42 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="ocpndebugger_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/ocpndebugger_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild
index 3ad25321c6c7..3db37b30bf42 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="ocpndebugger_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/ocpndebugger_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-oesenc/Manifest b/sci-geosciences/opencpn-plugin-oesenc/Manifest
index 4563559a5a37..8e1d8ad767a7 100644
--- a/sci-geosciences/opencpn-plugin-oesenc/Manifest
+++ b/sci-geosciences/opencpn-plugin-oesenc/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-oesenc-1.6.0.tar.gz 5258724 BLAKE2B 8703d60544d4b1d4523a64c58cbd10928ea6f3ffd0a9af3b46b4c244c403b1bf18ea8b1aebcd96efd61e6b65da0dab06d029c99271fb34800294bdac8534d67e SHA512 487c11dbc0e5e93618812b9a54fcd28f27feb070037cecb1f1024449ce8857bc2de3f24debc08900614b6ccc4657719b86a8116dd0665285075765ddd2d0987d
-EBUILD opencpn-plugin-oesenc-1.6.0.ebuild 769 BLAKE2B 39bb0a37abec05438c9816d2fa3d112c69df96f6b2f16654c42a7f04da8dc17ccad3d3f03352f65ea182cb1ac6de01543e2b102ae53a121726b4b79c58bff983 SHA512 cf7e448712e1afd031d5cdbe474eff2d13710bc53937dae68771c6c210a62645f4f35565405eb61ea66b20685da9cc8791ed4beaa843990515139fa2dec1f941
-EBUILD opencpn-plugin-oesenc-9999.ebuild 769 BLAKE2B 39bb0a37abec05438c9816d2fa3d112c69df96f6b2f16654c42a7f04da8dc17ccad3d3f03352f65ea182cb1ac6de01543e2b102ae53a121726b4b79c58bff983 SHA512 cf7e448712e1afd031d5cdbe474eff2d13710bc53937dae68771c6c210a62645f4f35565405eb61ea66b20685da9cc8791ed4beaa843990515139fa2dec1f941
+EBUILD opencpn-plugin-oesenc-1.6.0.ebuild 736 BLAKE2B ac847d70879a695b0558ab95a1feb466447cb895d74dc375b747d0fd65c81f25de3a3f0edb67891743003fb870f655689b8ddf6a352de93777e2b70348b72424 SHA512 d9556d1ee16d13148624478c274c0f984ae4308fa05bf8f27b18c0be6f100a55910ce84043202271304818b5c3117f0123ddc9111093bf183c13cfd81b305f90
+EBUILD opencpn-plugin-oesenc-9999.ebuild 736 BLAKE2B ac847d70879a695b0558ab95a1feb466447cb895d74dc375b747d0fd65c81f25de3a3f0edb67891743003fb870f655689b8ddf6a352de93777e2b70348b72424 SHA512 d9556d1ee16d13148624478c274c0f984ae4308fa05bf8f27b18c0be6f100a55910ce84043202271304818b5c3117f0123ddc9111093bf183c13cfd81b305f90
 MISC metadata.xml 461 BLAKE2B ae80654672109a10f65b0205a2a719a0599fb61eb76f31f8add191081e1eb9354e582815104f287d816174debd072166e318600fe8f4c5ad531864bc7ab1c9fa SHA512 2c4a728bfc2bbcde612050de8ba3b58022547f615de5b17cb8b203fc590dac0c0996aff4a4e0612e2b5543417d1faaf400d6e313380e691bc70dd1b4e71bd287
diff --git a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild
index ac605f8f9e8c..c920ec40e3f9 100644
--- a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild
+++ b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="oesenc_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bdbcat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/bdbcat/oesenc_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild
index ac605f8f9e8c..c920ec40e3f9 100644
--- a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="oesenc_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bdbcat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/bdbcat/oesenc_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-otcurrent/Manifest b/sci-geosciences/opencpn-plugin-otcurrent/Manifest
index 11f2e103cd84..4f1423225ea8 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/Manifest
+++ b/sci-geosciences/opencpn-plugin-otcurrent/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-otcurrent-1.2.tar.gz 184391 BLAKE2B 498dbe2533cb8867d4f87766f245d353494be1db5e955a320c6b9906a5edbca634645017c84fe1a6c145520b355b3c49767a5c012d621de88b7b6801d6d27407 SHA512 04564e0fcafe0f338d52a2fe7cf1a00c5d53d4ecbbac3264203ddc5ed4dd1e237b45d206314dfc493ea4649491a03872158a4d61a6dd0658dd54a20b43502263
-EBUILD opencpn-plugin-otcurrent-1.2.ebuild 773 BLAKE2B 4048495a269f43306327008350ba5a04e28f5171108f5909a34366ed83e9e196f7965669abc7698892162d99419568133d66c301fb35ae42c3c92b9516ed5a6d SHA512 1b1361ac803916a669214b8d46df938b21c3dc72cb2db8db452c786a33af22ccf57276bb0f34dd8e4ca14d685dda774aea8c56274378e535e16554b9bc6ce445
-EBUILD opencpn-plugin-otcurrent-9999.ebuild 773 BLAKE2B 4048495a269f43306327008350ba5a04e28f5171108f5909a34366ed83e9e196f7965669abc7698892162d99419568133d66c301fb35ae42c3c92b9516ed5a6d SHA512 1b1361ac803916a669214b8d46df938b21c3dc72cb2db8db452c786a33af22ccf57276bb0f34dd8e4ca14d685dda774aea8c56274378e535e16554b9bc6ce445
+EBUILD opencpn-plugin-otcurrent-1.2.ebuild 740 BLAKE2B a1e410691c47bab4f225757f1c920f3b048dc8a413b20a4715819bd8a4de508606d0c8109b4927d8251ec27ca009edbb4f49c725b6a1f605db7c2bb553ac4940 SHA512 0be5cb3c23d7a73bb547b610e6e00d1fe92f42e7db46d3cf8a78c743b03fd7a4fb18468377f6d4b2eaa518e41f7792cbea880c8ec5dc7867c469818a1de991a9
+EBUILD opencpn-plugin-otcurrent-9999.ebuild 740 BLAKE2B a1e410691c47bab4f225757f1c920f3b048dc8a413b20a4715819bd8a4de508606d0c8109b4927d8251ec27ca009edbb4f49c725b6a1f605db7c2bb553ac4940 SHA512 0be5cb3c23d7a73bb547b610e6e00d1fe92f42e7db46d3cf8a78c743b03fd7a4fb18468377f6d4b2eaa518e41f7792cbea880c8ec5dc7867c469818a1de991a9
 MISC metadata.xml 465 BLAKE2B 4307b579615e38be351c2bcad023c8379b8007a654c6372420c508365ada065a4f159dd0149729c897f6c2aaac73736cb4968d32007bb88b94021b5b3d29edfa SHA512 31acd1d3a12d14d1e96df8a381187e3bcb970518f48e843d054852be222c83302750ad51d5f0721d100cede415202927c078c5e2a98cdb082985beb0b110332b
diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
index 0d88a9a5e632..d7fcccf5a579 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
+++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="otcurrent_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
index 0d88a9a5e632..d7fcccf5a579 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="otcurrent_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-polar/Manifest b/sci-geosciences/opencpn-plugin-polar/Manifest
index 77c5a48989be..85f20cc844d9 100644
--- a/sci-geosciences/opencpn-plugin-polar/Manifest
+++ b/sci-geosciences/opencpn-plugin-polar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-polar-1.1007.tar.gz 263299 BLAKE2B f06393ccb1b6ab2b7ad20cc833b61e9ebee1d7545482c5275eaa25eccd9f21973811383eb7fc26484c41515f16b245ed77d52d72871ea80594c112ab0b531ab5 SHA512 9ef853a052692b7475851b8470d18c711bf2e9a8fd7dbc31919197fa6ae0225ce218bd4a13f39a999fa29282b209614e0fc37e429a39dc3c1dc28b018e6c3344
-EBUILD opencpn-plugin-polar-1.1007.ebuild 763 BLAKE2B 944dc9485d6c8e88cd2e6baa2803a491149b1086f732c4d2356c32bef1115279efe544c8bea723a5a808ef9c067060abb9ccb4a80abdaf774c8651f87c6599c4 SHA512 f1cdf3bc1c150768c4acfa6efd238aaae83072c5afff09f4a00e71bc81c6adf21c3ec37c902533ab45615f41c22c0b32dc7884ba9f86115b909f2ea271921f87
-EBUILD opencpn-plugin-polar-9999.ebuild 763 BLAKE2B 944dc9485d6c8e88cd2e6baa2803a491149b1086f732c4d2356c32bef1115279efe544c8bea723a5a808ef9c067060abb9ccb4a80abdaf774c8651f87c6599c4 SHA512 f1cdf3bc1c150768c4acfa6efd238aaae83072c5afff09f4a00e71bc81c6adf21c3ec37c902533ab45615f41c22c0b32dc7884ba9f86115b909f2ea271921f87
+EBUILD opencpn-plugin-polar-1.1007.ebuild 730 BLAKE2B 7b5dbca9761b0376cf1ee49f17bbdbddec8f55ce64a3ed95f6508276092df075df8891e22b66cc38654a8b3faf91af242535ceb6079c5e7f29c61443334685c4 SHA512 aa18ad54425064e77dc66a6757b1d4617018aeb2b51a682f2b6be99ec16c59930add06244ce972444f878fbb5edfff839c9714f6b1a710f9eb21052b6c8acd1f
+EBUILD opencpn-plugin-polar-9999.ebuild 730 BLAKE2B 7b5dbca9761b0376cf1ee49f17bbdbddec8f55ce64a3ed95f6508276092df075df8891e22b66cc38654a8b3faf91af242535ceb6079c5e7f29c61443334685c4 SHA512 aa18ad54425064e77dc66a6757b1d4617018aeb2b51a682f2b6be99ec16c59930add06244ce972444f878fbb5edfff839c9714f6b1a710f9eb21052b6c8acd1f
 MISC metadata.xml 459 BLAKE2B 0a9115db2e6d5e7d673dc37dfa85d99cf2e3a8ce9ea3049ea831f119622ce3dc829c9d860d98f083254ce20c1c34a643d0d6e6c62533b56a4f609dbef9193a06 SHA512 3379e62005aca4f29288a26766132f3939b8b1a8ab25789f48c83f6103629d041488df4e86af56f573f66d2ffe9663f233bbe8c0a5d4b0b105585de875f74467
diff --git a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild
index b164cddb248c..a6688256200a 100644
--- a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild
+++ b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="polar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/polar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild
index b164cddb248c..a6688256200a 100644
--- a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="polar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/polar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-radar/Manifest b/sci-geosciences/opencpn-plugin-radar/Manifest
index d8bef995b88c..9289a638e82e 100644
--- a/sci-geosciences/opencpn-plugin-radar/Manifest
+++ b/sci-geosciences/opencpn-plugin-radar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-radar-0.98.tar.gz 113968 BLAKE2B 8eefaf047071c16c055cd2d05e2a0c284d2929b9e450c78044f7864e9d266a682b41e7674a6d495b468181f3b4d17cf0680d420a85e92e8c5818bfac31a215a2 SHA512 f424659e446c79eefbc37999154dc912f26c380a90cf54be40f034a052ae48b3eb479d7cd23b216db8484eae25a5d1c3ab42afd9f3b336aa0534903d8da8bbd1
-EBUILD opencpn-plugin-radar-0.98.ebuild 796 BLAKE2B ecbac3884562c406283d17ece50a0f8e5464887b601faf2160a331d5404f650ee76274c08e3acf25bb0db7e9f3b283c63c4279a4ccafd97cba733546cc323cf0 SHA512 4290ba7f7647d34d345450f9de5710ecfe860544bacb4fc8b70b60734d2ea5a4af75ac7efa7718dc06e2afe03a39568921f281ca2944a96682db30ce134ba031
-EBUILD opencpn-plugin-radar-9999.ebuild 796 BLAKE2B ecbac3884562c406283d17ece50a0f8e5464887b601faf2160a331d5404f650ee76274c08e3acf25bb0db7e9f3b283c63c4279a4ccafd97cba733546cc323cf0 SHA512 4290ba7f7647d34d345450f9de5710ecfe860544bacb4fc8b70b60734d2ea5a4af75ac7efa7718dc06e2afe03a39568921f281ca2944a96682db30ce134ba031
+EBUILD opencpn-plugin-radar-0.98.ebuild 763 BLAKE2B d81eb7d15a9dd50a7ad8bcafb3b6eb141abc959775a9aed4d5ba18efec0060c4f013139a28e97965f3e9080f878054a54b52409c4a61833af05e1f53a783f569 SHA512 abcf905d762f4e88b4f6a5d80e165c0e1d0e6507633dcb2e95857434a4c913bae2bbf526182739be260ba52c8be64b91e4163db8a5071da1f581ce8cd497b946
+EBUILD opencpn-plugin-radar-9999.ebuild 763 BLAKE2B d81eb7d15a9dd50a7ad8bcafb3b6eb141abc959775a9aed4d5ba18efec0060c4f013139a28e97965f3e9080f878054a54b52409c4a61833af05e1f53a783f569 SHA512 abcf905d762f4e88b4f6a5d80e165c0e1d0e6507633dcb2e95857434a4c913bae2bbf526182739be260ba52c8be64b91e4163db8a5071da1f581ce8cd497b946
 MISC metadata.xml 462 BLAKE2B b84445d2093a9a14350d70cda137dc312a6464abcbc8e79895a635b35aff9896b1762dbdf34e16954ef3c056ff1e077f36f32efe7bcd77a198ca2ad614ddce91 SHA512 a55828c3828d2596b3357421282025f9098f5f0a38599f33594516d14b96ba57d5d18d488a5b3780ffedadf33206753af6375026ecb1035ee5934275b6eb6ee7
diff --git a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild
index 2926ea6725ca..9322ab47c120 100644
--- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild
+++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Verezano/radar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild
index 2926ea6725ca..9322ab47c120 100644
--- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="radar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/Verezano/radar_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-route/Manifest b/sci-geosciences/opencpn-plugin-route/Manifest
index a8aacb892b8a..c0136f4510a5 100644
--- a/sci-geosciences/opencpn-plugin-route/Manifest
+++ b/sci-geosciences/opencpn-plugin-route/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-route-1.2.tar.gz 373474 BLAKE2B ca0054882d7fde3f3c244f242acdbb34a5bc7003cd643e76c7e9ecedc35edbc507d2c6336f8746632d3b6bc23ba202953ce66e4e5941b81c46296129823a0eaa SHA512 4dcaa4592f72c6a093276689db5ffa8dae1ed3e0ac6790b85352a6a1942d8863c8f19dfd1110256df9ac28e8056442344852d7790ae97201efe965485a5faa26
-EBUILD opencpn-plugin-route-1.2.ebuild 776 BLAKE2B 2dc3abf37582d14c42212ee4a4a1a5ddfbd20140d577e265e78547531ec8995c86ed6a0a6e1b055816763dcf39f224698a3a502d5f3db29a37b724052e690e7a SHA512 ed86d29455439523e2dde9a3c46f94a83b7562248d0ac6a2d3c2bebc06d5f5478e6ca8f56b48cb767a9fb6021f0dfe07541cca28057cf0a4ff1bf9183b4eb4de
-EBUILD opencpn-plugin-route-9999.ebuild 776 BLAKE2B 2dc3abf37582d14c42212ee4a4a1a5ddfbd20140d577e265e78547531ec8995c86ed6a0a6e1b055816763dcf39f224698a3a502d5f3db29a37b724052e690e7a SHA512 ed86d29455439523e2dde9a3c46f94a83b7562248d0ac6a2d3c2bebc06d5f5478e6ca8f56b48cb767a9fb6021f0dfe07541cca28057cf0a4ff1bf9183b4eb4de
+EBUILD opencpn-plugin-route-1.2.ebuild 743 BLAKE2B 012286c3a6d244b6ba63f332b7fd37b7cec5e955e4bf1b0f302e5f1704d44ed39b6db624dcb881c3088e9ab9715b2347dffc3b130cdc7f86a7986deed377dfef SHA512 9aa97a75b9b6a4391e66a5ad8f2146c08b60f34e46bc48787474bcd5520ba67e2f87ae7e48397db90004e974fd61642cb9db7790fb5996cca0af44089f90ed0c
+EBUILD opencpn-plugin-route-9999.ebuild 743 BLAKE2B 012286c3a6d244b6ba63f332b7fd37b7cec5e955e4bf1b0f302e5f1704d44ed39b6db624dcb881c3088e9ab9715b2347dffc3b130cdc7f86a7986deed377dfef SHA512 9aa97a75b9b6a4391e66a5ad8f2146c08b60f34e46bc48787474bcd5520ba67e2f87ae7e48397db90004e974fd61642cb9db7790fb5996cca0af44089f90ed0c
 MISC metadata.xml 463 BLAKE2B 1c2e2744ea0ad0ba55ba23972872ad96dee8254ddc0870dd2c190ddf6e367d4d4eedb269a177aafae82a22650218fa4707a3875b657e69d132dcac97703c5d99 SHA512 56be58d5be8fc8adc1ad3f1fe85be7e0a5dce179e047796e3db6795f77f16b53461822525ef6ab807af07f672b53210760870e96789d0abaa56a3edc90df23eb
diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild
index 7318cf9e6c91..a2b93f3991c2 100644
--- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild
+++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="route_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/SaltyPaws/route_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild
index 7318cf9e6c91..a2b93f3991c2 100644
--- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="route_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/SaltyPaws/route_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-squiddio/Manifest b/sci-geosciences/opencpn-plugin-squiddio/Manifest
index fe4fd13edfb4..55b33b895ffd 100644
--- a/sci-geosciences/opencpn-plugin-squiddio/Manifest
+++ b/sci-geosciences/opencpn-plugin-squiddio/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-squiddio-0.7.tar.gz 324747 BLAKE2B f932615257e58a8ef63228471fe37e8100678f8a35f70e6ce987d8b52a378ae3d3dc9e28c4c1dada6ad4ea131101512f802c025106b837dec9fdde21de32da5c SHA512 8a39286ef26a89b58fdf825cdb241127fb2448a121e29d9bd71db2588647a92688afe4ff176a3e73155c1aa2039a2df331e05d9f57431bc1aa534a67bba41959
-EBUILD opencpn-plugin-squiddio-0.7.ebuild 784 BLAKE2B 1f67a2dcac712d6d6f68f5c1633f35dbf731ca45aa152e174264df752b285ee3e32e987c42a7de77472aa1d9cb99f58c94141e3337e9f6a8d08c140a429f9932 SHA512 48d0a3dcff2bb886183b794b73964a85fc2a20529c808443a045696c687a26ccc9a0bf6c7e983197ff2ee27bf3f77a66ad29a05b50b46ec93cbfbdd43cca5293
-EBUILD opencpn-plugin-squiddio-9999.ebuild 784 BLAKE2B 1f67a2dcac712d6d6f68f5c1633f35dbf731ca45aa152e174264df752b285ee3e32e987c42a7de77472aa1d9cb99f58c94141e3337e9f6a8d08c140a429f9932 SHA512 48d0a3dcff2bb886183b794b73964a85fc2a20529c808443a045696c687a26ccc9a0bf6c7e983197ff2ee27bf3f77a66ad29a05b50b46ec93cbfbdd43cca5293
+EBUILD opencpn-plugin-squiddio-0.7.ebuild 769 BLAKE2B f5f1726493c921da6d7fd2ffb6690961f78a01d03184b321226af72c4ec711d9a3af1d8d6ced6308b49ade23642cc60a11cb86d417b7f03e4819f14d781640f5 SHA512 17124bceee477860acbdf3bb20582d70597be235cf054df1a256513f28d0f78025f37f821c61c0862d63f608a051d8c7f04dd26794e433fb2ee733481f1ecfdc
+EBUILD opencpn-plugin-squiddio-9999.ebuild 769 BLAKE2B f5f1726493c921da6d7fd2ffb6690961f78a01d03184b321226af72c4ec711d9a3af1d8d6ced6308b49ade23642cc60a11cb86d417b7f03e4819f14d781640f5 SHA512 17124bceee477860acbdf3bb20582d70597be235cf054df1a256513f28d0f78025f37f821c61c0862d63f608a051d8c7f04dd26794e433fb2ee733481f1ecfdc
 MISC metadata.xml 463 BLAKE2B 55d264cabecb2090bcecde07ee9dd30c52799d3b96c35a646152dc5b2d1fe2949cb01d2aaec0ec2a4069d3caaa71cb42b6b3255cc5960513623e7e1efd321fdb SHA512 05ae63d0c9bd8ff74100084b3c6f64a13132c989d7703fe5e2f3806e88d596f8902cd6a437df03c69d10f6d7234a56c7cb129ba968af7b5887399ba14516983b
diff --git a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild
index ad5aca455e74..2e0a3929667b 100644
--- a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild
+++ b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="squiddio_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mauroc/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,18 +22,17 @@ HOMEPAGE="https://github.com/mauroc/squiddio_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	net-misc/curl
-	${RDEPEND}
-"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+	sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild
index ad5aca455e74..2e0a3929667b 100644
--- a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="squiddio_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mauroc/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,18 +22,17 @@ HOMEPAGE="https://github.com/mauroc/squiddio_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
 	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	net-misc/curl
-	${RDEPEND}
-"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+	sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-statusbar/Manifest b/sci-geosciences/opencpn-plugin-statusbar/Manifest
index abe5ba4c5156..272d9f64aac4 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/Manifest
+++ b/sci-geosciences/opencpn-plugin-statusbar/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-statusbar-0.5.20180316.tar.gz 218364 BLAKE2B d1da43ec085e1d180fca524c44ae2f6410b0f74a1f65dc5d586087a46b6f2735a60e3e5332f072d181e0a23a9d2f254a9b0f5872e81a749a3af4fa65c3a997c3 SHA512 9ea70258367d5370fd70d894c098fe781141505a18365d197b58f30e65df57f7b0fd9c5e4bc95603d89f5dd49cc7ef5bcc921f6cd2d12d407686446551ce4eca
-EBUILD opencpn-plugin-statusbar-0.5.20180316.ebuild 785 BLAKE2B 77fb73f9ce85383fadec5c20c2bd6f0ad60470dc6665c5d07c8882914de4b8e1c59649618f1ff340520278f92cdd6ca5c7243e02b9f5e981450b5dca982043a8 SHA512 94532aa6d76396d5c0a386ce7dcbf67ce62c4b1cb3fa3ac55afc5451735259a77406506075694da90ddd1f99d6918b6113bd69ad7664e00df5e058448c498a92
-EBUILD opencpn-plugin-statusbar-9999.ebuild 785 BLAKE2B 77fb73f9ce85383fadec5c20c2bd6f0ad60470dc6665c5d07c8882914de4b8e1c59649618f1ff340520278f92cdd6ca5c7243e02b9f5e981450b5dca982043a8 SHA512 94532aa6d76396d5c0a386ce7dcbf67ce62c4b1cb3fa3ac55afc5451735259a77406506075694da90ddd1f99d6918b6113bd69ad7664e00df5e058448c498a92
+EBUILD opencpn-plugin-statusbar-0.5.20180316.ebuild 752 BLAKE2B 64468ffcad93a16dd447c7726dcc8b56506689c740cd5437afb4e60237ba08d74a2f302cfcea42828cfa0f914adedcf32ab72ef47e16174e8e5be9f1e130f02d SHA512 51032dacab83f44ea8db99679044649e6cf6a51846c167cb4e0f77bd7208e242e1b227ff34f34a447d193ed8ed0ead1e29493a1277a901c5b46acca1e52bef0e
+EBUILD opencpn-plugin-statusbar-9999.ebuild 752 BLAKE2B 64468ffcad93a16dd447c7726dcc8b56506689c740cd5437afb4e60237ba08d74a2f302cfcea42828cfa0f914adedcf32ab72ef47e16174e8e5be9f1e130f02d SHA512 51032dacab83f44ea8db99679044649e6cf6a51846c167cb4e0f77bd7208e242e1b227ff34f34a447d193ed8ed0ead1e29493a1277a901c5b46acca1e52bef0e
 MISC metadata.xml 471 BLAKE2B 2902dcf0f9c69ae77b825128b128a9abc2df0e460b8d7ab2bfadfbe74577e73256508e3ef43e7680b7f4e81bc7d91af66ab6a3c8b161b9afbb2efa48a65b05cf SHA512 dda5fc5256bdf396ef20026f048570ee711382993d900aba3080c2032743229594a98f994673b44905f72756fc04a1232d8e3768b793f98199aac450067def88
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
index 59b6c412b34a..8eae4a6232ad 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="statusbar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/statusbar_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
index 59b6c412b34a..8eae4a6232ad 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="statusbar_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/statusbar_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-watchdog/Manifest b/sci-geosciences/opencpn-plugin-watchdog/Manifest
index e4c0dc76eb3d..8f6de958033c 100644
--- a/sci-geosciences/opencpn-plugin-watchdog/Manifest
+++ b/sci-geosciences/opencpn-plugin-watchdog/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-watchdog-1.9.051.tar.gz 412423 BLAKE2B 91bcc76c3b970b42f8c837f841f884f5784fab4042617bdfdeacc4274e14e99f2d5640b7f0d57e32bf87b307897e7d0616c5fe8c6f3f4322a9eb011409b45ae8 SHA512 6ef178985bbfcb5e8ee48bcffe6949ed4c4a0308daa6b91a654b289505b4c06a130af806f9c4de01a627ee982a2b8e5009cac89a0ce7cee275eb30a148f31554
-EBUILD opencpn-plugin-watchdog-1.9.051.ebuild 788 BLAKE2B aa5117487b6b1575cd171c43774000ef8875172fb4cf7c8c7d0d78cb1564677d6b7f7c1c1ddc6ab2b09328d972557aa04af5b74ca88acef6d489fbff5e895237 SHA512 bbd68af093a3be7cb52ba8409a85fc685b2fa7bc9828ffdc49e7aeb8a7211ba843adf4a86eda6b24bd370c5187cbfa966fa5e86b33cbbe0c022d1d41a0a8eebf
-EBUILD opencpn-plugin-watchdog-9999.ebuild 788 BLAKE2B aa5117487b6b1575cd171c43774000ef8875172fb4cf7c8c7d0d78cb1564677d6b7f7c1c1ddc6ab2b09328d972557aa04af5b74ca88acef6d489fbff5e895237 SHA512 bbd68af093a3be7cb52ba8409a85fc685b2fa7bc9828ffdc49e7aeb8a7211ba843adf4a86eda6b24bd370c5187cbfa966fa5e86b33cbbe0c022d1d41a0a8eebf
+EBUILD opencpn-plugin-watchdog-1.9.051.ebuild 755 BLAKE2B 0a958761be326419ac73bf80c1dacc98a67cfb489f51c7f8c82d27ffb8008b21fe10fe5218d777aace9aa81ed4e0e8f88df737cca696f70337002f372c4dc69f SHA512 63923f7b4553cfaf5f62663df74a61d5965d9f7fe69d22f4e311cefa04dfaebd6abfa6310f04492ba7b608d0a1f7c5d7c25a49222a3d99636281c385f85ce6d1
+EBUILD opencpn-plugin-watchdog-9999.ebuild 755 BLAKE2B 0a958761be326419ac73bf80c1dacc98a67cfb489f51c7f8c82d27ffb8008b21fe10fe5218d777aace9aa81ed4e0e8f88df737cca696f70337002f372c4dc69f SHA512 63923f7b4553cfaf5f62663df74a61d5965d9f7fe69d22f4e311cefa04dfaebd6abfa6310f04492ba7b608d0a1f7c5d7c25a49222a3d99636281c385f85ce6d1
 MISC metadata.xml 470 BLAKE2B 86c281b3155f1fd66c61a82e9fd098c1680fd8afa456cb3bb48d8ef204d10f37830d281e9b106366e4a285d37bdbc46bb0ff06da3c69e7f24b566daad7f94cac SHA512 1365dd4355d750d33f2f194304ac5ad9ef4f59a90383738ac79ccd142833e8b63c34311171f21e8edcff497164f33422f54befea1de2e66cbe8665f63aa88d83
diff --git a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild
index cf1ba40003a9..aa3335fb7dcf 100644
--- a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild
+++ b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="watchdog_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/watchdog_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild
index cf1ba40003a9..aa3335fb7dcf 100644
--- a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="watchdog_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/watchdog_pi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/Manifest b/sci-geosciences/opencpn-plugin-weather_routing/Manifest
index e35a7d1ec7bb..1f669283d23c 100644
--- a/sci-geosciences/opencpn-plugin-weather_routing/Manifest
+++ b/sci-geosciences/opencpn-plugin-weather_routing/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-weather_routing-1.10.1.tar.gz 845403 BLAKE2B e7cacef78f2f5567c008452c6c24eacf3acde8f8dcd78aa05f1e36248f31ab946f27c0bacdbb0882dcc1075a0fe15d6ddd62f5e24f7c38fffaf577683de6a345 SHA512 052377bc2b962b131640ecdb2e688b97325a7935f60c68652be6bdb07486278d03d09ec2c8b4b1547e5eeab1ea7613890604c800a91f185babe5bfb5221a7337
-EBUILD opencpn-plugin-weather_routing-1.10.1.ebuild 810 BLAKE2B 6eda58921aadfa85386ba845577cf968b796e31ded29b2782bd15ee9ba80f6302c7881dc838196c68bbb9bbac32554b3f40db0f1c735e4ee72f99020cda4165e SHA512 40f6f2511d47245a6e9b549b62ab6057e41cad5788a7690a73aea94e62b7c1cb0e3f935bfcac3c2199b9c7f40293c5958857cf4a5311cdffddb41e6da15ea3b4
-EBUILD opencpn-plugin-weather_routing-9999.ebuild 810 BLAKE2B 6eda58921aadfa85386ba845577cf968b796e31ded29b2782bd15ee9ba80f6302c7881dc838196c68bbb9bbac32554b3f40db0f1c735e4ee72f99020cda4165e SHA512 40f6f2511d47245a6e9b549b62ab6057e41cad5788a7690a73aea94e62b7c1cb0e3f935bfcac3c2199b9c7f40293c5958857cf4a5311cdffddb41e6da15ea3b4
+EBUILD opencpn-plugin-weather_routing-1.10.1.ebuild 777 BLAKE2B bd03ab8cf466ef4d4f8c506f7a70515b17f0eafe00cb7c5576b6993305888fc66db77a6326c2cd17dd08eb8b8719cc83b71b02739b1eceac1f215587dc01f427 SHA512 f83452bdc60882de93ae858cf160492d9b67ee4e874f3159acab0e5eb24a3bb5a90a9ca5f4b50d28d61921cc44882b3f879d6a32eefce054e4d4643d609dfc22
+EBUILD opencpn-plugin-weather_routing-9999.ebuild 777 BLAKE2B bd03ab8cf466ef4d4f8c506f7a70515b17f0eafe00cb7c5576b6993305888fc66db77a6326c2cd17dd08eb8b8719cc83b71b02739b1eceac1f215587dc01f427 SHA512 f83452bdc60882de93ae858cf160492d9b67ee4e874f3159acab0e5eb24a3bb5a90a9ca5f4b50d28d61921cc44882b3f879d6a32eefce054e4d4643d609dfc22
 MISC metadata.xml 477 BLAKE2B be997d2c605fae9ffe4a2156ee1f157bd4583d8b28d3229f05d169b10512603ee04ce12568c116e3435efe459aad158a3d5462502344827a94bc104b62dabb22 SHA512 7a02f730a36af241a340d3d07c01051a5570078622651dd2886348fba796f8de91bb6faa45860afd312fd20305bd716c6b7603e5aa0153959e931f7bad88ea7e
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild
index bb68887e62a0..826df2e8f0ba 100644
--- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="weather_routing_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weather_routing_pi/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild
index bb68887e62a0..826df2e8f0ba 100644
--- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="weather_routing_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weather_routing_pi/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/Manifest b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
index e2062a4384cb..549d53d04ee3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/Manifest
+++ b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
@@ -1,4 +1,4 @@
 DIST opencpn-plugin-weatherfax-1.3.20180316.tar.gz 585747 BLAKE2B f81de2da49cd16be62b4fc64e025626a3b7470563db32293803275c0a682b1eff5c85dead9d846e6b69362aa6faaf370f707ab7dab0db981a431bf8872a66430 SHA512 effa3fc2c348bf5a0d70dcfee8a4643f8cba51e5177e40affc50e2d85bffcb2c89c067a57eadb18834900691214b2b1ee17760a8b525cf12da4c7a3e6970daf0
-EBUILD opencpn-plugin-weatherfax-1.3.20180316.ebuild 788 BLAKE2B e8fd09fc1f6b1a313eab44e821291d2c69116953b05d57b3c46c482af05715ee07669b19677bf52263643c7b4ae69945b86b00c1dab06c55cd14d7df1daf598e SHA512 d16fe65db909b71d834de2d7ac90ada96e3764e4c435e2ffb0ae748925301fb4068f270a759306ab8e9810a85f52f8680a08041cc3885c163596b85d87acdf72
-EBUILD opencpn-plugin-weatherfax-9999.ebuild 788 BLAKE2B e8fd09fc1f6b1a313eab44e821291d2c69116953b05d57b3c46c482af05715ee07669b19677bf52263643c7b4ae69945b86b00c1dab06c55cd14d7df1daf598e SHA512 d16fe65db909b71d834de2d7ac90ada96e3764e4c435e2ffb0ae748925301fb4068f270a759306ab8e9810a85f52f8680a08041cc3885c163596b85d87acdf72
+EBUILD opencpn-plugin-weatherfax-1.3.20180316.ebuild 755 BLAKE2B 77b3b8fe994fa09cd2694e0c88e8a618ca32b4b636374f5fc5fb5535408c3337a2ef5079e3579f43f7790696ea29caaa5c56502af8e5a7a8a0835b08329f15b8 SHA512 1b4af80a7faa9d3a81cb107b2bf49ea6853ee04477ec9243dc195ca1e107c67e1b3e711beee29413b2ac682ec82f3d2fd1ae993ce5992a9d0d9619498cfd7beb
+EBUILD opencpn-plugin-weatherfax-9999.ebuild 755 BLAKE2B 77b3b8fe994fa09cd2694e0c88e8a618ca32b4b636374f5fc5fb5535408c3337a2ef5079e3579f43f7790696ea29caaa5c56502af8e5a7a8a0835b08329f15b8 SHA512 1b4af80a7faa9d3a81cb107b2bf49ea6853ee04477ec9243dc195ca1e107c67e1b3e711beee29413b2ac682ec82f3d2fd1ae993ce5992a9d0d9619498cfd7beb
 MISC metadata.xml 472 BLAKE2B ab4fea250816bd907dae37e19a85072902dca8dca6a3a5ea20627fce422a54047813f282efd3c5449ac4a2d0a58fe0233fa94ce6c1a3c707d92aad0bad46f61a SHA512 24db5d6bf03a85cf0b7b246bb2e8472486bf457d284e1f5fa716e09d376e72836bacd0fe9041b93889e2f98af6865ed15481973874e1f93386b6fa71eeef8ff5
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
index 87d53bbc8965..b0cb5f6225f3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="weatherfax_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weatherfax_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
index 87d53bbc8965..b0cb5f6225f3 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
+inherit cmake wxwidgets
+
 MY_PN="weatherfax_pi"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
 else
-	SRC_URI="
-		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
+	SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
@@ -22,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weatherfax_pi"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
+	>=sci-geosciences/opencpn-4.2.0"
 DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
 }
diff --git a/sci-geosciences/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest
index f379b357f0a5..5426867d6338 100644
--- a/sci-geosciences/opencpn-plugins-meta/Manifest
+++ b/sci-geosciences/opencpn-plugins-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1369 BLAKE2B e175b030be15c0137c8f578cccc524c8966534dbfcca765a5a0530acd655ab93188d675041c398ce0e950fc09b47008486c6585ee9f0de2010fa7367a3279fb8 SHA512 518cbc96c138438ff8a45bb2e9f73670f4f89148e6ac2f7392217f2b524b735825612c39ca64127f52d1f07e075912ec644fb573d64a020351c35e17dc89e45e
+EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1361 BLAKE2B 87b168f410a8c4dd0dcda19d25c2ab9656cd25eaff3aafa33601eebc4179d5a7378eb96b9f0417671d9575758bf35da42f7fb179813efb36d2cd7aae7abc9260 SHA512 c8d38d5dd7c39a04f2df4f48e33a680e680ef87aa5d28aedb110555ee915ad4238a5f8ce901469a6d86a696c0ca3d72fa18f32cfef8fe2db1239353f5d651d9d
 MISC metadata.xml 380 BLAKE2B e36e71274105ca4ccc90d1956dbd050ef82af00c0342c17b6d98e7b1d2e7fb9096ab4a2aea3763d054ffb9165d6d8b20122908c6b4ab651f18b722aeec66672a SHA512 8e6413ba8a2f51d21bd883f097825a3e86a410d222496242fc2b6da34ee8d759c473e1c1c58ee93c90b0d88db2cfd6e1f8c00fa29bd8a1637a2026142b9b18ab
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
index 53a7955cde5b..e4b5070063f5 100644
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
+++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Meta ebuild to pull in opencpn plugins"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -9,7 +9,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=sci-geosciences/opencpn-${PV}
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 76b76cf510cf..49ba8f38ddd1 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,5 +1,5 @@
-AUX 5.0.0-CMakeLists.txt.patch 3104 BLAKE2B 33fbedd5960805b783867bc30bc66efe81ce9f0fd839544d23ccbab9b7d50892d8ca6311d01c30bdef83310e8c17210a3564874bf2297832975192cd56e4ddcd SHA512 32e97327c76a5d6028de2026e081b79db279deca45cc3394faf15c632e1567d0bf708f3c81f6d2c0b2d69edd82fd217cf5d0f4970dd27d64d4936c8109eba6ae
+AUX opencpn-5.0.0-cmake.patch 3076 BLAKE2B 09a42b94abf3d8674ba8c82ba0ad2e001c40354646237095d34fd24c712f4ff915e5d5a26bf222fab9a3f8c522dd4b06d4daeaa8fa0adab8a7665d6ae703094f SHA512 c2ceba554e228649529e104df79854873b021d661c8879b2b1c1137750b8c23aa793d3c56840a13fe1e7e73776180f5267af9a5a4c0b1c8d9b4e99804483ac85
 DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
-EBUILD opencpn-5.0.0.ebuild 1335 BLAKE2B 4e9092ecbd69861a21e16ed83fc8363dbd1efc962653a3f15817ba453729b3079a34f9c0e2891aef66d2f9f5c25f5bf8a0e8eeaaea13e49e9efbbd9ba51c2d5a SHA512 8927a11687c646b349a695cd6060985cb915cdf3e93e164112d69ce69ea5747ab15affcd94e93426f9c16da7c9e51c8a48c4b4169dab8a5eaae012a674faf87b
+EBUILD opencpn-5.0.0.ebuild 1293 BLAKE2B 2a394e596e4bd0be608f3c291ebdf9870a432662903f08b869995ec0277dc05c761ed5f1dc874c4752e9a22074e4c1cfa56981aee4efa6635b47b63804e96f3d SHA512 f5505b80f37846fcf77985b6f8504aa80ae29c516ea243e10b423f0283c1ae9105941432567f8af90b089029450112404626da0b6006e41548db4892664d1e49
 MISC metadata.xml 531 BLAKE2B 4c2d7950160138cc8a789d259beb3050af12f9406d376afb70465af18f1a9e979f45e4d6b2bbdb14a9670a936b087b772f29e2dc60289f4ef9e47911e3753e8d SHA512 4315299e7a239d5bdc7edfb6c377217908372e59fe187fe071948fb594100b29bc85116fa458a00233411f47d22780d9c1efeec07cbda6bc3b404a94cab35e3f
diff --git a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
index aca98fe9f01b..ebd354bd826b 100644
--- a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
+++ b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
@@ -1,10 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcec1191a..8df2a9e21 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7"))
+@@ -408,9 +408,9 @@
  ENDIF()
-
+ 
  IF((_wx_selected_config MATCHES "qt-armv7"))
 -  SET(wxWidgets_USE_LIBS base core xml html adv aui)
 +  SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
@@ -12,38 +10,38 @@ index fcec1191a..8df2a9e21 100644
 -  SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
 +  SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
  ENDIF()
-
+ 
  OPTION (USE_GL "Enable OpenGL support" ON)
-@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li
+@@ -436,7 +436,7 @@
      SET(OPENGLES_FOUND "YES")
      SET(OPENGL_FOUND "YES")
-
+ 
 -    SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
 +    SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
      add_subdirectory(src/glshim)
-
+ 
      SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm"  )
-@@ -455,7 +455,7 @@ IF(QT_ANDROID)
+@@ -455,7 +455,7 @@
    SET(OPENGLES_FOUND "YES")
    SET(OPENGL_FOUND "YES")
-
+ 
 -  SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
 +  SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
    add_subdirectory(src/glshim)
  ENDIF(QT_ANDROID)
-
-@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID))
+ 
+@@ -468,7 +468,7 @@
    ENDIF(USE_GL)
-
+ 
    IF(OPENGL_FOUND)
 -    SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
 +    SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
      INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-
+ 
      MESSAGE (STATUS "Found OpenGL...." )
-@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID)
+@@ -529,14 +529,14 @@
    ENDIF(MSVC)
-
+ 
    IF(WIN32 OR APPLE OR QT_ANDROID)
 -    FIND_PACKAGE(wxWidgets)
 +    FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
@@ -59,7 +57,16 @@ index fcec1191a..8df2a9e21 100644
      endif ()
      IF(MSYS)
        # this is to convert msys to windows paths, and handle the missing /usr
-@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+@@ -725,7 +725,7 @@
+   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/serial/include)
+ 
+   ## Add serial library
+-  add_library(SERIAL ${serial_SRCS})
++  add_library(SERIAL STATIC ${serial_SRCS})
+   if(APPLE)
+     target_link_libraries(SERIAL ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
+   elseif(UNIX)
+@@ -1053,14 +1053,14 @@
      set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
      MESSAGE(STATUS "Building against GTK3...")
    ENDIF(GTK2_FOUND)
diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
index 4ae2fe2e75a1..84e09c9f1e65 100644
--- a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
+inherit wxwidgets xdg cmake
 
 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 )
-"
+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 )"
+S="${WORKDIR}/OpenCPN-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -30,18 +31,15 @@ RDEPEND="
 	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}"
+	!sci-geosciences/opencpn-plugin-wmm"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-CMakeLists.txt.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 src_configure() {
+	use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. )
+
 	setup-wxwidgets
 	local mycmakeargs=(
 		-DUSE_S57=ON
@@ -50,17 +48,12 @@ src_configure() {
 		-DBUNDLE_TCDATA=ON
 	)
 
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
+	cmake_src_configure
 }
 
 pkg_postinst() {
+	xdg_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/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 2a15a1ebcd40..22930e83f4bd 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,7 +1,5 @@
 AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
 AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
-DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
 DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
-EBUILD osm-gps-map-1.1.0.ebuild 898 BLAKE2B f3e1d64725ee9f2cd4f55f2ae99f97a95af06daac009dd0d8e95aa63fa00c02ebf349649fa1267df74a8c3c01cf5ebb8ec37edc9a27b1bd5e42460c1e3b19eb5 SHA512 11128628973eb0bf7bf32e7ce3e40d7d8df67d27eef722b102bfb87d5359f3b256938c27c685e82ba9d3c6415403d0c7f89870b74fbd0b04188b7b14189dad57
 EBUILD osm-gps-map-1.2.0.ebuild 918 BLAKE2B 58c078a9fb9bbed6746317ced574f9a5695d844ae5a06b43bf5e5edb4be986e281b7253c43d0b63b9a28c7c4ef8d475a0be5c8ec42a418d6f4ed544ea95e0b31 SHA512 45193dc3ddfaf474747e6f409ab8bc8e32667e4ef3c0a537234f6037a4099844619a855f506c56dae2ef51c09e1ee76646068616aa595913f77c9d90b41bb662
 MISC metadata.xml 327 BLAKE2B 9928a0d7b2d9da58a548fc859f323ad6df0bf6f3e4c1ec2c9e2b32f3b08f314dbf03f5b7cd4ef9e68361a4ea0b1806cd09b9abf198e3b597ac14df2dad08f57d SHA512 cdd37b496981ed29f5f403a7d555beb4bafc78121f0ae8d5cb9c19ab12ef1201a519db43353fe99f679923f5179e3fe2d767f98aecc20229a95a6c2411744217
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
deleted file mode 100644
index 4b45443c6b36..000000000000
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="A GTK+ widget for displaying OpenStreetMap tiles"
-HOMEPAGE="https://nzjrs.github.io/osm-gps-map/"
-SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=dev-libs/glib-2.16.0:2
-	>=net-libs/libsoup-2.4.0:2.4
-	>=x11-libs/cairo-1.8.0
-	>=x11-libs/gtk+-3.0:3[introspection]
-	dev-libs/gobject-introspection"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	gnome-base/gnome-common:3
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gtk-doc-module.patch"
-	"${FILESDIR}/${P}-no-maintainer-mode.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable static-libs static)
-}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 669a5e0d66ec..eb8ee325ab31 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,6 +1,4 @@
 AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee
-DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a
 DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c
-EBUILD qmapshack-1.15.1-r1.ebuild 1013 BLAKE2B 630d65db15e9c615d3fe533bac95f1e5730657027ff467324782fc5d90752daf6bcdc0e471e95dcc2f36baec93eb4eab65d272a0c4878e40094a2e906938baba SHA512 9972ce4a907d68d5d7bddf1af3b776cba41b0cb567ba386d6ee8a40dd75c34bb2e4853da6fc7d83320652cd9fe9f03ac63092d19e6051d4c5788ab1154a6b550
 EBUILD qmapshack-1.15.2-r2.ebuild 1287 BLAKE2B 3a3af85222de338c70600d6ebc6a02937e20c14ceb636f460b174bf29631f97b8f8cfc1ef64a40a00b0a53ad8125a15e96c61e44139c653a198fb58ef5762a85 SHA512 26389bd2aa043a1fb65c5cfa2f0ea0bac9afa0bee9873c5fa56b6b2723b4b6ec5a6a3e37de44e7f36136e68eb02df77fbcdc1ee14e8b106556926a526b7ee5e4
 MISC metadata.xml 831 BLAKE2B 92b3728e320927f7988568ad8b0c7a7b56dc06e8d354e26960f7002652f0a34b6223631179da2d9213f531d135757f17c68589309a0e1736194231a3567df821 SHA512 d69f75e5c21d93c8f0569c8f7429b14f8c9972dead06ebc5bfedaf280c376029ddf4d5f68904472986a5b6f57d9e6a6ef2bdba1edbe440e21d3eca1c65072ba6
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.1-r1.ebuild
deleted file mode 100644
index 6557517df7f5..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/quazip
-	dev-qt/designer:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwebengine:5[widgets]
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/alglib
-	sci-libs/gdal
-	>=sci-libs/proj-6.0.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}"/${PN}-V_${PV}
-
-src_prepare() {
-	eapply FindPROJ4.patch
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/html
-	cmake_src_install
-	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
-}
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index d9313801a4b1..810fbf1cf110 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,4 +1,6 @@
 AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
 DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070
+DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386
 EBUILD routino-3.3.2.ebuild 1632 BLAKE2B 6daeac8ab82c7e148db3e0ac8737f93b48a45a62cfe4e5fbae7d247fee256defdc45ebf1e3e225e28749988cebc2ca793b3f203f120f4148facff34c41b37945 SHA512 1ae54bb4307df0a0330ab1bd19b9929315085ad81dd46b67b7ac90406e17d3e9d9197736ca341803ced53268c4137194e902cf79e75dab1c359da9aa19936fda
+EBUILD routino-3.3.3.ebuild 1641 BLAKE2B ab2bc3136f58dd31d3133105481cb41aa7a39e8f0b2358bdbe38db8f269051708049a471f4b925c6abe0591752d20ff2a9ee287d0db7df4ef03c4a1a59871cfc SHA512 7a17238445009ebd2737beb716873f77662c07e761754caf32002d3e67454553fa7777c1a905700973ce1c24b6ab60530d2f5c9ad974b42a1a418e767a784655
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
diff --git a/sci-geosciences/routino/routino-3.3.3.ebuild b/sci-geosciences/routino/routino-3.3.3.ebuild
new file mode 100644
index 000000000000..7a46ac85f347
--- /dev/null
+++ b/sci-geosciences/routino/routino-3.3.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit toolchain-funcs distutils-r1
+
+DESCRIPTION="Routing application based on openstreetmap data"
+HOMEPAGE="https://routino.org/"
+SRC_URI="https://routino.org/download/${P}.tgz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.2.patch )
+
+src_prepare() {
+	default
+
+	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
+		-e "s@CC=gcc@CC=$(tc-getCC)@" \
+		-e "s@LD=gcc@LD=$(tc-getCC)@" \
+		Makefile.conf || die "failed sed"
+}
+
+src_compile() {
+	emake -j1
+	rm README.txt || die "rm README.txt failed"
+	mv doc/README.txt . || die "mv doc/README.txt . failed"
+	if use python; then
+		pushd python > /dev/null
+		python_compile() {
+			rm -f build/.timestamp || die
+			emake PYTHON=${EPYTHON}
+		}
+		python_foreach_impl python_compile
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	emake test
+#	if use python; then
+#		pushd python > /dev/null
+#		python_test() {
+#			echo "######## ${EPYTHON} ########"
+#			emake PYTHON=${EPYTHON} test
+#		}
+#		python_foreach_impl python_test
+#		popd > /dev/null
+#	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		pushd python > /dev/null
+		python_install() {
+			esetup.py install
+			python_optimize
+		}
+		python_foreach_impl python_install
+		newdoc README.txt README_python.txt
+		popd > /dev/null
+	fi
+
+}
diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest
index cf7d77874926..be3139c577b5 100644
--- a/sci-geosciences/swmm/Manifest
+++ b/sci-geosciences/swmm/Manifest
@@ -1,4 +1,4 @@
 AUX swmm-5.0.022-QA.patch 449 BLAKE2B ac7036240677b1c0a088400f205497e48124f799b3754351787e4748c59bbf5105f6b8290a06acd527ee523ffca4a416d7f9e693c1896c1bc5119964f12208c1 SHA512 b9d68d3273a1f43a34a568aa4a9b334834bfff4abf239d16350916326cad7d6d440f1778b9f75dbf8b2b8b8f6ff12f74cf103b03db6ed8868461c41845aec34d
 DIST swmm50022_engine.zip 338011 BLAKE2B a3fba4a480130903fe576ed1521cb94f54dbf350ec4200d96def10bca6842d55a1de2d17911d35b59acff70d13a31012554ca09b0cb7ac7e60f0f4ebc2e0ea98 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006
-EBUILD swmm-5.0.022.ebuild 1066 BLAKE2B 13172b6686658c6f77ea1ff08dd36a887dc3361984b38c78fdb88dc5acd526bb81a0d97d94b8e15e3c7a1e1e50e960f9f0c71fce10075098c485a8ea733d4304 SHA512 8095f3e7513267cd7049d22f755dfa2b5ed7ff39e9ca1b56885cbb61b445382ef453440b3818ef39c20b9473eb7bb2df94c7edf6d27c739fdab73da6911418e6
+EBUILD swmm-5.0.022.ebuild 1066 BLAKE2B 2bc4ffeb3f06d195ed952873b56f4fdb625d093e9a8515b388b545477d0c09fef851e68a75135ba6f0d8aa5988ca701be45c757947abf1e7653f8115ac94511a SHA512 14eef32aa5e7c1160c826a70319627ab8f0415b99f32fc66177b725a6483c31cc0e6f9e5f63024ffaf7004c2a688196469114c6d97cc05dffc5eb3c25cb4ed4f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild
index 2466bbe3fa13..ae8ad8060a90 100644
--- a/sci-geosciences/swmm/swmm-5.0.022.ebuild
+++ b/sci-geosciences/swmm/swmm-5.0.022.ebuild
@@ -1,9 +1,9 @@
-# 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 versionator toolchain-funcs
+inherit epatch versionator toolchain-funcs
 
 MY_PV=$(delete_all_version_separators)
 MY_SRC="swmm${MY_PV}_engine.zip"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index fd254459cde6..b09959cfbb3f 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -2,6 +2,6 @@ AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b
 AUX viking-1.8-libexif.patch 868 BLAKE2B 247e44a710566e0c4c21272ed61a8037e053de4e8560f88fa5202c2babd60a59b0d62fd8ae4da0af8c8de81f529131ac4a646d21e722c6ea2202de92bec825f2 SHA512 0e6dddd86d12e8ea229b1e7430993fdadadc303860af762f3d2aaca62b0b509ce437a44701e9be9ca503df50e5aef5c8e041bd26339a9a0b0d364b2464c8f8c4
 DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B d29fa2382e0f7e2804dc5fa74b43461216f2ec6f53e286caf7e981e434ac8b4cccc9c2b35ac0aa3db36c4d59be25aeb9beb1771f860a31a1c86b6ff2207c3904 SHA512 5f0d19996ddf92cf472a26c811ff83a95b0dd8a63a5f86a9566f236301afefb2464fd66227762aeb7cb167c6bf9c1a1f81de4541600816bb1b6f76fc2cb137be
-EBUILD viking-1.8.ebuild 2037 BLAKE2B 5e9cf7ad142e3178da1ac92a50adee5f67d28655b02b594fd385c1c1a9582f27e6eaaddf7c0296d7d812ab31a8434608a2e056787d125c8842cd85238dfa491b SHA512 fa63ac4da0792172a596ce1a68de4d6c0213e0618bcac9958c0a6e36ffd0ee3eae162a83b04959a93e46e6cc0ef96456dceedd215ae48734aedafe9008d41bc4
+EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B ca81e1e700c548cb438a685eb8c3cfc8a09df2707f443ebc6a50ecf53e59c3aa03cb6fd777d30cacdf2c552a7e9be0e4b7be137c0ab65941b4c93096f3515974 SHA512 35ebff592596be22150ee391662fceeedf03c543fb29e868c55a9460363ba6354972b620ed35abf31a5cad6ad3062e6af39417079960cc0cb08c38bab4a99c54
+EBUILD viking-1.8.ebuild 2037 BLAKE2B 8ee371b30a9b77d0672e5ab974d6ad7c0e692cc168640c6647163467d1cba2585c81c5ce9217e36e23b7122963da0ef7b866c9889c3095924589686da321703e SHA512 e059b1f1fce251fdb29df957a687ef16acaad7376b305c1ec84ec1323b3b2779c57920c65db1f8d50aec533294a201330854f6c50bb987a46e5a682b2c5674f0
 MISC metadata.xml 833 BLAKE2B b0c8b498cf7786b610e6528448bfab45e88967dca7cc59779ea9e3f51684f7ca85296de3b258971adf23618e1a60bed663be32ecf85a367157d0e7381010aa8d SHA512 8354f387678813b1c78e28a8b28475fca3a148297bcd13555f6e3fdf5fea600b242f82f68265c16cb760d927b6adf07b7dd328a06ff245e8eef70fa3833717df
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
index 5d0117c5794f..01aa13e51818 100644
--- a/sci-geosciences/viking/viking-1.8-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -51,8 +51,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" "${FILESDIR}/${P}-libexif.patc
 
 S="${WORKDIR}/${PN}-${P}"
 
-src_prepare()
-{
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/sci-geosciences/viking/viking-1.8.ebuild b/sci-geosciences/viking/viking-1.8.ebuild
index 144c066bb68e..30f8dbe12482 100644
--- a/sci-geosciences/viking/viking-1.8.ebuild
+++ b/sci-geosciences/viking/viking-1.8.ebuild
@@ -51,8 +51,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
 
 S="${WORKDIR}/${PN}-${P}"
 
-src_prepare()
-{
+src_prepare() {
 	default
 	eautoreconf
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-geosciences
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)