gentoo resync : 16.01.2021

21 files changed, 227 insertions, 674 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3a0f9c211808..7c305d885199 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 226372390b1c..6681b8d09e20 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,8 +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-9.10.tar.gz 4837219 BLAKE2B 529a47cafc02d563abf3cc8b80a06ec2b850c935a0e4e0e6933028c6e7d630e25b78db453130efe7e062b6d8bfa288bb22f58aff3f27b7d51025132894a6db27 SHA512 ab7c47e6ba583ca008867d9586320204a2d862ad1d6c91ad0b6e8dfde5854c0c6956be597938aa9077183a48d9c00ce1b232ff87f36b9a4cd58ad096b1fd1342
 DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b
 EBUILD gpxsee-10.0.ebuild 1127 BLAKE2B 3933226f6889696d60554467117c4029ebc945c7251183f3b13f4c53982519420fc9eb0a15d2ad1a613dc766e2633031be233af7e3cf08c8842f1b57fb9d3245 SHA512 7dda94addff64c2342ca9791f3bc91af912fde65356fd402694cd68c0d0fa4ec58b55fd3899cfa235eb751f0ee728fd82bd643a5b1cb1a55d1c850a2457b5033
-EBUILD gpxsee-9.10.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
-EBUILD gpxsee-9.12.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
+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-9.10.ebuild b/sci-geosciences/gpxsee/gpxsee-9.10.ebuild
deleted file mode 100644
index 7afc1386fcea..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-9.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk 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/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	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-9.12.ebuild b/sci-geosciences/gpxsee/gpxsee-9.12.ebuild
index 01738be156d9..0fa8bbb5eda4 100644
--- a/sci-geosciences/gpxsee/gpxsee-9.12.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-9.12.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtwidgets:5
 	dev-qt/qtgui:5
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index e1162e5eb12a..191418f36c50 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,8 +1,7 @@
-AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC1.tar.gz 64800389 BLAKE2B b17282f8465bc62979867aa6a8402912901189dc8f9584aacb3b47553874e08fd98572aa34ad6885b5361246f4620775075cc6fcbad66a7e1bb7c6d9acd9196c SHA512 fe7497d362539c0e4241cfe5a98d7f79f8c3e7376f7a630f6aa260195bf8eb546d0b8821208255ae831da31de4dfe988bbdb5c89273ba6ebc0566d99a3c5e664
+DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
 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
+EBUILD grass-8.0.0_rc2.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
+EBUILD grass-9999.ebuild 6963 BLAKE2B cae7116cd7dbeb06f66c6f33237b4f10d5aa339d86bbf34a416c71bb82d37bacdc68a628a6b40b3ba97aa77bc586dc2bc731faf740aecbc17c84fbac0e427840 SHA512 2792f7a120049a58541433ac119f7358c07cb403c35c07ffd34a5f7d55eb67232e49ff9c2acc5d5a5ec7be5cd16b03ba97ff6e54a00536282975986ef4b0ecf3
+MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446
diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
deleted file mode 100644
index fddcb9f6df88..000000000000
--- a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/include/gis.h b/include/gis.h
-index 46bb06c52f..333651b938 100644
---- a/include/gis.h
-+++ b/include/gis.h
-@@ -23,6 +23,8 @@
- /* System include files */
- #include <stdio.h>
- #include <stdarg.h>
-+#include <stdbool.h>
-+
- 
- /* Grass and local include files */
- #include <grass/config.h>
-@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
- #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
- #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
- 
--/* Define TRUE and FALSE for boolean comparisons */
-+/* For boolean values and comparisons use the C99 type 'bool' with values 'true' */
-+/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid.        */
- #ifndef TRUE
--#define TRUE 1
-+#define TRUE true
- #endif
- 
- #ifndef FALSE
--#define FALSE 0
-+#define FALSE false
- #endif
- 
- #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && __LP64__)
-diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
-index 89a25de3bf..978894ea74 100644
---- a/lib/lidar/lidar.h
-+++ b/lib/lidar/lidar.h
-@@ -62,9 +62,6 @@
-     /* INTERPOLATOR */
- #define P_BILINEAR 		1
- #define P_BICUBIC 		0
--    /* Boolean definitions */
--#define TRUE 			1
--#define FALSE 			0
- 
- /*----------------------------------------------------------------------------------------------------------*/
-     /*STRUCTS DECLARATION */
-diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
-index 9c1dab4e81..2512fedaa2 100644
---- a/raster/r.param.scale/param.h
-+++ b/raster/r.param.scale/param.h
-@@ -18,8 +18,6 @@
- 				/* 'blank' edge around raster.          */
- #define MAX_WSIZE 499		/* Maximum dimensions of window.        */
- 				/* Some useful labels.                  */
--#define TRUE 1
--#define FALSE 0
- 
- #define RAD2DEG M_R2D
- #define DEG2RAD M_D2R
-diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
-index 33164f43cb..47028e7444 100644
---- a/raster/r.surf.idw/main.h
-+++ b/raster/r.surf.idw/main.h
-@@ -1,8 +1,6 @@
- #include <grass/raster.h>
- 
- #define         SHORT           short
--#define         TRUE    1
--#define         FALSE   0
- 
- #define MELEMENT        struct Melement
- MELEMENT {
-diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
-index fb3b79882f..ae3ec3933a 100644
---- a/raster3d/r3.showdspf/Ball.c
-+++ b/raster3d/r3.showdspf/Ball.c
-@@ -7,8 +7,6 @@
- #include "Ball.h"
- #include "BallMath.h"
- #include <stdio.h>
--#define TRUE 1
--#define FALSE 0
- 
- HMatrix mId = { {1, 0, 0, 0}
- , {0, 1, 0, 0}
-diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
-index 589f243a8d..b48236b33f 100644
---- a/raster3d/r3.showdspf/togif.c
-+++ b/raster3d/r3.showdspf/togif.c
-@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
-  *
-  *****************************************************************************/
- 
--#define TRUE 1
--#define FALSE 0
--
- 
- /************************** BumpPixel() ********************************/
- /*
-diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
-index 1ad97396fa..584af5d8ba 100644
---- a/vector/v.hull/chull.c
-+++ b/vector/v.hull/chull.c
-@@ -29,10 +29,6 @@
- 
- #include "globals.h"
- 
--/*Define Boolean type */
--typedef enum
--{ BFALSE, BTRUE } bool;
--
- /* Define vertex indices. */
- #define X   0
- #define Y   1
-@@ -76,10 +72,10 @@ struct tFaceStructure
- };
- 
- /* Define flags */
--#define ONHULL   	BTRUE
--#define REMOVED  	BTRUE
--#define VISIBLE  	BTRUE
--#define PROCESSED	BTRUE
-+#define ONHULL   	true
-+#define REMOVED  	true
-+#define VISIBLE  	true
-+#define PROCESSED	true
- 
- /* Global variable definitions */
- tVertex vertices = NULL;
-@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
-     tFace f;
-     tEdge e, temp;
-     long int vol;
--    bool vis = BFALSE;
-+    bool vis = false;
- 
- 
-     /* Mark faces visible from p. */
-@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
- 
- 	if (vol < 0) {
- 	    f->visible = VISIBLE;
--	    vis = BTRUE;
-+	    vis = true;
- 	}
- 	f = f->next;
-     } while (f != faces);
-@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
-     /* If no faces are visible from p, then p is inside the hull. */
-     if (!vis) {
- 	p->onhull = !ONHULL;
--	return BFALSE;
-+	return false;
-     }
- 
-     /* Mark edges in interior of visible region for deletion.
-@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
- 	    e->newface = MakeConeFace(e, p);
- 	e = temp;
-     } while (e != edges);
--    return BTRUE;
-+    return true;
- }
- 
- /*---------------------------------------------------------------------
diff --git a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild b/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
index 1a9dc30646ec..1a9dc30646ec 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4e0eaf89a49f..d0b73c80b283 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-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=8
@@ -9,15 +9,15 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-MY_P="${PN}8.0"
-MY_PM="${MY_P/.}"
-
 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.0"
+SLOT="0/8.1"
+GVERSION=${SLOT#*/}
+MY_P="${PN}${GVERSION}"
+MY_PM="${MY_P/.}"
 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}
@@ -234,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
 os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 		-i "${ED}"/usr/bin/grass || die
 
-	# set proper GISDBASE directory path in the demolocation .grassrc80 file
+	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
 	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
+		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
 
 	if use X; then
 		local GUI="-gui"
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index b1f11eec9478..5114a3d95217 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -15,8 +15,8 @@
 	</maintainer>
 	<longdescription>
 		The original GIS, yes the first one, developed by the US
-		Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
-		Project for more info http://grass.itc.it/gdp/index.php
+		Army Corp of Engineers, now an active free and open source GIS. See the GRASS Documentation
+		Project for more info https://grass.osgeo.org/.
 	</longdescription>
 	<use>
 		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2e14525d8cda..0a10407c312b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,10 +2,12 @@ DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a11
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 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_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
diff --git a/sci-geosciences/qgis/qgis-3.22.3.ebuild b/sci-geosciences/qgis/qgis-3.22.3.ebuild
new file mode 100644
index 000000000000..424d7ec8847e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.3.ebuild
@@ -0,0 +1,205 @@
+# 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 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]
+	)
+	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_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/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 53ee68929cb0..435f165b4e13 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,5 @@
 DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4
 DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281
 EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B 86b7bf4ab46ca6c1a5d4fd923c09574464dea8c6a3d8ed4e45d660b295e93af3ab34274da97570ba622b63e541c5a732042ec9096f8e86462af9a83ca5b9fab5 SHA512 ad24da0b305c408af1bc7b3feade6b31db7088bbb54fd04d88c15b171cece3b18320cad2c3d4ada436d00b0ed63b18f92d0cdcb2045f95b85272ce034e863ee6
-EBUILD qmapshack-1.16.1.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
+EBUILD qmapshack-1.16.1.ebuild 967 BLAKE2B f16bc84dbf0432dae2f35ffa7d9f1b692d16066944401fdb4d72e6e2339fd5f8179fc53f94418c400a99f12bad9ded09e4cecbb95fe3ff43e9f97c85df0183d3 SHA512 e7252b082853b10bafd30a5a558b3e090206c078caacc9017b9bfbcfcb5128f3b48d535fa0387d5d365a94db9f57091a0f01035093adef5cd1c959e5cd23996e
 MISC metadata.xml 832 BLAKE2B d5194f18fd470325a3c98e268794bc01c4adc951a88f7548a52291cafbf010ded0e71beec3b902021e4b318eb5d21b35d2397475df948acec8f5683d003c576a SHA512 d5c8cc820bba367ace5ac27c714b735c22b456d71248cce2a4ed5c67eb80033c3690127887cb3a181628a836dc42c322508058363ec57b06ae823b43aaf63f2f
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
index 6c1736186d87..3065ccfdbdef 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.1.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/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 57b5d2bb557d..633b79ebb278 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,12 +1,4 @@
-AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
-AUX viking-1.8-libexif.patch 868 BLAKE2B 247e44a710566e0c4c21272ed61a8037e053de4e8560f88fa5202c2babd60a59b0d62fd8ae4da0af8c8de81f529131ac4a646d21e722c6ea2202de92bec825f2 SHA512 0e6dddd86d12e8ea229b1e7430993fdadadc303860af762f3d2aaca62b0b509ce437a44701e9be9ca503df50e5aef5c8e041bd26339a9a0b0d364b2464c8f8c4
-AUX viking-1.9-geocache.patch 4237 BLAKE2B 77475bc738d9cd244031a1141d5a47e7a849a530ee68899784421d17a0c895b4160e85ccb35903cd548b59fac678ccb6b645b5c27a95c92953fa3808d39216ed SHA512 854e07a119eb85881b6b086efc2c3aeb3304e72b8e3a98481acac4721b8284fec038a744656a8f8083298a2528ff65d8a03ed21acd4ba8788f7213e485898923
 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e
-DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
-DIST viking-1.9.tar.gz 5962048 BLAKE2B 7997286619d55687c5f2a394c8e068432c025f4210e579eae68e344495690e08e609352af3a71f3dc10161bd3cbb1126241abd928a13555466c37d164aa1fa5c SHA512 44be8e008db369e8700f91a67f4e4fb7aaab67fa498e71da98502b2893e8efd85502caca23ce9ccba4cf0d167328c4b87b5e422e15b3f8611acf814053646697
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
 EBUILD viking-1.10.ebuild 2050 BLAKE2B 450d23da27475268e4947119c09a4fc876b0941f3fd1c97004a758b299d699bfbe19e4eb1d283511ef38e0a3663003be4bf75b10bec47955bd62a132bd833212 SHA512 b07422252242a9f2a030f6e9ad61eea50abfd9647bd08d89358c48a234c97e7bd27b91374f801f1932d2b242f4a585a656b483b6e73552b5808fb2ad08765fd6
-EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B ca81e1e700c548cb438a685eb8c3cfc8a09df2707f443ebc6a50ecf53e59c3aa03cb6fd777d30cacdf2c552a7e9be0e4b7be137c0ab65941b4c93096f3515974 SHA512 35ebff592596be22150ee391662fceeedf03c543fb29e868c55a9460363ba6354972b620ed35abf31a5cad6ad3062e6af39417079960cc0cb08c38bab4a99c54
-EBUILD viking-1.8.ebuild 2037 BLAKE2B 8ee371b30a9b77d0672e5ab974d6ad7c0e692cc168640c6647163467d1cba2585c81c5ce9217e36e23b7122963da0ef7b866c9889c3095924589686da321703e SHA512 e059b1f1fce251fdb29df957a687ef16acaad7376b305c1ec84ec1323b3b2779c57920c65db1f8d50aec533294a201330854f6c50bb987a46e5a682b2c5674f0
-EBUILD viking-1.9.ebuild 2025 BLAKE2B 6bd0424b4abdcb58665c33cd15fd55895923fe74f7a5ebb9fc4adfd0d53776753484ba105fc924bc368062bfdae0c58be4c28c5edfaace4b9fdbef8a685fe79c SHA512 081c4d2b50c6e88ae18a992b9628564f07b3ce4051c7c2554b4d18fd488742c1ebdc1c5b329b30b16db907652c2a37622b8c6b3b836fa07fcd69e02086aed8fa
-MISC metadata.xml 834 BLAKE2B 8aebda67240a9cb9d9d6d3fd6db6a25edbcf0794ef23cf5f39265db779b733005b0f29db16f123f0137efff2b1378b764a7793d8ee18d3f970f5a1f4e08e6b37 SHA512 82588f9d9b684923ff112c37c68468413fdcc91e10e5d3e00ec48f6c67d62d0f36462077878d6deffff658c49e7ab09b5e635839f989e1d5534dd9189eb40ae0
+MISC metadata.xml 734 BLAKE2B 7fd63ec5238ee628cb9f6cb485643fb7f029e83735d3e85b79ea2c27e3c4d50698c6fc1b67d122a4261f0ff0b6271b3001102d07a7495c0ab58d54b7feec94a5 SHA512 a0568859ea1fedda5839ed1d055097687210d938867473e31be9c5331d6d1b1b26305049d5fee9d36e945343cd2dcd08951eb5921d0683a69433b2cd6539c209
diff --git a/sci-geosciences/viking/files/viking-1.7-no-common.patch b/sci-geosciences/viking/files/viking-1.7-no-common.patch
deleted file mode 100644
index bf49709dc865..000000000000
--- a/sci-geosciences/viking/files/viking-1.7-no-common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/babel.h.orig	2020-02-06 07:22:12.924565811 +0100
-+++ b/src/babel.h	2020-02-06 07:22:25.092329302 +0100
-@@ -109,8 +109,8 @@
-     gchar *label;
- } BabelFile;
- 
--GList *a_babel_file_list;
--GList *a_babel_device_list;
-+extern GList *a_babel_file_list;
-+extern GList *a_babel_device_list;
- 
- void a_babel_foreach_file_with_mode (BabelMode mode, GFunc func, gpointer user_data);
- void a_babel_foreach_file_read_any (GFunc func, gpointer user_data);
diff --git a/sci-geosciences/viking/files/viking-1.8-libexif.patch b/sci-geosciences/viking/files/viking-1.8-libexif.patch
deleted file mode 100644
index 0f8bd81fe1cd..000000000000
--- a/sci-geosciences/viking/files/viking-1.8-libexif.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001
-From: Rob Norris <rw_norris@hotmail.com>
-Date: Sun, 9 Feb 2020 11:28:30 +0000
-Subject: [PATCH] Github #80: Fix build with '--with-libexif'
-
----
- src/geotag_exif.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/geotag_exif.c b/src/geotag_exif.c
-index 0e879a39..6e9514a7 100644
---- a/src/geotag_exif.c
-+++ b/src/geotag_exif.c
-@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor
- 	// Not worried if none of the other fields exist, as can default the values to something
- 	//
- 
--	gdouble alt = VIK_DEFAULT_ALTITUDE;
-+	gdouble alt = NAN;
- 	ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE);
- 	if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) {
- 		alt = Rational2Double ( ee->data,
diff --git a/sci-geosciences/viking/files/viking-1.9-geocache.patch b/sci-geosciences/viking/files/viking-1.9-geocache.patch
deleted file mode 100644
index 4779c10dcd4c..000000000000
--- a/sci-geosciences/viking/files/viking-1.9-geocache.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From bdfa84467787138b8a180938006b864a39d0dec0 Mon Sep 17 00:00:00 2001
-From: Rob Norris <rw_norris@hotmail.com>
-Date: Thu, 3 Jun 2021 21:30:02 +0100
-Subject: [PATCH] Github #128: Maintain datasource_gc.c such that it at least
- compiles
-
----
- src/datasource_gc.c | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/datasource_gc.c b/src/datasource_gc.c
-index 37fa425a..22292b2c 100644
---- a/src/datasource_gc.c
-+++ b/src/datasource_gc.c
-@@ -128,9 +128,9 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
-   gdouble lat, lon;
-   if ( widgets->circle_onscreen ) {
-     vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
--		widgets->circle_x - widgets->circle_width/2,
--		widgets->circle_y - widgets->circle_width/2,
--		widgets->circle_width, widgets->circle_width, 0, 360*64 );
-+                            widgets->circle_x - widgets->circle_width/2,
-+                            widgets->circle_y - widgets->circle_width/2,
-+                            widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
-   }
-   /* calculate widgets circle_x and circle_y */
-   /* split up lat,lon into lat and lon */
-@@ -157,13 +157,13 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
-       pixels_per_meter = ((gdouble)vik_viewport_get_width(widgets->vvp)) / vik_coord_diff(&c1, &c2);
- 
-       /* this is approximate */
--      widgets->circle_width = gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) )
-+      widgets->circle_width = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) )
- 		* METERSPERMILE * pixels_per_meter * 2;
- 
-       vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
--		widgets->circle_x - widgets->circle_width/2,
--		widgets->circle_y - widgets->circle_width/2,
--		widgets->circle_width, widgets->circle_width, 0, 360*64 );
-+                              widgets->circle_x - widgets->circle_width/2,
-+                              widgets->circle_y - widgets->circle_width/2,
-+                              widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
- 
-       widgets->circle_onscreen = TRUE;
-     } else
-@@ -172,7 +172,7 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
- 
-   /* see if onscreen */
-   /* okay */
--  vik_viewport_sync ( widgets->vvp );
-+  vik_viewport_sync ( widgets->vvp, NULL );
- }
- 
- static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data )
-@@ -197,7 +197,9 @@ static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vv
- 
-   widgets->vvp = vvp;
-   widgets->circle_gc = vik_viewport_new_gc ( vvp, "#000000", 3 );
-+#if !GTK_CHECK_VERSION (3,0,0)
-   gdk_gc_set_function ( widgets->circle_gc, GDK_INVERT );
-+#endif
-   widgets->circle_onscreen = TRUE;
-   datasource_gc_draw_circle ( widgets );
- 
-@@ -240,7 +242,7 @@ static void datasource_gc_get_process_options ( datasource_gc_widgets_t *widgets
-   po->shell_command = g_strdup_printf( "rm -f ~/.geo/caches/*.html ; %s -H ~/.geo/caches -P -n%d -r%.1fM -u %s -p %s %s %s ; %s -z ~/.geo/caches/*.html ",
- 			  GC_PROGRAM1,
- 			  gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->num_spin) ),
--			  gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ),
-+			  gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ),
- 			  safe_user,
- 			  safe_pass,
- 			  slat, slon,
-@@ -256,10 +258,10 @@ static void datasource_gc_cleanup ( datasource_gc_widgets_t *widgets )
- {
-   if ( widgets->circle_onscreen ) {
-     vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
--		widgets->circle_x - widgets->circle_width/2,
--		widgets->circle_y - widgets->circle_width/2,
--		widgets->circle_width, widgets->circle_width, 0, 360*64 );
--    vik_viewport_sync( widgets->vvp );
-+                            widgets->circle_x - widgets->circle_width/2,
-+                            widgets->circle_y - widgets->circle_width/2,
-+                            widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
-+    vik_viewport_sync( widgets->vvp, NULL );
-   }
-   g_free ( widgets );
- }
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index 178eb9cbdd6f..d113d8a61afa 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -18,9 +18,6 @@
     <flag name="oauth">
       Enable OAuth authentication for OSM
     </flag>
-    <flag name="sqlite">
-      Enable MBTiles support based on <pkg>dev-db/sqlite</pkg>
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">viking</remote-id>
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
deleted file mode 100644
index 01aa13e51818..000000000000
--- a/sci-geosciences/viking/viking-1.8-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://github.com/viking-gps/viking/"
-IUSE="doc +exif libexif geoclue gps +magic nls oauth"
-SRC_URI="
-	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
-	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	>=dev-tcltk/expect-5.45.4
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nettle
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
-	gps? ( >=sci-geosciences/gpsd-3.20 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	oauth? ( net-libs/liboauth )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" "${FILESDIR}/${P}-libexif.patch" )
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-nettle \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		--disable-mapnik \
-		--enable-mbtiles \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable geoclue) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable nls) \
-		$(use_enable oauth)
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-geosciences/viking/viking-1.8.ebuild b/sci-geosciences/viking/viking-1.8.ebuild
deleted file mode 100644
index 30f8dbe12482..000000000000
--- a/sci-geosciences/viking/viking-1.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://github.com/viking-gps/viking/"
-IUSE="doc +exif libexif geoclue gps +magic nls oauth sqlite"
-SRC_URI="
-	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
-	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	>=dev-tcltk/expect-5.45.4
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nettle
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
-	gps? ( >=sci-geosciences/gpsd-3.20 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	oauth? ( net-libs/liboauth )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-nettle \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		--disable-mapnik \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable geoclue) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable nls) \
-		$(use_enable oauth) \
-		$(use_enable sqlite mbtiles )
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-geosciences/viking/viking-1.9.ebuild b/sci-geosciences/viking/viking-1.9.ebuild
deleted file mode 100644
index 3a74ac41d23c..000000000000
--- a/sci-geosciences/viking/viking-1.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg-utils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://github.com/viking-gps/viking/"
-IUSE="doc +exif libexif geoclue gps +magic nls oauth"
-SRC_URI="
-	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
-	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	>=dev-tcltk/expect-5.45.4
-	dev-db/sqlite:3
-	dev-libs/expat
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.16
-	dev-libs/nettle
-	net-misc/curl
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.26:2
-	>=x11-libs/gtk+-3.22:3
-	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
-	gps? ( >=sci-geosciences/gpsd-3.20 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	oauth? ( net-libs/liboauth )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/yelp-tools
-	dev-util/intltool
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-geocache.patch" )
-
-src_prepare()
-{
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-nettle \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		--disable-mapnik \
-		--enable-mbtiles \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable geoclue) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable nls) \
-		$(use_enable oauth)
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}