gentoo resync : 04.01.2022

14 files changed, 74 insertions, 69 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f3979c0163fa..3a0f9c211808 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 2b72cfe23f54..b27dd420528d 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -3,5 +3,5 @@ DIST gnome-maps-41.1.tar.xz 2187384 BLAKE2B 792ada987c513118411233b477373db015e5
 DIST gnome-maps-41.2.tar.xz 2187460 BLAKE2B 83f93f9cf371e4275cb73e9a847be6400a4f736fe605266a1f371bc03af13b37af3bae04d5d0a7dbddd8605c099af92030ed8dec555f1f1b59339c9f907b3b21 SHA512 b0f167797986224d5b51df4be44731409241935513f6863ef844121b8b29829ed6ba1e37a2478b93e79dab5f9825e1632ef74f576f37990c9f9779b8de24cddc
 EBUILD gnome-maps-40.5.ebuild 1500 BLAKE2B c4ada54156ab4d3faf9f6991df7cca4677f6e50165b742545e38d2b3997ba2670b4d08ea4e503f710a2468e365829a225801586edb12a61a00f124a83f119612 SHA512 150c00848281da75a4cabd680686901bc9d4d547e15c26aa44c30fb7c647760d201f28dd754e6dcbfd0176c989b6fdcabbfd035b98c4ecc99dbe869e0cddfdf6
 EBUILD gnome-maps-41.1.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
-EBUILD gnome-maps-41.2.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
+EBUILD gnome-maps-41.2.ebuild 1509 BLAKE2B 173f08541d5c370677bd42b4d440b88da47cb3affe90a59e0cfe99759c41d45d5e382de06a5fa55eba0e2e86ce1b3b96c12a59477c17268b7d116a3145858b15 SHA512 5394e17c69da91212dde8efff026a643e7ae2f9631633bf5fb81ab7cdabe9d180dec6eb7deacb019f96e9030f54ab9237dcd44df4ba7743c152873a106e1829b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
index 5ec15782805f..c14cf93f29ac 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,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 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gpsprune-bin/Manifest b/sci-geosciences/gpsprune-bin/Manifest
index 973d438461b4..a30437a02469 100644
--- a/sci-geosciences/gpsprune-bin/Manifest
+++ b/sci-geosciences/gpsprune-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gpsprune_20.4.jar 1269002 BLAKE2B 616e19f69ce81d26c68714240beae154d66e181067385fa35e0c790c7614d9ec6a1a672d67494c96c443d4c30b20fc7122d2a88f8608ca407f5f5b22fa0cf8e6 SHA512 78347793982e8e39f9747a20d1f366376bed93099c84f2e168dc3ffdee041ff7c3e90e48d3f076637d83f8f5f1e84bd18dbe2a35bef68ce972a4f541315a2f64
-EBUILD gpsprune-bin-20.4.ebuild 1546 BLAKE2B d9538c01dd22f7848929871b04cc2ec88d6b8302a03bb5ad3ac74662bbe60ec45a406f9d9ec154cb0ab01aeca14e9a5c8544388709df0868b5e2652a7655ca59 SHA512 9d7f06bed0312e722f29c64494e07077c422c451ad9c29793c335ad9b29155b60c97816211799f64694b67a7154444e056cd5d7699a0c03d161458504198f1ae
+EBUILD gpsprune-bin-20.4.ebuild 1545 BLAKE2B 68d2c4a70474541d11b422a2a7bb36d3b0c4069660fd039f7c15ba42786e7acab23e96a5669bc6272cc8e1ffdab953a61626186d77288bc21eba828c0285d69e SHA512 61830e707e70ec50519997abbd0e8d33b01376e0f62f695e579771c5e65b132caab03253d8169c0157cbbfd34fd323438e90f41a06f8cc179d5c1e96770bf95e
 MISC metadata.xml 261 BLAKE2B 36ef7307b8c913ceda7118a783c7f0c263e94e804f7c75e34007573f82dcddf62cfd202716bf5fb6e0adcad28a5a453d516f4caf4d2ca2eed6d076c6f7824afb SHA512 c24567fd3f715c867c52662d520fbf423d407a2a364d4ea9e5e66610cabb3728b494610106110abfac2b36554c4ad4b63f640e92f8d1b22bdea512037e461602
diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
index 64683646638f..1babb34afde6 100644
--- a/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
+++ b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit desktop
 
-DESCRIPTION="An application for viewing, editing and converting GPS data."
+DESCRIPTION="An application for viewing, editing and converting GPS data"
 HOMEPAGE="http://activityworkshop.net/software/gpsprune/index.html"
 SRC_URI="http://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar"
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0911ccf0c0d8..e1162e5eb12a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,8 +1,8 @@
-AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b
-DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
+AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
-EBUILD grass-7.8.6.ebuild 7049 BLAKE2B ee0747641286d7437da3c3f547f63e0ad93c70ae8f0edd7f25d11d94e6e95fa37d364dfa513bdf107f282191394379c1312a9963951fbc6a287f791a73e8042c SHA512 df96f673860271084a2840e9006f608edf0d85e491295544d56b22cd8e3cbbe30d001b24507cbc6ec0ca75df69760415a42b7bfdf9998c14083b364d05095f5c
-EBUILD grass-9999.ebuild 6892 BLAKE2B 1396540d588329e56f3b9eef76efcdcae283aad5904bf633d8931312fba180c6d498fb967fc4a9f4b459f269fbbaa11ddb166f4ad55a24fc522817c8cde68ff1 SHA512 cf7162d2b39b396d4b701ba0bfd13a01003a98f857756dc62bd55ee5ecea472603f36e7589c2989f0ee066bb644402df74e4303b1e90311f5ce09f045f04497d
+DIST grass-8.0.0RC1.tar.gz 64800389 BLAKE2B b17282f8465bc62979867aa6a8402912901189dc8f9584aacb3b47553874e08fd98572aa34ad6885b5361246f4620775075cc6fcbad66a7e1bb7c6d9acd9196c SHA512 fe7497d362539c0e4241cfe5a98d7f79f8c3e7376f7a630f6aa260195bf8eb546d0b8821208255ae831da31de4dfe988bbdb5c89273ba6ebc0566d99a3c5e664
+EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
+EBUILD grass-8.0.0_rc1.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
+EBUILD grass-9999.ebuild 6912 BLAKE2B 970a289a4d42a6bbf9f89a1be493ae63a52c11406193ef0d79e1c9121a4c77a60eb46fb2ddc88b91c95fae83dc304b6111b7c5f51132c4061e5d511581f83b60 SHA512 6660185d96d3de73f08ed14c869c0cf4bf845e3da2e6626a5d216657eb3af844019f11878fa0d90c4eb2cccbac482f272815c4fbea7a0e51c5fcc7282d917965
 MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch b/sci-geosciences/grass/files/grass-flock.patch
index 4070f228dbb0..4070f228dbb0 100644
--- a/sci-geosciences/grass/files/grass-7.8-flock.patch
+++ b/sci-geosciences/grass/files/grass-flock.patch
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 5f6717ab03ef..c751961cabf0 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
 	blas? (
@@ -44,11 +44,11 @@ RDEPEND="
 		virtual/blas[eselect-ldso(+)]
 	)
 	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
+	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
 	opengl? ( virtual/opengl )
@@ -81,7 +81,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# bug 746590
-	"${FILESDIR}/${PN}-7.8-flock.patch"
+	"${FILESDIR}/${PN}-flock.patch"
 )
 
 pkg_setup() {
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
index 755437aec9cf..1a9dc30646ec 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs wxwidgets xdg
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
 
 MY_PM=${PN}$(ver_cut 1-2 ${PV})
 MY_PM=${MY_PM/.}
@@ -19,8 +18,10 @@ HOMEPAGE="https://grass.osgeo.org/"
 SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0/7.8.0"
-KEYWORDS="amd64 ~ppc x86"
+SLOT="0/8.0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -33,22 +34,24 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
+	media-libs/libglvnd
+	media-libs/glu
 	blas? (
 		virtual/cblas[eselect-ldso(+)]
 		virtual/blas[eselect-ldso(+)]
 	)
 	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
+	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
 	opengl? ( virtual/opengl )
@@ -81,9 +84,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# bug 746590
-	"${FILESDIR}/${PN}-7.8-flock.patch"
-	# bug 792801
-	"${FILESDIR}/${PN}-7.8.5-bool.patch"
+	"${FILESDIR}/${PN}-flock.patch"
 )
 
 pkg_setup() {
@@ -192,9 +193,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" \
-		INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \
-		prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
-		PREFIX="${ED}"/usr/ \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
 		install
 
 	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
@@ -233,22 +233,26 @@ src_install() {
 	local gisbase=/usr/$(get_libdir)/${MY_PM}
 	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
 GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/${MY_PM} || die
+		-i "${ED}"/usr/bin/grass || die
 
 	# get proper fonts path for fontcap
 	sed -i \
 		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
+		"${ED}"${gisbase}/etc/fontcap || die
 
 	# set proper python interpreter
-	sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/${MY_PM} || die
+	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
+		-i "${ED}"/usr/bin/grass || die
+
+	# set proper GISDBASE directory path in the demolocation .grassrc80 file
+	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
 
 	if use X; then
 		local GUI="-gui"
 		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
 		doicon -s 48 gui/icons/${PN}-48x48.png
 	fi
 
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 965bd4beb28c..4e0eaf89a49f 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
@@ -17,10 +17,11 @@ HOMEPAGE="https://grass.osgeo.org/"
 EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 
 LICENSE="GPL-2"
-SLOT="0/7.9"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl openmp png postgres readline sqlite threads tiff truetype X zstd"
+SLOT="0/8.0"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -29,10 +30,10 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	')
-	sci-libs/gdal
-	sys-libs/gdbm
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
-	sci-libs/proj
+	sci-libs/proj:=
 	sci-libs/xdrfile
 	sys-libs/zlib
 	media-libs/libglvnd
@@ -42,13 +43,14 @@ RDEPEND="
 		virtual/blas[eselect-ldso(+)]
 	)
 	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
+	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
 	liblas? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
 	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	postgres? ( >=dev-db/postgresql-8.4:= )
 	readline? ( sys-libs/readline:0= )
@@ -57,7 +59,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	X? (
 		dev-python/wxpython:4.0
-		x11-libs/cairo[X,opengl]
+		x11-libs/cairo[X,opengl?]
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -150,6 +152,7 @@ src_configure() {
 		$(use_with mysql)
 		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
 		$(use_with sqlite)
+		$(use_with opengl)
 		$(use_with odbc)
 		$(use_with fftw)
 		$(use_with blas)
@@ -215,13 +218,11 @@ src_install() {
 		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
 	done
 
-	mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
-
 	# get proper folder for grass path in script
 	local gisbase=/usr/$(get_libdir)/${MY_PM}
 	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
 GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/${MY_PM} || die
+		-i "${ED}"/usr/bin/grass || die
 
 	# get proper fonts path for fontcap
 	sed -i \
@@ -231,7 +232,7 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
 	# set proper python interpreter
 	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
 os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/${MY_PM} || die
+		-i "${ED}"/usr/bin/grass || die
 
 	# set proper GISDBASE directory path in the demolocation .grassrc80 file
 	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
@@ -240,7 +241,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 	if use X; then
 		local GUI="-gui"
 		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
 		doicon -s 48 gui/icons/${PN}-48x48.png
 	fi
 
diff --git a/sci-geosciences/gshhs/Manifest b/sci-geosciences/gshhs/Manifest
index 0611e3b82ca2..bb5b1d10b3c7 100644
--- a/sci-geosciences/gshhs/Manifest
+++ b/sci-geosciences/gshhs/Manifest
@@ -1,3 +1,3 @@
 DIST gshhs_1.13_src.zip 19483 BLAKE2B b71bdd44f5ccfa090dcf4be4c9568b076d8a1b8a6fbf5bf16be1706737820f55bf9ce73338e4e94c236143f66d059db5450eb7c9bbb5da9a6f857f5922299c14 SHA512 c83574f2e2f3b795391d0016234974fb3f3956c8af568b78be07c58f4194ec2c8b34f2f91ab52f1b635f4e4870167d6ef357c4d362207521ed587d89c7d3738a
-EBUILD gshhs-1.13.ebuild 950 BLAKE2B e48f985574c3db3049c691ba6a97efa7a96735a1561f47102757647e09be0f860e6339a8ca548878e9a181d2f7cb63ec6a3d42ff7528e06cf59078464b5f8142 SHA512 8ce932cc844d4da2a6e037fa65f9eea52f873ffa3ee05861cf28b1acb1d44a285f6f984c7f5836f996978e4194668fa378f7c7d5687d28f21aadb280f570a5af
+EBUILD gshhs-1.13-r1.ebuild 976 BLAKE2B b028e6b4ceb21d63cb54dea202f253873e9c10beb882486007f8aa1a402ee859d192d03deca7fd8e82996c3f3dc1131f57a07373d29f4f6e37c038cf98c1d60e SHA512 f0f0a4e9da42b2f397af7c42d4220601ed63a95a85300bb9edc71756689eb546701122ebc495cd3c895bedfb90f2d7c1e6fbed925c26979f222a7d3b9f491a22
 MISC metadata.xml 645 BLAKE2B f2f4150d708dac7a70ad40094dd640d78204cd2a4f7d95c15eeb4780120f7ccb1bc0234025a906bf5ee3af78d58eaa14a2e1dd4b8c012e6882371211e8e9c0ee SHA512 4bf0a53903b6477ee73dc7d7236a4ade06993c7406b2cc3b67aa6ffe739a080cadd85f2476f69cb83954f25cda35f091eb25056a61a926b4290f91cd29f51777
diff --git a/sci-geosciences/gshhs/gshhs-1.13.ebuild b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
index 49e225769e93..14c8c92d67cb 100644
--- a/sci-geosciences/gshhs/gshhs-1.13.ebuild
+++ b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs"
 HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
 SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data"
 
-RDEPEND="sci-libs/netcdf
-	sci-libs/gdal
+RDEPEND="sci-libs/netcdf:=
+	sci-libs/gdal:=
 	data? ( sci-geosciences/gshhs-data )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig"
 
 src_compile() {
 	local p
 	for p in gshhs gshhs_dp gshhstograss; do
-		$(tc-getCC) ${CFLAGS} $($(tc-getPKG_CONFIG) --cflags netcdf) \
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			$($(tc-getPKG_CONFIG) --cflags netcdf) \
 			${LDFLAGS} ${p}.c \
 			$($(tc-getPKG_CONFIG) --libs netcdf) -lgdal -lm -o ${p} \
 			|| die
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index bf3095166b66..33bd5eb0274d 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +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.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
-EBUILD osm-gps-map-1.2.0.ebuild 918 BLAKE2B 58c078a9fb9bbed6746317ced574f9a5695d844ae5a06b43bf5e5edb4be986e281b7253c43d0b63b9a28c7c4ef8d475a0be5c8ec42a418d6f4ed544ea95e0b31 SHA512 45193dc3ddfaf474747e6f409ab8bc8e32667e4ef3c0a537234f6037a4099844619a855f506c56dae2ef51c09e1ee76646068616aa595913f77c9d90b41bb662
+EBUILD osm-gps-map-1.2.0.ebuild 925 BLAKE2B 4fd22bd55f2397864973b1a03d7d87e44bef1ca06e63cf76d51bc45e47b5412125437f30a1e3922ea9c6dd4bee9d60100ff059b9d1505f4820f75bbf09f481b5 SHA512 0419e696fda6cc86d078881216f42eacf9e9662e2150456871629135778d54b40a3cffbb556b27575ea7eb08499299ba3f977c1f53ff0a0e0e08743822014795
 MISC metadata.xml 328 BLAKE2B 44e8606a488dd6ec51cc32435e190db51291a5777ce18665adb42b8adc73309165d62a55b41491ce7f866dc295defc54cef6d482da6178b1568d5e7a178be86b SHA512 f6ab0806342f23e1770ba196718e838628bf6d7c8cf1e8c80f52d57585a01676a59f0e69d6891e3b07e7a092ee2eec998f7bcd98feec38e8553c08481dee5e13
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
index 2edd466b3145..8aad36d2bd37 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.16.0:2