gentoo resync : 05.02.2020

13 files changed, 90 insertions, 70 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 175728eed203..e04e3fd32831 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index f326e84a7543..f09b255632a9 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-maps-3.30.3.1.tar.xz 2175840 BLAKE2B 0c2f44ec3262715d98e1a0412ca305e15916cdb92df5fc5b04df34b65a7b9c55d4f5dd9c54f9f9dc34f8e6dd889f60d7993b59ca0cd92e4e60b22b506877b24c SHA512 02d3b1b305c1011a60a34566847962ec3c32ee3563ce2c327b810fae24c2df08354d8420f1986645d861cfef7a35f336d67d4576a3e2f61eabdd972b8d070a8e
 DIST gnome-maps-3.34.3.tar.xz 3976776 BLAKE2B e01c18be2b48b90f88159828a046e3c422a56557f198595985ba39053ffdc85d60eebbf21d37ab1e4bb2eae8d1ad93c76b199650b713eba7a937674be38c845f SHA512 63261fb77ea1260aacaf502950f89ba6e5294271526b25302258df4fb40f4e04e3a4697750b2f7238f45a8d4bdbe9e583d45a4de02ce178e8f6716b44a7c8ba0
-EBUILD gnome-maps-3.30.3.1.ebuild 1370 BLAKE2B 5434f28013128cc139a5f4b9cff7c5d80a627bb29fed3444fd2637d1d8ebd50412e377207e4ec1f1bf018829c0892a0c97daf54ff82a6031fdfa1a1ea8bcf1d3 SHA512 d803255db05419c8c8ec3fa2ae50787c53b81fee53fa8483898958e27514ff3379a546145caa0e79d5d20b68462082d5e3a6d09fd04a70d8e02e445bd35adff4
-EBUILD gnome-maps-3.34.3.ebuild 1395 BLAKE2B 9e3bda52a28a2a22dd9c4bdb1ab74a5fc4711f0e32334fea0857a3e0929d5948e6d79ba495df40f184c01ab89db42b870fb8d1215dd53ce31b7e424ab80503b5 SHA512 24fe4a2e948be7b42a97a7a870d3b0b5727c4d8ca611d564e24c7acf8b0a7f227b0a6560d8d4b4b0316e8320c1d6c2cb6fb47b40e9a81a90f1bd1d58685eacb1
+EBUILD gnome-maps-3.34.3.ebuild 1393 BLAKE2B cd38342b16cc22e267cce5cd6dceada551069bdd3e2f86342950aa4896131b48dca1c80e7f423bf7d153b74e359442ba36f08ce71ceb89e13b4306ec1f8e2e73 SHA512 278060fe132033836eaae7be2a547d3bfda723264f46db44b99507668abea5439c9497896269d2e823eeb07ecb58577e27fbf4f84a3e45c158db46783246a1af
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
deleted file mode 100644
index 1bf085287517..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/gjs-1.50.0
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.7.90:0.7[introspection]
-
-	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	net-libs/gnome-online-accounts[introspection]
-	net-libs/libgfbgraph[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/webkit-gtk:4[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild
index cb8141452d75..7927bfa15a56 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 66277da6475b..86421277e325 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,3 +1,5 @@
 DIST gpxsee-7.18.tar.gz 5006604 BLAKE2B b7568a677e3cff08903d862921ace01374a594e216b1bd9eda457a92f700ef232b5804dff24696ee0574bcbe1d4e8a103dac6b5db33482cb0139f73b21852883 SHA512 562944a14ac2af4ec6837e77a6610b8ad7d254ffada4202e589c05a4306c0410e815212d7a7847708c50de72fa21a02d41bf5152f5d5f313c96da5b2516138fd
+DIST gpxsee-7.20.tar.gz 5348758 BLAKE2B d7e8f0f29dfe666572a58a1a5072545cda345f51d305d6c0351ee5639ba09c185b9b3e7e883d2d02198e70a58ef69508cfd5ab561183c68a625fa4101dc17285 SHA512 37c975d9e64cf6fe5455a0e6cfb896275db6a0469ba772c97615c8b2f79af591bf4eb7f6dd414c6a3f0344fe1b9f443f402e0b8c173beee0a301ede783fa26db
 EBUILD gpxsee-7.18.ebuild 1330 BLAKE2B 55fbeb2d5ec0f423be33378c5a30b1aad457f8a39cc70d1466db18f8bdc0a9b530ecb54273721dabbe9423198dbcba67c5b6bebdd86e51ab36d8fec516398a28 SHA512 fedc7457011576ce608610be5f97507ddb7465508f001151ca30f8aef469b06832ccb62d687b7521f7dd88e5e82d0e830cf6e1d6bece6b887a47a1dadd902313
+EBUILD gpxsee-7.20.ebuild 1329 BLAKE2B 0519cac214de89aaf141f90bc9a47432e11c764462ecf42bb4728e335bac20eb5256d05622fc0f62e46b0a6dbe779491d7cf19874e0d05119c4671aa0286b4f6 SHA512 597e0ea32097a2908a8e1ae4ce822873c8e4511dc26deb5a6fdf0b723dc20c2cf53a3295a30a35b77c903d40b858c7ab28a646546dc33d7ae7335d5396423350
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.20.ebuild b/sci-geosciences/gpxsee/gpxsee-7.20.ebuild
new file mode 100644
index 000000000000..36fc6a2dbbb6
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.20.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	local lang
+	dobin ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+
+	insinto /usr/share/${PN}/translations
+	for lang in lang/*.qm; do
+		[ -f "${lang}" ] && doins "${lang}"
+	done
+
+	domenu pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9398aab42f90..5e238fcb8ef5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,10 +3,10 @@ AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81b
 AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5
 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
-DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536
+DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.10.1.ebuild 5464 BLAKE2B 05f29a1d558eb85aa15dfd6d5c18b3162f4341e09be395b4386b29e446ccd021b510a684f2065b05590a6000cd9c17ee7213ba26bff9fa3399fe0fbf634c1c1c SHA512 8b62b65d4aaa9f105b44adbac655e1018e0f1c503817abd523e60bde4e3dfe3b0f00d1f638c643d28cba56606db49e507182091f75a63f7c5b6c5e1f744be163
+EBUILD qgis-3.10.2.ebuild 5462 BLAKE2B 1dda9fc92e04689fa73a0bda51d4d87cedcc0d50ab72c07b7512f1a740b1ff5247a53d9ed40a88d4c03174e97607488f2b1639eb857115f05654fd106b19526e SHA512 3483ad1c06e894e1546c426fda33bd27a4884df2c1a7b11580c72a3f3c59f44620438baa6e778f7c3257b4a62218b10a3ed9226371e10309093026ea69caefd9
 EBUILD qgis-3.4.12.ebuild 6069 BLAKE2B 56308d01f866770d39f9dc90998f7e0a1116f1701ce1a3485d098cad49f40f3aaedb73d498de1af1bd63f33062e4f4b73f15e8a0b5d0bb6d8b8f4ceb14f7824b SHA512 adbe42974b73c82bb3ad8f0fa3e26549b19e742c6a922d7bda9ee736bb4def0aee9837e4e22ad1439835db5f8f9c3a1aaec5d8dfdc073a30def851547e0cbf36
-EBUILD qgis-9999.ebuild 5464 BLAKE2B 05f29a1d558eb85aa15dfd6d5c18b3162f4341e09be395b4386b29e446ccd021b510a684f2065b05590a6000cd9c17ee7213ba26bff9fa3399fe0fbf634c1c1c SHA512 8b62b65d4aaa9f105b44adbac655e1018e0f1c503817abd523e60bde4e3dfe3b0f00d1f638c643d28cba56606db49e507182091f75a63f7c5b6c5e1f744be163
+EBUILD qgis-9999.ebuild 5464 BLAKE2B bc5374f93fec200d1a1c824bb9da5755d4871b4a041bce481ced386470bf66795c32d0266e07fa249dbc07399a328c9902edab5e2a03d035615811d8b46436a1 SHA512 2fbe115ef3ff9dad4af0174b6e11082d2a1468935fd5fae870bc5de33f664a16e15ed7667b8d66d23c0420d56e2037a2285f9f5e86a155f64051ec52178b366e
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/qgis-3.10.1.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild
index cffda470c4af..232d4a5b49c5 100644
--- a/sci-geosciences/qgis/qgis-3.10.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 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"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index cffda470c4af..14ca3c37210b 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
 	>=dev-qt/qtxml-${QT_MIN_VER}:5
 	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
+	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 274aa634ceae..5b76d2385247 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -5,5 +5,5 @@ DIST qmapshack-1.13.2.tar.gz 12725064 BLAKE2B fad8fdbb9fe1559823bcb835f64d88751c
 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
 EBUILD qmapshack-1.13.2.ebuild 875 BLAKE2B 336d58ba60e3a0d30c68b3ba2579851c4aa19e13473fa9dd51686b0b4b2e084979347d2959feb6f78296a515349a991cdb290955b2332ff6c24d40337685b613 SHA512 6bbd42f14809b65b4a4c3ea902f8eba523ee450a32e533f1cf10a50c419cd10a348d1930271f524e21810a414564e9afdda05bfbeecfd58e3f7e0ac3740ad2c2
-EBUILD qmapshack-1.14.0.ebuild 910 BLAKE2B 7816ff6d1d6171d5ef25a1202bbd3ede2e090ed36b6d6b065c5f494904bd312e9ca798e833f7e6ce55aaacc1ce9dde6fb81d8ad01411051d8e0b307e97df34f6 SHA512 548d08ffe6811d87c92abe7f863fce09035ecf1e33ff71168346d26251d1195caa75cc356aba87a06c6e8410773ad91b63ba11225c9552e529d72e1fcc83237a
+EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
index 3897457cafed..acb33f65883f 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
 SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.14.0.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtdeclarative:5[widgets]
diff --git a/sci-geosciences/tappy/Manifest b/sci-geosciences/tappy/Manifest
index 4fc7e340b80d..1dd5cac5a19d 100644
--- a/sci-geosciences/tappy/Manifest
+++ b/sci-geosciences/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tappy-0.9.0.tar.gz 1250867 BLAKE2B e88a4744d29dfbf8f225b0167e845e9df57ad9f81d4edb840d59f05d28f99f26df7d9feb278d0ad6eedcc538fee112aae266c52aca27a3c8c780c8b1b43f1a3c SHA512 2f3c7676c166dbfe88436cac9a0c4e3d3d4c027e17c39617c45eb02c1c2eda9276afb1ceaa16afd54bb6de130248f83c8c66aeb3509483cce642d2eb631fb9df
-EBUILD tappy-0.9.0.ebuild 578 BLAKE2B d72cd7589287cb553ff5224c86baba7f880aacbd48b25016771ae56010de96cebcbd5cce145e1a7e88d2ec71436d1b52f5f4604f644e59203a3f15d1159389c3 SHA512 329455350b283d7950dece0ae582fe96570dc9ecfa41596f8174d7d0cdca90cf2dc581a4be8a8efa2aeb532fc898e7e98f969a73e430f55885dda8468ca9b700
+EBUILD tappy-0.9.0-r1.ebuild 708 BLAKE2B bad8b6e603aaaf43c38120b1d726a300b2c65e59dc72bc926cc8b66989da7a51e016574c912eaa34f68b6486d10dfbf380069670fc071980d09fbe544c2e2788 SHA512 c4caf04431d745d5da389f074a4603330f4108fc169168cc3be867ee7eeb635c1007f8ae94ed056805e60cc2610893d7dfc8a8d0479c1d9b7a4a6ffdbf97f699
 MISC metadata.xml 242 BLAKE2B cdc1157283a9439880469dfa1c51696b63562ffb6e4c911b653daabb26541d50c7eb2584b63b1616aff50b84723429002cf1adf21b944a95b3cb72df74228b09 SHA512 9f5f87d23e28667049584a6c7d3104f7c54a90c71a5527728415a683af6fdae01f64b9b22e9bf4e8d2627396b1000480cbaaaeb286ad7370ccf0aab9e93e01a3
diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
index cf6423bcefa9..8f6ed281d6cb 100644
--- a/sci-geosciences/tappy/tappy-0.9.0.ebuild
+++ b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pywavelets
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"