gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /sci-geosciences
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
43 files changed, 1109 insertions, 261 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 1f4c1554dfa0..6e4a9bb2f895 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 27d6b82e099b..9c49d97ea2bf 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -2,5 +2,5 @@ AUX folium-0.12.1-gentoo.patch 319 BLAKE2B f859846e54add4e65a92f7e3a71af4f71b77b
 AUX folium-0.12.1-scm.patch 439 BLAKE2B 58d054e56a0ea38d63c75fa43a5cdbbf671abbf5f7c67649dc1037ca83a8bce6f388a904666b89681a4ffc3f5c517cb2eb5e7b37f2f3e577b7bdbe5f0fe80130 SHA512 aad8a6c22441d593b7895565f7cb37621da4882123e4d40ec4370d707a58c38cf9de4b5fedc9b2e229138fde5e33eef914431e0f9f7761c5a1b9d8b0f6414b04
 AUX folium-0.12.1-setup.patch 268 BLAKE2B 2b4dd0fcbd9cc44978fbdb2db6b9fb2cc697fde1805db68327503e152df17a30a0ef3125507337c78ec31440d9bfd9a7d8264f7ce0ed967edd5297055ebf286c SHA512 2ea66a0e16bc40385cb8202865d1b9d25e480078e120be71f6042d4687704c114d4c46908b43ef2aa6f314b8ff44101ac934cd24fcf58797b49a0198355ee880
 DIST folium-0.12.1.tar.gz 20033236 BLAKE2B 00e9fb369be9300ca04f9ba3fed18ca28a4985111ccd358312570773b80906df292e14a6f4acbd8ea7686f1b807017f729ad918b3b025af321faf5d7686333db SHA512 b19d2180c36160a370e6ab5ccfacf74ba7b735610d43e69a5200529c776e9c11ee42f4f7fa1ee54621f52b0f2e1fc1f86bc9a146c4a924831b12578643a69616
-EBUILD folium-0.12.1.ebuild 886 BLAKE2B bf8ba20b70062f4bb5867135eff2340e01c71f7b6b3e8c3403fcc1f72de7bdb1df9109e2e8c2bbc32ac354dd511421945b42cb6a90e0278d5049dcfa349c4d27 SHA512 9f25a9c1c7f54a9ff7c08c8568900a476f8b41601373b400be596ab832c864079944de2dbfaf3a2a955a8df7045da96fc9105a7c989a109972e534eb04654bfb
+EBUILD folium-0.12.1.ebuild 893 BLAKE2B 76bbd059c101f41ce79dd460cf13e935e6defb953dd7e65673f42a51007d1ec29b1d2bde5b95e2591fffbcc0a96b902053b1bcae9863e4a091a9416ec676eb99 SHA512 8b4de2482e2fab11f5b3cd19a29bd3b23387133eb9145455872fa768e04e623ce3c1966bd55454f15be70d02e16ee8e538e900b9ff42114e44a80cbc4f590227
 MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209
diff --git a/sci-geosciences/folium/folium-0.12.1.ebuild b/sci-geosciences/folium/folium-0.12.1.ebuild
index 2639558415d5..6d239db229c8 100644
--- a/sci-geosciences/folium/folium-0.12.1.ebuild
+++ b/sci-geosciences/folium/folium-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python Data, Leaflet.js Maps"
diff --git a/sci-geosciences/gmaptool/Manifest b/sci-geosciences/gmaptool/Manifest
index 8cdd6c4ed9b8..c28ef0c1d951 100644
--- a/sci-geosciences/gmaptool/Manifest
+++ b/sci-geosciences/gmaptool/Manifest
@@ -1,3 +1,3 @@
 DIST lgmt08220.zip 272383 BLAKE2B 94746ed28300a1db836993c3bb46def08b7961259d760f9f20c57e132ae5c9e077868dab5f98399d0975f947b78dbc602a5ec3393d01ba63998853c348628f22 SHA512 fba72ea07bdef216f7397a77c1918000492f79f66699aa0b1dda4d154638108237172a85651516c457b8ab7859ed1c5110e9d34247ebf74597329a0ab920c69f
-EBUILD gmaptool-08220.ebuild 472 BLAKE2B 92b28cd21565faff73c9e1d87b5cf89ea684da09db78bf8434edc90fae944889acb75938f00fe83963849da9a8cbfc11ada446391c4c53ec031919c4469473a4 SHA512 aa46802b58600facdf149098c9efad736c70555defe0fec03383841d6336032c325ccb1d4457d7eaf8e9b72d6d448da66539ff41e19cc57e8be6afbe8e8c6279
+EBUILD gmaptool-08220-r1.ebuild 472 BLAKE2B 4e1fffa43493bcc3dc4124cf620048ab79409192c0f6db480433b0a7a8bd4733c4d677f3b9502f464ce03bc6a58485048c4946627add75bec54c2cd612a5bb86 SHA512 d8b6077f57b25a821581430bf24986feaade7fcb772cdbf34cbc38553cd5e1e624a95aca64c664b7abf6de7d1c2f3118dcdbc39cb6abcfa7cef87906cc106a04
 MISC metadata.xml 581 BLAKE2B cf60f65fdd27950cfc07f13d9d1edb1c6dc583948789c296486a4151a46c29a65349156ae2e31f827b7153e47cc7efc48dfa852de5c30bc65e9f5b7fd41e16fe SHA512 790f94d3a26665f3323bfc4416556c2bd54a07a80412023f8efcb426ae639e9ba3f4ba182ec855dba5d4a9c0b242dd92230adc90989271610737171a80f4d883
diff --git a/sci-geosciences/gmaptool/gmaptool-08220.ebuild b/sci-geosciences/gmaptool/gmaptool-08220-r1.ebuild
index 54e37f3f938a..7643990be362 100644
--- a/sci-geosciences/gmaptool/gmaptool-08220.ebuild
+++ b/sci-geosciences/gmaptool/gmaptool-08220-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 DESCRIPTION="Program for splitting and merging maps in Garmin format"
 HOMEPAGE="https://www.gmaptool.eu/"
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 9169bfa211e2..a8f338ed125d 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -4,6 +4,8 @@ AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f36
 DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e
 DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945
 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
+DIST gmt-6.3.0-src.tar.gz 68516925 BLAKE2B 0b7197d3fbc8bdf4dec3e85a2a122eee7a4c6cdd7d04d5fc74a72d62f80c4d38d9a2c2c0fa278e03e6ce5f04ef5cb47d9fd6255d8af8ee3736979260f9e5da86 SHA512 696a3bdc86f811e6a05dccad154efee6ea4b800e7a647ed7668f14b793e14eb61e7fadf85c0d34653709e54e595bad2d34617bdbaeb6a73267ec85db29db5ddf
 EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9
 EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7657cc66b852db05b70bddb77abf6a064defc4e433236deee6ff225388b752f243ecab9ca625e886bc783540a8b29c17b7105d82039f9994b78969554db17ff0 SHA512 7dd86ba2c92fd552ed0096b0dc290f12d2df319882ffe5fd2b6a2ca57e4bca0266d9cda7dd2bd62fe9d07e0372bdd614c8f6dcb82c66c5f8a76066c00a774859
-MISC metadata.xml 919 BLAKE2B 39a42bb5a9131c03b736ce373e1e5d20dc3690fdebdb58981a6cebaa769625072412fc61b4197926babba36a02c063d4ff09c7c2f0b3890951074c00d479581f SHA512 6d4baa276668d359e5e11e48ddfa7938cca6994435f8b51cb65feb894be764789d17dd8861985daa538369496a24367ef7c95c979af44f63e91eb81bb4a22bb2
+EBUILD gmt-6.3.0.ebuild 2717 BLAKE2B b8974080be151773eb8e8bd5adec3c5fa9fc0993370fa520ff774ce461cbef4e3b93a11143f25275142c625201b1882c4c014160f71ad54d1f34bcf1bbbc3145 SHA512 3fb28cff4d1dde6c3c777fd412eb2a912e233188a5d83424b833cb0d6aa72202f1c235cec6e58929d3b60b5e025c90ffacd7c6275805111354170fb65f103226
+MISC metadata.xml 996 BLAKE2B 543f4152c5e6c5b0e94fccf8abf4de51bf442080e30bc2db1210f2de5ae822487df115daf7347d10c7a3e89b51ba526e0551bcd6447ba632ba84e6db09d3082a SHA512 071fb44f78d13898938be933959f8db0936bf5c7d40a667453563be4a32b6f49e07c3199adb7ff64e160c69043fe6d09dce9531c896053f211e52198aa9b1ab6
diff --git a/sci-geosciences/gmt/gmt-6.3.0.ebuild b/sci-geosciences/gmt/gmt-6.3.0.ebuild
new file mode 100644
index 000000000000..825e8ff6ec66
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-6.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="https://www.generic-mapping-tools.org"
+SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${P}-src.tar.gz"
+
+LICENSE="GPL-3+ gmttria? ( Artistic )"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+IUSE="blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre pcre2 threads zlib"
+
+REQUIRED_USE="?? ( pcre pcre2 )"
+
+DEPEND="
+	app-text/ghostscript-gpl:=
+	media-gfx/graphicsmagick:=
+	net-misc/curl
+	>=sci-libs/netcdf-4.1:=[hdf5]
+	media-video/ffmpeg:=
+	blas? ( virtual/blas )
+	fftw? ( sci-libs/fftw:3.0= )
+	gdal? ( sci-libs/gdal:= )
+	geos? ( sci-libs/geos )
+	lapack? ( virtual/lapack )
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="${DEPEND}
+	!sci-biology/probcons
+	sci-geosciences/dcw-gmt
+	sci-geosciences/gshhg-gmt
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# Rename man pages to avoid a name conflict with gmt5
+	pushd man_release || die
+	local m c suffix newc
+		for m in *.gz; do
+			c=${m%%.*}
+			suffix=${m#*.}
+			if [[ "${c}" == "gmt"  ]]; then
+				newc=gmt${SLOT}
+			else
+				newc=gmt${SLOT}_${c}
+			fi
+			mv "${c}.${suffix}" "${newc}.${suffix}" || die
+		done
+	popd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGMT_DATADIR="share/${P}"
+		-DGMT_DOCDIR="share/doc/${PF}"
+		-DGMT_MANDIR="share/man"
+		-DLICENSE_RESTRICTED=$(usex gmttria no yes)
+		-DGMT_ENABLE_OPENMP=$(usex openmp)
+		-DGMT_USE_THREADS=$(usex threads)
+		-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=OFF # Install bash completions properly
+		-DGMT_INSTALL_MODULE_LINKS=OFF # Don't install symlinks on gmt binary, they are conflicted with gmt5
+		-DGMT_INSTALL_NAME_SUFFIX="${SLOT}"
+		-DBASH_COMPLETION_DIR="$(get_bashcompdir)"
+		$(cmake_use_find_package blas BLAS)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package geos GEOS)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package lapack LAPACK)
+		$(cmake_use_find_package pcre PCRE)
+		$(cmake_use_find_package zlib ZLIB)
+	)
+	use pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/doc/${PF}/examples
+	docompress -x /usr/share/doc/${PF}/tutorial
+
+	# remove conflicting symlink
+	rm "${ED}/usr/bin/gmt" || die
+	rm "${ED}/usr/$(get_libdir)/libgmt.so" || die
+	rm "${ED}/usr/$(get_libdir)/libpostscriptlight.so" || die
+
+	# Decompress manuals
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die
+	# Rename bash completion file
+	mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt${SLOT}" || die
+}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 3a11971d2b8c..144f7af6cdfa 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+    <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
     <flag name="gmttria">Non GNU triangulation method, more efficient</flag>
     <flag name="gshhg">Install coastline database</flag>
     <flag name="htmldoc">Install html documentation</flag>
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index f4bb2b5d6c3e..76273fc71802 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-maps-meson-0.61.patch 916 BLAKE2B f2affee9ce30596872b806da7833ec5f9dcf21db26b3ff2f5b9688b45658f40388c7103bbb0dd03de314c5d5e556c91229b86afda7f2081b876d8dce9b4c6af8 SHA512 a201b6e631c8bf8dc6d15c864266414eb659740d34bdfcc3fa021ac03c6585012e921c77135acde6b4be06fc2f1e7828e30de4ca2e7595f72b4f082bc6b00092
-DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
-DIST gnome-maps-41.2.tar.xz 2187460 BLAKE2B 83f93f9cf371e4275cb73e9a847be6400a4f736fe605266a1f371bc03af13b37af3bae04d5d0a7dbddd8605c099af92030ed8dec555f1f1b59339c9f907b3b21 SHA512 b0f167797986224d5b51df4be44731409241935513f6863ef844121b8b29829ed6ba1e37a2478b93e79dab5f9825e1632ef74f576f37990c9f9779b8de24cddc
-EBUILD gnome-maps-40.5.ebuild 1556 BLAKE2B ab90b78a02ae92718e4e351286a82c29148746012c8ac9a28380a562eb0b6a39851c863b7668226a0a763853b8368e5e17304844d4f8be2ef6b594364b3c28ce SHA512 1b0b7a229feba6a6f8114d5fa53d6b1942778eabf5da1f95dd7a3ef27b77bcd70a07176ada416a67c5ff5fa966f659bf3c351a14b4f7cbf001aa2449213169ef
-EBUILD gnome-maps-41.2.ebuild 1565 BLAKE2B dfb99da4d0b3a191d0d4651437125936c4e8ca930f16ef5a2def6c18efcc8f5b185b9610508234ba2be8aca3426dce0c3d794d3b4bc5f2a4cf5e59ceee19273d SHA512 3fe31768485b7004da5c2efdcf818ff93a1ea892db640edd3dab7812bebef711d1bf48aac2c08a219b26d41372fb7b323e4e63eace34ff91bd12a71b540feb32
+DIST gnome-maps-41.4.tar.xz 2187076 BLAKE2B bb35925d1b69d50c65e3ffe68386242b776c2089bea3b2bfe88383f1a8fba4045474a1c8fc1c5d07a5b207ad953396d3a76af77fbdf984d286b5e242f9eea78f SHA512 605de671f85ae38a8dc79e58594f2170215e8a070377b1d9ebded9891425898bb40613f6acee1c95f5ea2e0d95e6a8c25757665a5aa890831325701b1abbc8fa
+EBUILD gnome-maps-41.4.ebuild 1507 BLAKE2B dfeae112e815cfa9a3d7bdf021a988ac539366ffaba065fc901331b24a8a9f90fc3cb677f21bb26c5781b4b4e5920f02c9e1be6783a4d73cd0e5ec7bf51fd66f SHA512 cedd81bde40b79aa4889714186375d8796ffa78d1dd6480476b894a5f9da6700e03feac73c5d0e959ffc81e6ad73b29ef6fa2f52bbe64f929113eb924a843ab6
 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
deleted file mode 100644
index 678e95e601f2..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 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 ~arm ~arm64 ~ppc64 ~x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	x11-libs/pango[introspection]
-	>=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:=
-	>=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="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/gnome-maps-meson-0.61.patch"
-)
-
-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-40.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild
index a710f389c1d4..d8c1777a2930 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="A map application for GNOME"
@@ -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="
@@ -45,10 +45,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/gnome-maps-meson-0.61.patch"
-)
-
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 8464f315d2b1..1908895fa1fe 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -13,6 +13,6 @@ DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd21443
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
 EBUILD gpsbabel-1.5.4-r1.ebuild 2547 BLAKE2B c1a046ccf5fc308176ccc880bc33bbe1c345b1bd8ee2f49e2d87e64775e8cb7ee69bce3a71241fef85f65e28a5698210457f82c8acf16cfa1aefa67de2627c40 SHA512 e98bafe27f2793784270526bba6994e5aff39c3f8589edee4720524cba5b6695873471b439617a3808f5ddcbf27cbe989eb496c7ef2d50638fc4bef12c9d834c
-EBUILD gpsbabel-1.7.0-r1.ebuild 1770 BLAKE2B cce7e1bbe264fda798edbf72718502251527adb4da187acf5bd92b8bcce67dc8e5f70f82a815d06e9dcaf3f6e507200809c53286de76cf5348172b55764c6b4c SHA512 1d694786a1168589101d93f85367e2d03ef7d93ca765db9c0ad4c0c68d1a87f51914373ca7152b634b44b8d60d0dc8b94e311485ad1f091925544b736ce1272e
+EBUILD gpsbabel-1.7.0-r1.ebuild 1769 BLAKE2B 9807d1fedb74f998b87b71b9fef86e8e2b32fa3d517aa9ae0935e2ef5813e326039cc1f662c5d6645306f25e0c0e834225489d658e9e94b1ba66ae1e91654c12 SHA512 60a3988906575b57e7992a086f421de995e32849eb1f457c537ba8a17c9de4c6fbb7ac66b64ea1d4443010a5ecbe201bf44f30665765ebadcbde6e2c419fab04
 EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index f87502efa322..809c7f441b8e 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.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
@@ -19,7 +19,7 @@ else
 		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
 		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
 	"
-	KEYWORDS="amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index bc2facc17e72..b2901e61a0cf 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,5 +1,9 @@
 AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079aeb06a3e7db3be5fd47f5b84e38d42a9ef6ff3f5b63913e66ed1b39af7bc821c6d6c13cf33ac4015fca141dd9b66c682005afd SHA512 d7af75d0f513d9104c3a39e191447dc1269cf3fc59c3289703e298f8e671a96849247e2b979153fee9f70469416e249e5dcd6f6ebbacae4eb2d52e1897a326ed
 AUX gpscorrelate-1.6.1-makefile.patch 1447 BLAKE2B b48b6de5b627db142ebbadaafe2b4ce22769dae4427212395b99cfc8232c34ce4c058c4c9c588fbc5bb1f75bc81b69123b92c293322085a630557de3618c4153 SHA512 a2fed7e019b5188df59898f194e56d1740e6a46f034595ba40a9280202181615039a2732c51700b1150e152e82c6d644aee0669feb56fd19bed568553a667044
+AUX gpscorrelate-2.0-desktop-pass-validation.patch 242 BLAKE2B 65ca39f03eb9701473615485e9a5c6a475cfd2a247491dabb85638600c327a959e93925cad1a8e1bc160ed651fe3f346615d11ff65c2102c5a2bdd259bec973c SHA512 ce5628d6c92380f327af032848d8151e6b2b340ba23fa91e148dc5ebddbb6508af5b044daacac0921741687a3669f0d2b7195bea365e6c89870e2d96fc07c71c
+AUX gpscorrelate-2.0-respect-users-flags.patch 715 BLAKE2B 474c926867462219586634d382470b9096d674ee4e9dcbcd9fcb9edbd498b454bb9709b3f51435ad165199a75dec047494a8ca33da3c600716698ad206466b13 SHA512 05ecfddae24a884852cb6ffed2d5d0abf0249ef11c4b4f8cc5fe299604b0b635c1eb94115f8a976fc23306df944a860ef7b3fdf696894c285088159877ccf4f6
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
+DIST gpscorrelate-2.0.tar.gz 283797 BLAKE2B 8cee5b3c37fa758cbf665b9e7cfcc61d7ee73c4aebc0a660718812c598e9b362e76c746a8d6007080783a5d2c0b91eaf5d5c90f48072e6808d2409c6d2b5fbf4 SHA512 c4267b14b219118f2d56c064403a3a7bd74ef1d3af1e83bec6fe5b391bee80b3d69a0e52a834da9f615d9c54720ade28ea22ab8b6fac75c31c71fc5eb348f709
 EBUILD gpscorrelate-1.6.1-r2.ebuild 1082 BLAKE2B a43a77ee072918bda8379376cb49f9594d49a8f1311d903b779e798398f9c4da6500d73b1eba8f581b3a4692f984fc5ac35a96e91e035c8d107bab14a88a1085 SHA512 42dd15a8e4e1ba0956fe61d2f4f7fab0ca67a4a2e9b5cb8422c8e6f64b8a0aa468fa85d80d1e3f9324a30e23a467605ac5bc01d8861222550fcdc89219296c71
+EBUILD gpscorrelate-2.0.ebuild 975 BLAKE2B fdb4ced014aec070ded38c4074fe384ecffc737f6a2cd94e0a804cc9f687c5f3a4507c6906ee26b995689ba8d94f8bb2700b82df36cecc811b0c30972baf7f56 SHA512 cf052c3259a8ff6d265dad65e62c24ceb9f0a78aea7cbf9b74816e373be08767639a22b644c05153ff93a0e159fc4ad1bc1b5a922f5bf4d96844c88a1e2cdae9
 MISC metadata.xml 357 BLAKE2B 394ec89ad70a468ef62c4354375a5c232ae755990ef84fbf78cdaa477172be4d01ca7ea3123f8030503d7f347e0033538c1fa3376b67938b2ef4f3be2628083c SHA512 bf05fb14f3ff6ae55facb4c43fba38c635a5ede64c238d471194eca9e1d74d388a0fd56b8a56ee9dca84100ce24786f1e957cad9af28d4e88240a557712a3183
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
new file mode 100644
index 000000000000..131e21041898
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch
@@ -0,0 +1,10 @@
+diff --git a/gpscorrelate.desktop b/gpscorrelate.desktop
+index b4db0d6..0885ca4 100644
+--- a/gpscorrelate.desktop
++++ b/gpscorrelate.desktop
+@@ -1,4 +1,4 @@
+-[Desktop Entry] 
++[Desktop Entry]
+ Type=Application
+ Version=1.0
+ Name=GPSCorrelate
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch
new file mode 100644
index 000000000000..31519848a7a2
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 7634553..9bfd025 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,12 +2,12 @@
+ 
+ PACKAGE_VERSION = 2.0
+ 
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ EXEEXT =
+-PKG_CONFIG=pkg-config
+-CFLAGS   = -Wall -O2
+-LDFLAGS  = -Wall -O2 -lm
++PKG_CONFIG?=pkg-config
++CFLAGS   ?= -Wall -O2
++LDFLAGS  ?= -Wall -O2
+ GTK      = 3
+ 
+ COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o latlong.o
+@@ -20,6 +20,7 @@ CFLAGSINC = `$(PKG_CONFIG) --cflags libxml-2.0 exiv2`
+ GTKFLAGS  = `$(PKG_CONFIG) --cflags gtk+-$(GTK).0`
+ LIBS      = `$(PKG_CONFIG) --libs libxml-2.0 exiv2`
+ LIBSGUI   = `$(PKG_CONFIG) --libs gtk+-$(GTK).0`
++LIBS      += -lm -lstdc++
+ 
+ CFLAGSINC += $(GTKFLAGS)
+ 
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
new file mode 100644
index 000000000000..982684d854bb
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
+HOMEPAGE="https://dfandrich.github.io/gpscorrelate/"
+SRC_URI="https://github.com/dfandrich/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="gtk"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/libxml2:2
+	media-gfx/exiv2:=
+	gtk? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop-pass-validation.patch"
+	"${FILESDIR}/${P}-respect-users-flags.patch"
+)
+
+src_compile() {
+	emake gpscorrelate
+	use gtk && emake gpscorrelate-gui
+
+}
+
+src_install() {
+	dobin ${PN}
+	if use gtk; then
+		dobin ${PN}-gui
+		doicon -s scalable ${PN}-gui.svg
+		domenu ${PN}.desktop
+	fi
+	dodoc doc/*.html doc/*.png doc/*.xml
+	einstalldocs
+	doman doc/${PN}.1
+}
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 167bbfa63e16..87e0a9cb07d4 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,6 +1,6 @@
 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
-EBUILD gpsd-3.23.1-r1.ebuild 6114 BLAKE2B 776b1bf301a0b0bd510b29154a4c15911bb9e19193b12a0e4a3facf4be163b3ac936c43245dcf9af7bc1b399a6c381d6a594731e5d000fd4cc51441fc8572a5b SHA512 2857c86eff24148bff73467f48c4cb34f1a203f170e24a594f41554d8b8cea6ae4908e7495a4c320ae4ed536dbe92976345098c5c4167db58c4fa541352dec6b
-EBUILD gpsd-9999.ebuild 6119 BLAKE2B d3bbdc0e2e1efdcaab7ece8c41a3e15d2324ca4b7127e64c23e62ccd92acbe00220f5603c095a8a0824328adfeda4398397d9323ec4cb906aa811cbb519e799d SHA512 6a66ab64970f63cbf5a362a4a7eb127b7babfcc88af112dc13192402b6f968548c0d357bb02d515ef6dfa3f8d8247ad7fe0df67004305356f6ec227725ae5b4d
+EBUILD gpsd-3.23.1-r2.ebuild 6114 BLAKE2B 3ef0fe0f4d8d11c3eb8ef9d7f7c3961ada3c6a0ca7f58f56ed2546b7c0e16a876f540217c2d1beb1a3632332f0b2c06f2e3a0daeabc05cdb4b6b4eed8a4fbd48 SHA512 8d73047481188acf03a1cbc4e104c131c55d6dadc2fdf1e52cc4fa662983b0c0f46be0db98cae15a25b1bc35ea0e9982ea91d99c0ea8d4f1a776636ed2491c81
+EBUILD gpsd-9999.ebuild 6119 BLAKE2B 2e154b334631a20522290bd70530ec6ed94a0aa5608d1f7e58a085e63ef21f0d25c1ad72db93500c7008697d52fabd37ee357add57124ba8520bb5297eff0982 SHA512 5d528b6b8a9d2a88488082252b8ebc940d3625c46083c40d064e366bb02e26bbce1c29cba511bd5064d970f6fca720d0f78fc0ff9c01926e9cb7f653d3e69693
 MISC metadata.xml 951 BLAKE2B 81e95d95a4ecd4ea59dd5c8c187bdb53cf32f6334e628b77986fc300d3380c310d1c77cafb113de2b260796db735752d2c7012fd7753504804208f4cc29302d0 SHA512 4383074eaeb476dcc84f38f2c2e68afb956f54c9fc4e0837e09e2d498e02fe59fd31351a11bf886da875c8e08aa84bfb09b1252dbd68ccf171f3c57c5fe1c883
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index d602376843ef..111be4c72237 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.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
@@ -44,7 +44,6 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
-	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
@@ -67,6 +66,7 @@ RDEPEND="
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
 
 # asciidoctor package is for man page generation
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 4e8c7af4c741..33f0500a28da 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.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
@@ -44,7 +44,6 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
-	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
@@ -67,6 +66,7 @@ RDEPEND="
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
 
 # asciidoctor package is for man page generation
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index b796bcccaeee..fe371a206c49 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,10 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
-DIST gpxsee-10.0.tar.gz 4994900 BLAKE2B 5f0e59655da285461de39bcac51b65ae4965723a5a438b88eb55b22f0e9398db94edce283f0bd1218d0b78375edf9e9d3e2148079cf12c9927819a0235df7f08 SHA512 bc081fdc9000be6f605b137fe5de282d11508b994b34d1e515913e33829516893c7748d9c5a5ec2639e36e665db8dc99656364498abd0e21069a7fc34b251f9f
-DIST gpxsee-10.1.tar.gz 5118085 BLAKE2B 699b54e4d910c2f2c82ecae71b95af88170d2fa754eb9359ea8dc31e65f4f0dbbc6d8a21a9542c9e2d7eccc7b193f222ef0e066eca1366f88c609765589b8893 SHA512 a29466cab39f69e65791f5d519502b98a1659e3b307725f6e0b04261a6882ee053c8a31398304ae6fd6135460592f6063891e68cf9bde4a87106119582ebc46f
-DIST gpxsee-10.2.tar.gz 5118104 BLAKE2B 5651b68008f28394a76d7b04e6bd9721b85e388de8a90a7ceb84cd71950367a216491079f38ed759340d5b6abb7561ca5a61ab80d4f5d8d5be9f24f408d3fd50 SHA512 802d382d95648125f589c000f63e815570e8eb6c6f00feed75a84efe06739adf4b32a52793f841fb088a13e8b9bb8453f2d92b12d4e33a0ca336282fe1740b5f
+DIST gpxsee-10.4.tar.gz 5112577 BLAKE2B f5abace946a0eb16cff1f9aab27a731d2a9f3b0123da6e505a4f620a1e8f5ba060fba718676466f9b4f4103963dfce4fadc50c90a29048f37f4848f0f01835df SHA512 f3ac6fca6602da90edea50adafd907f9b631ce45c4ddaa438cd57ed5ca63cc3f6882792bb5789ca669f7e7e0adbebcddc24d140de6b8c32097c265ce63067a4f
 DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b
-EBUILD gpxsee-10.0.ebuild 1127 BLAKE2B 3933226f6889696d60554467117c4029ebc945c7251183f3b13f4c53982519420fc9eb0a15d2ad1a613dc766e2633031be233af7e3cf08c8842f1b57fb9d3245 SHA512 7dda94addff64c2342ca9791f3bc91af912fde65356fd402694cd68c0d0fa4ec58b55fd3899cfa235eb751f0ee728fd82bd643a5b1cb1a55d1c850a2457b5033
-EBUILD gpxsee-10.1.ebuild 1130 BLAKE2B 9f9472042dafb5575440e564f1415b9eabff748ddae489686e1f35495f9d11b92759afdea86b1d215754c21ed4ae078a1c912313cedbce735b87486270852a6f SHA512 0450c351201ea53f84bd345d950793a4a4b6bd8873646442278c1aa82dc215ac9f7029da9f06e7c528552df5fd954dddb88f3df49bf592953e948ee9c997126d
-EBUILD gpxsee-10.2.ebuild 1130 BLAKE2B 9f9472042dafb5575440e564f1415b9eabff748ddae489686e1f35495f9d11b92759afdea86b1d215754c21ed4ae078a1c912313cedbce735b87486270852a6f SHA512 0450c351201ea53f84bd345d950793a4a4b6bd8873646442278c1aa82dc215ac9f7029da9f06e7c528552df5fd954dddb88f3df49bf592953e948ee9c997126d
+EBUILD gpxsee-10.4.ebuild 1127 BLAKE2B 97763c46553583a8c4c36a3b77bbb3874958945f358a8fe35252f71f0aefc5a5fdb6d9ffdc9f2bb7a1ab86415bc4d43522593db782c1116acc6bcf0e1da49852 SHA512 c0dfbaadd548cda1fc402d77abc1d78d805e5628120770a2eb1ba20d5f34e18459b2b74a42ebe514bb444b15dd55885cbfd03e153fa0b85a939d6e7a6caf067d
 EBUILD gpxsee-9.12.ebuild 1120 BLAKE2B 8dc901c2dde2c921a160217c8b42de6f0ecdf251477bd880930a11e0816e3b0c6618de2f47d8b7bbc1628b31ab3adcb372d1d191a4f59f349bb45d84e072e9a6 SHA512 1e5a65b940b790a787fab3c711bc3b8513069346ed164c3b8c55da0701f5b80a074ce72abb0aa1ba33cde2fe69aa8413de367e36df64fd72aba4bc6b05979b15
 MISC metadata.xml 453 BLAKE2B e7f32299798b2f8b3d91dcdf0c4c024e8296a3cfa0f0a35acfc52475b4b2df0f276b6a9e9718a2f3593dde7fd9ee11afc06c601235db7e272ec552b072bd139c SHA512 c66111588383b1363eb07d3f1d9efd2adad37ee6bac9d159847f642b2ed864e1bb26db8f67fc94e9a5ca4d28623e8dc8d15395132e46d1e4fca17cbf6986dc35
diff --git a/sci-geosciences/gpxsee/gpxsee-10.1.ebuild b/sci-geosciences/gpxsee/gpxsee-10.1.ebuild
deleted file mode 100644
index 05603a86cae0..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-10.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 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 ko nb pl pt_BR ru sv tr uk zh"
-inherit desktop plocale qmake-utils 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/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtpositioning:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale 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-10.2.ebuild b/sci-geosciences/gpxsee/gpxsee-10.2.ebuild
deleted file mode 100644
index 05603a86cae0..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-10.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 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 ko nb pl pt_BR ru sv tr uk zh"
-inherit desktop plocale qmake-utils 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/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtpositioning:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale 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-10.0.ebuild b/sci-geosciences/gpxsee/gpxsee-10.4.ebuild
index ddca8ed2552c..3fa77cf3df47 100644
--- a/sci-geosciences/gpxsee/gpxsee-10.0.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-10.4.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
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index d14dde13bc6d..a2eca504703c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,8 +1,12 @@
 AUX grass-8.0.0-mkhtml.patch 10339 BLAKE2B 39b55a1c33b751508128533bcfb513d3aab9227985ff142eb346c02997599afc228274a7aa8b02258def491816b98fb52b307007facfcb00b79657afd42a88c7 SHA512 a4eca79ccadf77b863b254a83fab8eaa096bbf977bfe54cd4de3ee914f55e3499fe42615904b1717ffbb0da06334306543f0562203793adaa0770926498dfece
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
+DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
 DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
+DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
-EBUILD grass-8.0.0.ebuild 7140 BLAKE2B 5422398098357271b96af670b425a18f8b4b4c961dc584813c71b76293d0ee43de5140406e2f6eb8fb582d6dcd5eeb868042ed5b0661662a5c2c55c651e091ba SHA512 0873ee2a14e77cd5ff8ab62407e116e54b4606afcbca0b83f584327e4b0f0602ca7fa5b001f1cd20fb5661963e746589a669fa1fcaf6dfecada7a6c5483c1d83
-EBUILD grass-9999.ebuild 6963 BLAKE2B cae7116cd7dbeb06f66c6f33237b4f10d5aa339d86bbf34a416c71bb82d37bacdc68a628a6b40b3ba97aa77bc586dc2bc731faf740aecbc17c84fbac0e427840 SHA512 2792f7a120049a58541433ac119f7358c07cb403c35c07ffd34a5f7d55eb67232e49ff9c2acc5d5a5ec7be5cd16b03ba97ff6e54a00536282975986ef4b0ecf3
+EBUILD grass-7.8.7.ebuild 7037 BLAKE2B 6c49c86b9360199a2b47340241d6ba7d350e91dcedf9d5e8f732e97ec624b312b75a36e520949a38a9c5684c0fac3fd85113fcebb0ea0886ec815045566cb3a0 SHA512 e24b41c9754db9edc469d9095d9f97303ad703e047e0ab6810afb5f7b42e28c453a5c0f2292f71b6bc2acd0fa4157e172fbae7966f456ef2eb7fb938f747bb75
+EBUILD grass-8.0.0.ebuild 7138 BLAKE2B 3a28346c1ea888baa94e3b8c4b2b8028ee69f3d8f1caa671c1d9d11c8d65ca27ce8ce3c99c525d75f8dd06eee2f2bde54c6dc4ef666f0fe5691d7d2b1f4143a5 SHA512 3f755b7f3d077d4a4e003b88d08e541cb8efcca07a9864b73e858db1917867ebcb284928e55207c89ebdc800586bfc4cab32ad75d3b01e408c48eea77a8b69ff
+EBUILD grass-8.0.1.ebuild 7256 BLAKE2B 4a60087c4cd9e8e057f8483a72c2a6bdb17880232148e9cfe3a91e2f37236c305775ed6beda86bb84f9c660b67e1957acde60bf1249f43d87e774a95fdd30500 SHA512 1653b344a3d806bb63e5974d90db00535d1fc868c5286d2b99ea9335a0ca2f6a4bd578a42a605346c2bf123a757f0417c743c05a50afce1c63dbf070719fc2a7
+EBUILD grass-9999.ebuild 7196 BLAKE2B f895558bb5ab4779e48d5ceb0e10dfb83160d57a9407d6ccec0ace03b8a9c2e48a398a66dc615070320e92005d4c28a41fbaaf841e701e36b690d0f71b44d21e SHA512 1d6d747956c124d59c4afadd1053c4f649d4fa3e939d56754d3f8ad1220572bdbeb28bb2930f3891022a66ad8ac1e22ebaee314e0d597b47808de1855540322d
 MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446
diff --git a/sci-geosciences/grass/grass-7.8.7.ebuild b/sci-geosciences/grass/grass-7.8.7.ebuild
new file mode 100644
index 000000000000..eeef656e6c64
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.7.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+MY_PM=${PN}$(ver_cut 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+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"
+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}
+	opengl? ( X )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
+	sys-libs/ncurses:0=
+	sci-libs/proj:=
+	sci-libs/xdrfile
+	sys-libs/zlib
+	blas? (
+		virtual/cblas[eselect-ldso(+)]
+		virtual/blas[eselect-ldso(+)]
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos:= )
+	lapack? ( virtual/lapack[eselect-ldso(+)] )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	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= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:4.0
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( dev-lang/swig )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# bug 746590
+	"${FILESDIR}/${PN}-flock.patch"
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack=$(eselect lapack show)
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas=$(eselect blas show)
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	default
+	eautoreconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	if use X; then
+		local WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	addwrite /dev/dri/renderD128
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
+		--with-proj-includes="${EPREFIX}"/usr/include/proj
+		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
+		--with-proj-share="${EPREFIX}"/usr/share/proj/
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png)
+		$(use_with postgres)
+		$(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)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with X wxwidgets "${WX_CONFIG}")
+		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
+		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with X x)
+		$(use_with zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
+		install
+
+	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# translations
+	if use nls; then
+		insinto /usr/share/locale
+		doins -r locale/.
+	fi
+
+	popd >/dev/null || die
+
+	# link libraries in the ~standard~ place
+	local f file
+	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
+		file="${f##*/}"
+		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
+	done
+
+	# link headers in the ~standard~ place
+	dodir /usr/include/
+	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
+
+	# fix paths in addons makefile includes
+	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
+	for f in "${scriptMakeDir}"/*; do
+		file="${f##*/}"
+		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+	done
+
+	# 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
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+		"${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
+
+	# set proper GISDBASE directory path in the demolocation .grassrc78 file
+	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+		-i "${ED}"${gisbase}/demolocation/.grassrc78 || 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"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
index 598e8b0ea52d..3ab8a5a5d5f2 100644
--- a/sci-geosciences/grass/grass-8.0.0.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/8.0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~ppc ~x86"
+	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="
diff --git a/sci-geosciences/grass/grass-8.0.1.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
new file mode 100644
index 000000000000..42780861df19
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.0.1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+
+LICENSE="GPL-2"
+SLOT="0/8.0"
+
+GVERSION=${SLOT#*/}
+MY_PM="${PN}${GVERSION}"
+MY_PM="${MY_PM/.}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+else
+	MY_P="${P/_rc/RC}"
+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~ppc ~x86"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+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}
+	opengl? ( X )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	sci-libs/gdal:=
+	sys-libs/gdbm:=
+	sys-libs/ncurses:0=
+	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:= )
+	lapack? ( virtual/lapack[eselect-ldso(+)] )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	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= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:4.0
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( dev-lang/swig )"
+
+PATCHES=(
+	# bug 746590
+	"${FILESDIR}/${PN}-flock.patch"
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack=$(eselect lapack show)
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas=$(eselect blas show)
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	default
+	eautoreconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	if use X; then
+		local WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	addwrite /dev/dri/renderD128
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
+		--with-proj-includes="${EPREFIX}"/usr/include/proj
+		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
+		--with-proj-share="${EPREFIX}"/usr/share/proj/
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png)
+		$(use_with postgres)
+		$(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)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with X wxwidgets "${WX_CONFIG}")
+		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
+		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with X x)
+		$(use_with zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
+		install
+
+	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# translations
+	if use nls; then
+		insinto /usr/share/locale
+		doins -r locale/.
+	fi
+
+	popd >/dev/null || die
+
+	# link libraries in the ~standard~ place
+	local f file
+	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
+		file="${f##*/}"
+		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
+	done
+
+	# link headers in the ~standard~ place
+	dodir /usr/include/
+	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
+
+	# fix paths in addons makefile includes
+	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
+	for f in "${scriptMakeDir}"/*; do
+		file="${f##*/}"
+		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+	done
+
+	# 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/grass || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+		"${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/grass || die
+
+	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
+	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index d0b73c80b283..31ad3a913914 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,21 +3,35 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
 HOMEPAGE="https://grass.osgeo.org/"
-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 
 LICENSE="GPL-2"
 SLOT="0/8.1"
+
 GVERSION=${SLOT#*/}
-MY_P="${PN}${GVERSION}"
-MY_PM="${MY_P/.}"
+MY_PM="${PN}${GVERSION}"
+MY_PM="${MY_PM/.}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+else
+	MY_P="${P/_rc/RC}"
+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~ppc ~x86"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+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}
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index c598dcfafa6d..d67bbe712d58 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,5 @@
-DIST josm-snapshot-18193.jar 16013832 BLAKE2B fba7f88f9833a4ccdd24be1a2554681dc77cd5d810ca9d5b960df350987a138d43804770f5adc61d0ee6a553e5d54753a3b9353ff344dff2a0d4d33b3221a6ed SHA512 13caae201e543468d27e44811ce3a5d774c9942b702c995a3b3cf8b893e925d2b23392537b6338f5835e2014e2e08144015a210b12a553706983ac07e172308d
-DIST josm-snapshot-18303.jar 16144437 BLAKE2B 95222aafb509af2614a43aedc7b95a466d2ea533a9148c61da4eb547642d8e7509657e680f3402add03fbea73934417a58fe74418c67df312317c4518ebb5cd8 SHA512 1c1de8b4c90445ee139c553bb889a6477065a40d8e4db1516e8f79edeb8bccbd2065789536ec697fbd430970c59584c791e886c7a02c6061fb57089db6946e02
 DIST josm-snapshot-18360.jar 16186460 BLAKE2B ee973137823d0084b11c35f3e70435e6f88659009c822c2a24c90d1130dd04cc3879913dac587771b179529a1b1dd53d1e2ff6e4f10284d2ef6d7710388fe40e SHA512 e12c3ed6af206bb30475e301e5e674ee613062fc51a3731f778dfdcff7d6dcd2610b6d301e6085d92e1f3074bb1f53e22f61ab3953797c47188fff7d886699e3
-EBUILD josm-bin-18193.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
-EBUILD josm-bin-18303.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+DIST josm-snapshot-18387.jar 16234138 BLAKE2B 9fea2eb3949bad9d4ce5fcb8bdbbc5314e81010de08338d459e3704009d457886081c2fb0977d55f89621f528afc09dba318787e2cde61e3a0adde35d4731679 SHA512 d9c429ad68df9993769fbe94020675bb560224008244cfaae9a062c3484a7bd2eefc05338e3c931a3c856a097e27d3e0e94ff2af5404a9aa2a30ecd4d6f747ff
 EBUILD josm-bin-18360.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197
+EBUILD josm-bin-18387.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197
 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d
diff --git a/sci-geosciences/josm-bin/josm-bin-18193.ebuild b/sci-geosciences/josm-bin/josm-bin-18193.ebuild
deleted file mode 100644
index d042ecaab171..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-18193.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-utils-2 xdg
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-
-	local icon_size
-	for icon_size in 16 32 48; do
-		newicon -s ${icon_size} -t hicolor \
-			images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/josm-bin/josm-bin-18303.ebuild b/sci-geosciences/josm-bin/josm-bin-18387.ebuild
index d042ecaab171..3a5ff50d232a 100644
--- a/sci-geosciences/josm-bin/josm-bin-18303.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-18387.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
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index cfce3cb7d67b..79239348e7f5 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -2,7 +2,9 @@ AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d44194
 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
+DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
 EBUILD merkaartor-0.18.4.ebuild 2436 BLAKE2B cd51c4584f61f333712cae5aefc9f5310b13ccd9521f7cb27a6bb29334351a66a245d9563f255e18306d2e5f7a4585681a734ce43a7808a947cc7c9b256e80e3 SHA512 82050b12456cd16f35124accdd92a11c22bc869e5421f47d710767fd8b74c190cb73a78def9b8b6d3fe8da27b081161de513e1355399531971bb2c50619ee94d
 EBUILD merkaartor-0.18.4_p20210410-r1.ebuild 2905 BLAKE2B 94a7903cb648d364467d4be451e805e56086eac5af1e173a41aab4148b5e3d074814c5d1f5d4cf5c20c6c4230a2d104e1d45a890f6e206f620e8ad2195b60f4a SHA512 67fd51899ec110a138c2cee7dbe426f49b475358a41e9bf210b5d48321d907ed6b49302c895d3f8eeb888a051ff33929796ab1d679d54066b26a050c51077b2a
+EBUILD merkaartor-0.19.0.ebuild 2244 BLAKE2B cb54202ac0590ffddf3289d797e52e3bc028c3401cfabe96b28c6b8d34231238434d0446912a18e1cd6c744568bc2eac57631fb5eb2c4f3fa9cfd646c4a5944e SHA512 12fae9016bf0fe390b2dbdab83060e3d36c285956dc9f4d357af9aab36ac4aa2df815995697c7e78ac48aa89b3574e74ba6177056e185d7592f9965a6b2a962c
 EBUILD merkaartor-9999.ebuild 2675 BLAKE2B 72ab4f08e9562ec9af5eea9f8a7bfddd8a1bfe8bf6e33a8a52f838ef1b7b19ae531a3fa6c5c53091ef1e062d0f6552dfaff05719d62a094efbb8c1ff9c343e6c SHA512 6d1cf6429206315d7c56bcbe1dff81d20e9710100becac0b3c75bab53f29c457388a1a53d184ac4aefaf77f65e23e306029fad8f4aadbc04eb2b164e1098c4d1
 MISC metadata.xml 576 BLAKE2B a768f64dba4052d56e3ae00ccb0ddb95e1d4712ec5bb99216ebfad87012a2d9aece4acfa3eee2715625f9726d70a620209f4b4a83ed323188a92205953cc1406 SHA512 e099e0546c907c76f864ff5cdc4cb91fe1b8d72289022e6f621d827bc7140c4b1b47f6ba97783a4d703d46245013695e2d8a213272b665298e89f5ed332f7ff9
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
new file mode 100644
index 000000000000..e9c4e0b933f1
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 plocale qmake-utils xdg
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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-8:=
+	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 "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake5 \
+		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 \
+		RELEASE=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) \
+		Merkaartor.pro
+}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 7da80b7d839b..77d02ba279ef 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,5 +1,5 @@
 AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
-EBUILD osm2pgsql-1.4.0-r100.ebuild 1274 BLAKE2B a44e145e366ba8ad8f204d55dd2f058e046c387c334c6982cbb626c98d323db1e31e2d10be049a126616d75711f02449d716804a8254d8c336ed62d42da7f82c SHA512 4b67fa88249ff9c3f4b4c7441d4a97cf4c1e257bc0fc6991f0f5ae0401ecf4b155929d4bd5817556f70aab40fe672a9752c402b8f58c35e12afdfc428e5cae6b
-EBUILD osm2pgsql-99999999.ebuild 1258 BLAKE2B 5986238e26804a4320bb6e291d68bd112926cb84e64b0046b66f5d7b5f6c2928769214119cb2bb9eccd36a97463b67a110e8b41774c2d4178d481b7616e18073 SHA512 b556c71c67187a100b960968c4d6c7c9ab3a0f46f56dc1949e753c92a8e93fdd41eaece622d135156e290ec9eb5280593d7398acd0b072daa9b42ce65e0f0b89
+EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 62ebe35d5f761d43885bf4409a40e2a4eea93274b70598587fefd3479f12c964d0b9aba08a96deb644d11087bee90d935f23b5e689bef43a8f783bb8f05f4944 SHA512 3dcbd987148d24255f0286d572065d46052c94ae0e917b0fde44e17b059cc6f771fa1867e3f258d56479a1f45fc7a81f4799d6b337b90f0209590b42127d1d7b
+EBUILD osm2pgsql-99999999.ebuild 1260 BLAKE2B 9c819d63461a64fe1c001b794ec68bf21741595f0ab4526a16dc5f950156ff7a91de2dd2930d9cfa549ea05319b096aa5cb6ecfb209b03c72fb9c3e9c4845230 SHA512 a0da16ab7e13805d4ad8a84a3ef4e292baaee6e92eaf6fc8adc413c8871286d77f377e90bb7634da4337c212ad253b99159cf174eb750cd04e792d45ce80cc91
 MISC metadata.xml 794 BLAKE2B 4f79008b159c609d7727d64873db8a0912933af66c8c78521e43e59f5e1a6c6072ad1f6819fbd107a6491bd46629f2f9e48d57df6546bd1abb3647737323b493 SHA512 7fb0748e5b053f8e646a9d7883440eddec6cf3a6cc80ea78216f7bd376f17440c667c5a6fbea0649f2fd22e0742de106595fad1730ab64e8a43a4a9510369f41
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index 552e4a10ca94..a377b456ed4a 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	dev-libs/boost:=
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-db/postgis
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 96c27e44b3cd..d9f18aee8602 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	dev-libs/boost:=
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-db/postgis
diff --git a/sci-geosciences/osmctools/Manifest b/sci-geosciences/osmctools/Manifest
index bb0c4066ae1a..a48077bee965 100644
--- a/sci-geosciences/osmctools/Manifest
+++ b/sci-geosciences/osmctools/Manifest
@@ -1,3 +1,3 @@
 DIST osmctools-0.9.tar.gz 181447 BLAKE2B 98b567219f712f282c37db6488863a3ae28c537cfdc5198f7457121a1e95a5edfb3fcc72f297a792485510a5fbb4d4d64be927b647d899f2c09648fbeb4419dc SHA512 6e51646e9291b53ce109f579c555c1eb9e6853452c81caebd530aa1be56aa3d313331a3544375f187c9d26888e4a330774f2acd6bdbb3baadf1a2db330430940
-EBUILD osmctools-0.9.ebuild 466 BLAKE2B e8bcdc5abacbbbdf7e1c847dceac422e16c49d90aafd0d194ded6df2a3a845d2c139e6991d39f9d2ead117f24414828940508a2b7c7d5ffeeb6d16ecc33553f5 SHA512 476c073865f6f814cc52526666f538cb81dcfd6e84ab9ac1be56561f23217622da5cdebea40d1ce57f8594bfe617c8317b82dcbacb33061d9f6ab0cbe095a74c
+EBUILD osmctools-0.9-r1.ebuild 466 BLAKE2B 9c40d671698ceb996faa00aecc6272ab2a4a38b5d17e601d4ddee46d05ce2f3d686b333632126229c2259b349bfb7082c510415189a90fd437117c0e03006c5f SHA512 b86e8e26640a83d00977065ed24b41a599cf26abce3446c88594b777d7e63151ecaa7ee7586819fa2cac4ec79b85d5e3ee936fd406c99b72697eb5a4c47054f5
 MISC metadata.xml 586 BLAKE2B ef415e4141e2e71a96a85cc1f18781b2ef9c62ffe6c8f489898c74f6ae3081d55228175b96d434ac47159d0dc5898b420aa0dfcf4a32bbb0ef1c5fbf3e8a5089 SHA512 a268d7e3406bbc95bc090e13d99e4a08346184ffd260791d2b8dddeae22fefa79aeee6346239833b8b66d9533da726ad82d8cbb3af3ba624403fef9d70446531
diff --git a/sci-geosciences/osmctools/osmctools-0.9.ebuild b/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild
index fd3572017ab8..6e0312b536d8 100644
--- a/sci-geosciences/osmctools/osmctools-0.9.ebuild
+++ b/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit autotools
 
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0a10407c312b..9898c49ac270 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,11 +3,13 @@ DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e6
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
 DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
+DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.20.3-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de
 EBUILD qgis-3.22.0-r4.ebuild 5420 BLAKE2B dc36fe6b812a086e27fb2d64704116820f2e69985c7a85ffa8369589fe965f0b49bf039776f01435d6f7af06f8e0766cd3ec5be168924686a16b81087c8eb863 SHA512 bb9cf572439f8f4993898b62047bea605cb1c6b5315aaeb319597f831dd62b9aee4eb8112749eec7177e738e54a5b363dc86f3ab70a8839a994996d0f5ab78b5
 EBUILD qgis-3.22.1.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
 EBUILD qgis-3.22.2.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
 EBUILD qgis-3.22.3.ebuild 5404 BLAKE2B 79dbf4f3e24aa2a7d67b43421d8e4d68eb80c76d5b476d189b57da09fbdac5d1a793899782ef75a8b9215b04b5daa02729069e1936c4861cf07bee9c385c6ec3 SHA512 7330c05dea46d8df5a494a13a014f120a12b66823d13d4ce3d196482d77cdae3a0d6e718de469e2459a5f446358f97399f7d4414fa3982ed420b80d2add540e1
-EBUILD qgis-9999.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
-MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
+EBUILD qgis-3.22.4.ebuild 5463 BLAKE2B 5bf8da2206e5da429ed618a2df814eb940aa5b94c71192e30587b1660905f27218a9f225e00e86e4eb0327fb9d0f8aa83a9a6d3fa0a87863997cf57d454e3b2f SHA512 504457d393767a0a50252a661d424d6214c0b292e39f9931a6f500fc83bb14eb0a4152ef1109f56f5816ecdfa00250265f682f84522d502246b83fa6c94560b2
+EBUILD qgis-9999.ebuild 5463 BLAKE2B 5bf8da2206e5da429ed618a2df814eb940aa5b94c71192e30587b1660905f27218a9f225e00e86e4eb0327fb9d0f8aa83a9a6d3fa0a87863997cf57d454e3b2f SHA512 504457d393767a0a50252a661d424d6214c0b292e39f9931a6f500fc83bb14eb0a4152ef1109f56f5816ecdfa00250265f682f84522d502246b83fa6c94560b2
+MISC metadata.xml 1580 BLAKE2B 66cde139d4014d816207d9b85fceee3d5c630e9dce42b84472cd3a6f42f9d49247cae35a93f8590a44af411a9fceebc05c5a1d75d68ba6d5e5a0238fe85b22c4 SHA512 ff8aefd056cc28a21f9af93201ab71c880bd423289933c2a0588f915ebd60e62d62d5046fe404a2c5a4350816299c50349d151223ad9959f885adc310fc6615b
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index a63b6aef6b2a..8d7ea9e307f6 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
 		<flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
+		<flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag>
 		<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
 		<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
 		<flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag>
diff --git a/sci-geosciences/qgis/qgis-3.22.4.ebuild b/sci-geosciences/qgis/qgis-3.22.4.ebuild
new file mode 100644
index 000000000000..12e8cd68f1e8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.4.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	inherit git-r3
+else
+	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sys-libs/zlib
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( dev-qt/qt3d:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	pdal? ( sci-libs/pdal:= )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=share/man/
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(cmake_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if use grass; then
+		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+		readarray -d'.' -t v <<<"${f[2]}"
+		grassdir="grass${v[0]}${v[1]}"
+
+		GRASSDIR=/usr/$(get_libdir)/${grassdir}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use python; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
+	fi
+
+	if use grass; then
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index af65e82db8df..12e8cd68f1e8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.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
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -66,6 +66,7 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
+	pdal? ( sci-libs/pdal:= )
 	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
 	postgres? ( dev-db/postgresql:= )
 	python? (
@@ -140,6 +141,7 @@ src_configure() {
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_PDAL=$(usex pdal)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /sci-geosciences
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)