gentoo resync : 20.03.2021

16 files changed, 51 insertions, 241 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 8db80913658e..4edabc596cd7 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 1bf5359ee5f7..ab1aa15445e8 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -2,4 +2,4 @@ AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079
 AUX gpscorrelate-1.6.1-makefile.patch 1609 BLAKE2B 717dce73444a68d09658b5c3c446e27ff1b7666584eadaeeb862d87dd8ad44983e30b1b24fa4387f50032bf2dee671ce84af3bf168d3743768d270c412b36be5 SHA512 274a3db1a2a752338966beae989e2075f81b6d51b1d7f51d9810d7b6e01ea581468e2add05e631f6f8626ee234a6c7e700cf90ce7dc08a7d5c5cad282a6f7f59
 DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
 EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
-MISC metadata.xml 356 BLAKE2B a17eee6261dcce3b6111da9da119544f46a0e0b6742f2a9280933f1d6f5a36cc96a422270698649c2dd77c228580b7f8df1fe8c66546c568fe1659893ae2aefb SHA512 e9c7c6dc654cb5276c1b211c8e4817fd09cb0ed3689b53d423733e651ec4a912b4f54dbbd08299bd80c6ae637ee41e91ca1ebb323ff2cc29e3b36dbe40566fb2
+MISC metadata.xml 356 BLAKE2B 5940b7180c605a14dde832a8a7aaf35a6251f8f169d6cfa5a7399dccbc2fb09c8b1c5c9b8b23eb00f7e5ee286ce805b63faa929fb5c7b2066c3d48615e79e5ed SHA512 61e0dacc7a9a3a6b8ae5e485e5174df1b0c8e061419dbc7abadb3c56b5613c2cf8655eab59244cffdff4d0e56b61ca087eaaf9922a45e99014063201f832a631
diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml
index 6f9cf14be5be..c432c978e362 100644
--- a/sci-geosciences/gpscorrelate/metadata.xml
+++ b/sci-geosciences/gpscorrelate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
index 112fc8780500..92d8ee2f93b8 100644
--- a/sci-geosciences/gpx-viewer/Manifest
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -1,4 +1,4 @@
-AUX gpx-viewer-0.4.0-crash-backport 1152 BLAKE2B dacd8a8f4cf1703257d37be6e230fe535faaad6d337b15fece132ee358b61b00329ef0e4c4e1cabfb233a37b46c22a212696d09cf2fa4cc806c80d83913b31bd SHA512 97152da46ed0699b95a8c1379b6b08997f8fb171b9e07755b5ce44da3ef09601b5a674b97d9fb449e985e8ffd329b49f961bfce0895822027124e1e67dfa6aab
+AUX gpx-viewer-0.4.0-crash-backport 953 BLAKE2B d2c4a3e63d856d8448c993cd99e334068de4f6c018e10e332f88ace0471acbfe88dddc9e21410e5325cdf192878a2fbdf5fcb4cfa2d649379ea59cf6fb03a0be SHA512 09ee63709e69ee13b3358c88f7c7e982b689cccd7501083825a0424d31fc00bf0bebf53bd83818581d388ff6fff8cd08f0f956a7a31cd20c3b0017d8f0dded7a
 DIST gpx-viewer-0.4.0.tar.gz 534735 BLAKE2B 3b6e14961dd79d07ad99d68b7f926b2152413e5512044febdb30306d4045f0074a0a1fdb8c40bd92523e06f1f22853934c63876793f8594af197a17fd0d0a0c9 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a
-EBUILD gpx-viewer-0.4.0-r1.ebuild 1136 BLAKE2B 1708f0b34ecd3ea753ad4fea400091098bba89686ef488d705517bd324e536757de0c20f5e30c3125d093d6672a862745d9cc6deb63c6210d3db65e4c463104c SHA512 c3fa95cc6c57f350ba5349257216c1993618e6abc637dbee7b62b9489356b6f81176efa1456a0efab588c91d44795b2691e815f33cfcbda7ac484fc65bb733bf
+EBUILD gpx-viewer-0.4.0-r1.ebuild 979 BLAKE2B 37ae6db352436daed793699a792fe2e56927cb1ef5dfe1beaf2525a37ee88692e49e950f54f49a01ec57c2dbc7a16ce79deca3f732bc8ab3a0c7d7c3f7862bb2 SHA512 08b12ea0b039459f18e750eac251dd6841191d49b140d56cd1da00e21b8e9b6191f0f159eb15f7cb1165fc63259bb6370d3a7b14a841993be2f53ed41aae26fd
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
index 2dff4915dffe..420d18ef5e5a 100644
--- a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
+++ b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
@@ -1,6 +1,5 @@
-=== modified file 'data/gpx-viewer-file-chooser.ui'
---- data/gpx-viewer-file-chooser.ui	2012-03-04 10:18:33 +0000
-+++ data/gpx-viewer-file-chooser.ui	2015-06-01 19:44:21 +0000
+--- a/data/gpx-viewer-file-chooser.ui
++++ b/data/gpx-viewer-file-chooser.ui
 @@ -7,7 +7,6 @@
      <property name="title" translatable="yes">Choose gpx file(s)</property>
      <property name="icon_name">gpx-viewer</property>
@@ -10,9 +9,8 @@
      <property name="filter">gpx_viewer_file_chooser_filter</property>
      <property name="local_only">False</property>
 
-=== modified file 'data/gpx-viewer-preferences.ui'
---- data/gpx-viewer-preferences.ui	2012-03-06 08:49:48 +0000
-+++ data/gpx-viewer-preferences.ui	2015-06-01 19:44:21 +0000
+--- a/data/gpx-viewer-preferences.ui
++++ b/data/gpx-viewer-preferences.ui
 @@ -5,7 +5,6 @@
    <object class="GtkDialog" id="preferences_dialog">
      <property name="border_width">5</property>
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
index 58e714a400e9..f46fb5bf69c7 100644
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils gnome2 vala
+inherit gnome2 vala
 
 DESCRIPTION="Simple program to visualize a gpx file"
 HOMEPAGE="https://github.com/DaveDavenport/gpx-viewer"
-SRC_URI="https://edge.launchpad.net/${PN}/trunk/0.4.0/+download/${P}.tar.gz"
+SRC_URI="https://edge.launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +21,8 @@ RDEPEND="
 	>=media-libs/clutter-gtk-1.4.0:1.0
 	>=media-libs/libchamplain-0.12.3:0.12[gtk]
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	>=dev-util/intltool-0.21
 	virtual/pkgconfig"
@@ -31,23 +30,22 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-crash-backport )
 
 src_prepare() {
+	default
 	vala_src_prepare
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-database-updates )
-	autotools-utils_src_configure
+	econf \
+		$(use_enable nls) \
+		--disable-database-updates
 }
 
 src_compile() {
-	autotools-utils_src_compile gpx_viewer_vala.stamp
-	autotools-utils_src_compile
+	emake gpx_viewer_vala.stamp
+	default
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
 }
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 5403cd4c1c64..cfc3c17f3a56 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,4 +2,4 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 EBUILD grass-7.8.5.ebuild 6941 BLAKE2B fb4f2f5cfa068cc90b45f94fd5ddc19415a66b7fce9f34b5b3c6d71002de226e192f4740e140e9444a616e8498bf4b616e3718448e21fd1d85df2d73cb42a9b7 SHA512 80397ff07c02942ddb2d7ffe2ade1ba88c6baa5563ceddf20d707cb522c2703c6615acd83e29581735f3d8e989436c2e1672be68d4e680032be38f9a9132b130
 EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
-MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
+MISC metadata.xml 1088 BLAKE2B 4a9d470738d4860ae6e841976ba21974a18c97759c61cc4677d9707c8fb2220f998999368247ed1b19bfc45d7c53624d0ffec9c4aefad951e270f07c43fdbe4f SHA512 0ba4c779c3c0f3ed226fbf7c53e291341513c78e4a5d9ef228cab5436dacfa686cf8fad28aa3143f5036603fcccaf538b5607f48a86138be42af4aead4d147bf
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 0f889711e12a..e62b0339f087 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mario.haustein@hrz.tu-chemnitz.de</email>
 		<name>Mario Haustein</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sci-geosciences/metadata.xml b/sci-geosciences/metadata.xml
index ca00dbc0225d..aaa3e74aea97 100644
--- a/sci-geosciences/metadata.xml
+++ b/sci-geosciences/metadata.xml
@@ -33,4 +33,3 @@
 		Kategoria sci-geosciences zawiera programy naukowe związane z geologią.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 29482902ba4a..2a15a1ebcd40 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -4,4 +4,4 @@ DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c991
 DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
 EBUILD osm-gps-map-1.1.0.ebuild 898 BLAKE2B f3e1d64725ee9f2cd4f55f2ae99f97a95af06daac009dd0d8e95aa63fa00c02ebf349649fa1267df74a8c3c01cf5ebb8ec37edc9a27b1bd5e42460c1e3b19eb5 SHA512 11128628973eb0bf7bf32e7ce3e40d7d8df67d27eef722b102bfb87d5359f3b256938c27c685e82ba9d3c6415403d0c7f89870b74fbd0b04188b7b14189dad57
 EBUILD osm-gps-map-1.2.0.ebuild 918 BLAKE2B 58c078a9fb9bbed6746317ced574f9a5695d844ae5a06b43bf5e5edb4be986e281b7253c43d0b63b9a28c7c4ef8d475a0be5c8ec42a418d6f4ed544ea95e0b31 SHA512 45193dc3ddfaf474747e6f409ab8bc8e32667e4ef3c0a537234f6037a4099844619a855f506c56dae2ef51c09e1ee76646068616aa595913f77c9d90b41bb662
-MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
+MISC metadata.xml 327 BLAKE2B 9928a0d7b2d9da58a548fc859f323ad6df0bf6f3e4c1ec2c9e2b32f3b08f314dbf03f5b7cd4ef9e68361a4ea0b1806cd09b9abf198e3b597ac14df2dad08f57d SHA512 cdd37b496981ed29f5f403a7d555beb4bafc78121f0ae8d5cb9c19ab12ef1201a519db43353fe99f679923f5179e3fe2d767f98aecc20229a95a6c2411744217
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
index fb62bce3d4d6..81788a1dd46a 100644
--- a/sci-geosciences/osm-gps-map/metadata.xml
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5bfc88eab3e4..c008e26c75d9 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,11 +2,9 @@ AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ec
 AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c
 AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
 DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
-DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2 SHA512 f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
 DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.16.2.ebuild 5365 BLAKE2B 58033663ec3786fb8f06f7f7b04a608b5ab34d0cba7303811038b70348f54aa7105afb2cdb77b03c63c15e226f2735d5659900bd14b81fea9f3bf50e5fd04280 SHA512 6569a8609016ad07dffe8234e47350cae82b39b032634a6e61a3f6cb7e1c26e9a846ca3e7cf3f8a1839a3afebf102772c250e89b3b0e157fbbb07f22847cddd7
-EBUILD qgis-3.16.3.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
 EBUILD qgis-3.16.4.ebuild 5367 BLAKE2B 42f639da8875984d981605927ec10426fe2d58538e1020604e587729799acb36b113be60360731510c26ed1f0ef807a6fdb390be81c47cf14db10d6307debd4c SHA512 0fd06f09ca26efa99c11edde53e3dda8607da2533b7311d621792e3c3ac59ab0b6bfac7caa36fcf9a3731e4baa1b2785492ccf7512d677b1843135b9c135b56f
 EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/qgis-3.16.3.ebuild b/sci-geosciences/qgis/qgis-3.16.3.ebuild
deleted file mode 100644
index fbfc6e31fbfb..000000000000
--- a/sci-geosciences/qgis/qgis-3.16.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
-		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index ae59c85b4af9..fd254459cde6 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,6 +1,7 @@
 AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
+AUX viking-1.8-libexif.patch 868 BLAKE2B 247e44a710566e0c4c21272ed61a8037e053de4e8560f88fa5202c2babd60a59b0d62fd8ae4da0af8c8de81f529131ac4a646d21e722c6ea2202de92bec825f2 SHA512 0e6dddd86d12e8ea229b1e7430993fdadadc303860af762f3d2aaca62b0b509ce437a44701e9be9ca503df50e5aef5c8e041bd26339a9a0b0d364b2464c8f8c4
 DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.8-r1.ebuild 2005 BLAKE2B fa260af8911ce785a8784a44746fd364dfeeb34bd8e34eefd752d212e7f23baa76447df37fb197fc3b9de32cd47e3d97fd304ab1e740d27a0c05c6c73e1310ae SHA512 76716a6434498e46bf2733abc7380cc2a0f1177d058d9e2eee0c757026805e473d09a9ac135d507da95661506979faf2fd14161b4a9ee1704db951c8576050de
+EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B d29fa2382e0f7e2804dc5fa74b43461216f2ec6f53e286caf7e981e434ac8b4cccc9c2b35ac0aa3db36c4d59be25aeb9beb1771f860a31a1c86b6ff2207c3904 SHA512 5f0d19996ddf92cf472a26c811ff83a95b0dd8a63a5f86a9566f236301afefb2464fd66227762aeb7cb167c6bf9c1a1f81de4541600816bb1b6f76fc2cb137be
 EBUILD viking-1.8.ebuild 2037 BLAKE2B 5e9cf7ad142e3178da1ac92a50adee5f67d28655b02b594fd385c1c1a9582f27e6eaaddf7c0296d7d812ab31a8434608a2e056787d125c8842cd85238dfa491b SHA512 fa63ac4da0792172a596ce1a68de4d6c0213e0618bcac9958c0a6e36ffd0ee3eae162a83b04959a93e46e6cc0ef96456dceedd215ae48734aedafe9008d41bc4
 MISC metadata.xml 833 BLAKE2B b0c8b498cf7786b610e6528448bfab45e88967dca7cc59779ea9e3f51684f7ca85296de3b258971adf23618e1a60bed663be32ecf85a367157d0e7381010aa8d SHA512 8354f387678813b1c78e28a8b28475fca3a148297bcd13555f6e3fdf5fea600b242f82f68265c16cb760d927b6adf07b7dd328a06ff245e8eef70fa3833717df
diff --git a/sci-geosciences/viking/files/viking-1.8-libexif.patch b/sci-geosciences/viking/files/viking-1.8-libexif.patch
new file mode 100644
index 000000000000..0f8bd81fe1cd
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.8-libexif.patch
@@ -0,0 +1,22 @@
+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/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
index fc94ad904522..5d0117c5794f 100644
--- a/sci-geosciences/viking/viking-1.8-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" "${FILESDIR}/${P}-libexif.patch" )
 
 S="${WORKDIR}/${PN}-${P}"