gentoo resync : 05.04.2019

15 files changed, 126 insertions, 305 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index dec45d51899f..0dde04cd8b32 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index c29a065f4dba..b8a857ba65f5 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,8 +1,6 @@
 AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
-DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838
 DIST geocode-glib-3.26.1.tar.xz 75296 BLAKE2B 68e42868edfd73db94d16dcc754eea1ee736ad910c5180616ba351cc50b682cd3b7ea4a64c9e1296af315298f68ea850a1773c4a05955c1159a6038773aad184 SHA512 0eb8e8a668c3950d06e77a379d375e2297cf7d95435aa8212715ddc36c3a57a53192e75dd0c82a2f2e7e558ea0e903a477c9dfa54f8cd2805d048fe46265d621
 EBUILD geocode-glib-3.24.0.ebuild 1102 BLAKE2B 57374e9c55d69bf88a15daba5a16288141d601fb63db5aef322bc6ae0e9293a36cccd32a45fa4e8b582e904239d091dd85159a52d3c0d71f405faf9a20eb092d SHA512 1f22d917ed56b2cc8e0707586131fb0c5c94a7322d444b06a3a31a06e445b0bd35eab970b747538b889066700600a03e4acd909f723f2682d888d6bd8d715b31
-EBUILD geocode-glib-3.26.0.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
 EBUILD geocode-glib-3.26.1.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
 MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
deleted file mode 100644
index 018bb7e4086a..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson xdg
-
-DESCRIPTION="GLib helper library for geocoding services"
-HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk-doc +introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.99.2[introspection?]
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/disable-installed-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk-doc enable-gtk-doc)
-	)
-	meson_src_configure
-}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 51dc59e03306..36f6f34d2d16 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-maps-3.24.3.tar.xz 1145872 BLAKE2B bd6e9652c341def652beea966d3a171a050219f3bc83288bd83eacb069899cd94d154d53bcea081bdfefdeee9b74e56c158c703ed92c9fcb5e35ecd718900e4a SHA512 b4a4c278359803e11b1aa43fb522a84b95eecfc349a134322f45db7acfe93867a61f6bd48e55a07d5d602b8161cdf5949a6b5d4da1212659e133260063ab6198
-DIST gnome-maps-3.26.2.tar.xz 1175944 BLAKE2B abd8a592c10e31f4a05a6f3ef1167d111ab19a957e2fd3efa78f6999f60f98ff1767bcde18c6fb56bd6af580fd5e619106371214a92c4c450fe16df6fa4d8e23 SHA512 15548d834cf859b1d67111bdf81c3dc87c62c97574b89f41ae81bd5ce8bdccb10e705c7e91f5880d2528df88f85d6416302163d31c5b9d0f359451385168866b
 DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203
 EBUILD gnome-maps-3.24.3.ebuild 1270 BLAKE2B e2d7d77baed5a2aa7aa59e0a127b46a8a2e776260e4201780919fe42b122d066a089c5caac66b5103d7c52acf4a4ea33e52814e18502e80d8d08802f290d7050 SHA512 1cbd89a0b5621bebf8fd679adbb587a210bc45a77ad0cf162dac73f5440d765f510e0b066eeddda931053a5fc9cb574e5fffae8e6340c2f74b9aff97b1ffc827
-EBUILD gnome-maps-3.26.2.ebuild 1293 BLAKE2B 45fc678100dc7db48e1f96345c29b475171c8e77710ca329db19c9a102c3a4cf0bd5ad0e68d94366a64c25b626ae93c68d3a72306c8a875fa468137b1256a86c SHA512 26ab223d1a698659aed44090e2eb7c8c838ab7c6a8633bbbfc3adeb3c72cd00ed4c99f4006e2976c9ee8eca45524958c2312739e77df59ae6344dd0defc1fb97
 EBUILD gnome-maps-3.30.3.ebuild 1361 BLAKE2B 0c1265e5a231615b36c58744e5434f0cc93fd14ea0bfb7958c1723acca5507e500d1b998984e8b5f5ea6efb8c02f399de7c0ea86451d7264a126991e0f52bd74 SHA512 f913d9029855ddf68f57c93cae3368cac6848d65d9cc30d390a8bf138f476a91d425dafd4d986d0e0e5ab8189795bd594497545830c952ee6cdd66cfd14f3a2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild
deleted file mode 100644
index 7a8281daf0e3..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.26.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-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"
-
-COMMON_DEPEND="
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=dev-libs/folks-0.10
-	>=dev-libs/gjs-1.44.0
-	>=dev-libs/gobject-introspection-0.6.3:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	dev-libs/libxml2:2
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	>=net-libs/rest-0.7.90:0.7[introspection]
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-"
-# Found by grepping imports.gi in ${S}
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	media-libs/cogl: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]
-	x11-libs/gdk-pixbuf:2[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 5873e116df40..23de48c56fe0 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,5 +1,7 @@
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
 DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
+DIST gpxsee-7.5.tar.gz 4302319 BLAKE2B f31aba249b87a85b7d5e4b2e3bb6c300b682a0f0e77d82b8151ffbd621664840782a1894277249e5f858a6837cf0580bb32748a04684157999edc64295f4192d SHA512 ff55267abeda8970282bbbadc9fdf0c72120aa25cf6f3ce95de77ea330087e36a0c64332ff9cd1c569bac24bed891dc265ded57587e7fb258b30e382fa31b093
 EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
 EBUILD gpxsee-7.1-r1.ebuild 1595 BLAKE2B 56ee4fc1ae26a1b7df8d20ac9c5a6b05416693ff90b9c25d99c19d1573024e5e84eaad1bf0118d376646152608584311f6afb18925e3899a80e781414ff3bd35 SHA512 b3d634a0888de422e0b912913323142b9c02673d610d17036854102c6213cd599635a61f30937a0d9255d8f8ae669eef64ab02b5a9935af922251ca9a953c0a4
+EBUILD gpxsee-7.5.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.5.ebuild b/sci-geosciences/gpxsee/gpxsee-7.5.ebuild
new file mode 100644
index 000000000000..6b28d5dd63ab
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr"
+inherit qmake-utils l10n xdg-utils gnome2-utils
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="http://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}
+	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
+
+	insinto /usr/share/applications
+	doins pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	insinto /usr/share/pixmaps
+	doins icons/${PN}.png
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index d4437ca7a8cd..01a6eb0a8950 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,7 @@
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
+DIST qmapshack-1.12.3.tar.gz 12029443 BLAKE2B 8d7f117c8379f7181ce68f79f460f59342cf654179c8b85839fe003e06167765e3e2292e14b4bc71c3ba1aeb388fcbb77faccdd57748335c1df8500f9e52ba41 SHA512 01a2b73f2f432a24b614c4a325e0b0a2aaf5b6ef75c5a7fbeb2be341adc7c46faa71cf7e9f4fdeb769d546b7a760be553a38ac6cc1c5c2c2d044edd37f550a85
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
 EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
+EBUILD qmapshack-1.12.3.ebuild 919 BLAKE2B 328f37d614983ffa610d602b14a897ff7a5f85042e23fe011afcfb63ac7e2ccf37cd577ca705701c7ad25d1e29fb7e364044313b3fc4d9e38dc035fbc3e35160 SHA512 8c58ee8a428ccd501c51431365cbdc31d974d0d6fe34e18809b5e999b2fcb1558ade2a7e0275f98f53818ac7ff97538d16d38dd2a0fffc9bb10e2928330530d6
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild
new file mode 100644
index 000000000000..6dfd76c879ad
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/designer:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index d3352801a94a..64655f7396c6 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,8 +1,3 @@
-AUX xtide-2.13.1-Werror.patch 611 BLAKE2B 624b5e8c67eb1d916a8ce519a22c4590e8e4c11e4991d864a8ad93814ad873ec97e13c6ff00747271bb8a0e5878a3a862c13db7596cbbb5d5b1f5e971e1bb752 SHA512 3ce9ea4a32afe30d926be8f3c472745a84d146170e929925855583de2fa7ee10e867a6f6e6ac339bb4e2a66f6ec6a517d75959bac2a2f4d009c305933a513607
-AUX xtide-2.13.1-gps-switch.patch 2413 BLAKE2B 87414b04c6fea28ac235e7a497de8363696160691ae5a81d898c5b3d83639e863b2a9b495d69092f3316f07ba431a4d50b6ff63d3e78d6cc3700e42ae0de108e SHA512 0f6dc8399962c76853d75dc00e4929ca7fa9c0f004c47902936b586e231ba8772b333330ae0ec909bb45c13ff393dcf212fabba3b7e52ddaa50e93920a9852f5
-AUX xtide-2.13.2-clang.patch 913 BLAKE2B 0bf2e94888907030f2d5752886d1c39cd89b182c34a3c2471b08cebb57037954c4f27612c3e37f47b70d671106862c66b60e0e4fcf0c8010309f50147484e00b SHA512 5f9d5ea48706cb42a6fe8be8615b54eb67b7304a933f6e7a577ac3ea162a374221cb325766263664dc74c6bb5d1340f9f3417032a663ae446892c17d5561b88b
-DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc SHA512 31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
 DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
-EBUILD xtide-2.13.2.ebuild 1190 BLAKE2B a6302e79d6e6122b53e46e725b755d55d7e051f2610085a790eed8968f1d2984b38a24b4b56a760bf78987e4273e26344e76cce0983e63caafeb363c9083bf3c SHA512 32e5948a9e7d20633209c3079d13a0fa5bb979f92580b888dc3a5da4cd7104e5d60442b05162273ca4487c910d7f4a84ea422913b80c4385e65f2a077b5eb610
 EBUILD xtide-2.15.1.ebuild 991 BLAKE2B 074d253d721ffd5a0ddb3ee5d7025166b271c2c998689457e90d8f51cc1f9a881d9d603d2e6e8a73247fcc9db17ee2c5adcd6cf979b9b9dc56e2c27fe91d76f8 SHA512 5caf4b325339039ccd9e0835db60d3a17a9e3f657ce7a66bf2773483408341df30796b746a54d6522ea156e3b240483a9a461fd4b05b5575c47ba3c5543e1c15
-MISC metadata.xml 244 BLAKE2B 934bb17faea52392265caa18c77fd32ecb9b80303c9f67145928471c0ad0c4e18f0500b35db4de459ad3575c3a111e2e5afa88fd7c3ab40c15d9d1e9446603c4 SHA512 2cf646d59cd730a1d957a67d2a5735dc205f9270342b86b4a201213e3c9455d8a73a640cac5248a4655f93ac2258f8092a3907553818783da3d864e8fe74323a
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
deleted file mode 100644
index fcfd147e51bb..000000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Jul 13 13:25:42 2013 +0200
-
-    BUILD: remove -Werror
-    
-    It's discouraged to add non-specific Werror flags.
-
-diff --git a/configure.ac b/configure.ac
-index b366337..86c7569 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ m4_if(2.65, AC_AUTOCONF_VERSION, [m4_fatal([autoconf version 2.65 is broken and
- # FIXME: Update version info on each release
- AC_INIT([XTide], [2.13.1], [dave@flaterco.com])
- 
--AM_INIT_AUTOMAKE([-Wall -Werror])
-+AM_INIT_AUTOMAKE([-Wall])
- 
- AC_LANG([C++])
- AC_PROG_CXX
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch b/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
deleted file mode 100644
index 54c6546fe298..000000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-commit 755677baae16fd8772efd523a25b787ea3fc0772
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Jul 13 13:26:24 2013 +0200
-
-    BUILD: add --with-gps switch
-    
-    We don't want automagic gps detection, but give control
-    to the user.
-
-diff --git a/configure.ac b/configure.ac
-index 86c7569..307def4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,6 +156,12 @@ if test -z "${SKIP_COMPLICATED}"; then
- fi
- CXXFLAGS="${SAVED_CXXFLAGS}"
- 
-+AC_ARG_WITH([gps],
-+            [AS_HELP_STRING([--with-gps],
-+              [use libgpsd (default: no)])],
-+            [gps=$withval],
-+            [gps=no])
-+
- # xttpd configs
- AC_ARG_WITH([xttpd-user],
-             [AS_HELP_STRING([--with-xttpd-user=user],
-@@ -381,32 +387,35 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([dstr], [DstrCompat20070215Check])])
- AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes")
- 
- # libgps is optional; use it if you have a compatible version.
--AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
--  AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
--  AC_COMPILE_IFELSE(
--    [AC_LANG_SOURCE([[
--#include <gps.h>
--#if (GPSD_API_MAJOR_VERSION < 5)
--#FAIL
--#endif
--int main (int argc, char **argv) {
--  struct gps_data_t gpsdata;
--  gps_open ("127.0.0.1", "2947", &gpsdata);
--  gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
--  gps_read (&gpsdata);
--  return (gpsdata.fix.mode >= MODE_2D);
--}
--    ]])],
--    [
--      AC_MSG_RESULT(yes)
--      AC_DEFINE([GPS_GOOD])
--      AC_SUBST([GPSD_LIBS], ["-lgps"])
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--  )
--])])
-+
-+AS_IF([test "x$gps" = "xyes"], [
-+	AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
-+	  AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
-+	  AC_COMPILE_IFELSE(
-+		[AC_LANG_SOURCE([[
-+	#include <gps.h>
-+	#if (GPSD_API_MAJOR_VERSION < 5)
-+	#FAIL
-+	#endif
-+	int main (int argc, char **argv) {
-+	  struct gps_data_t gpsdata;
-+	  gps_open ("127.0.0.1", "2947", &gpsdata);
-+	  gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
-+	  gps_read (&gpsdata);
-+	  return (gpsdata.fix.mode >= MODE_2D);
-+	}
-+		]])],
-+		[
-+		  AC_MSG_RESULT(yes)
-+		  AC_DEFINE([GPS_GOOD])
-+		  AC_SUBST([GPSD_LIBS], ["-lgps"])
-+		],
-+		[
-+		  AC_MSG_RESULT(no)
-+		]
-+	  )
-+	], [AC_MSG_ERROR([cannot find libgps])])], [AC_MSG_ERROR([cannot find gps.h])])
-+	])
- 
- AC_TYPE_INT8_T
- AC_TYPE_INT16_T
diff --git a/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch b/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch
deleted file mode 100644
index 090aa6c4f7ab..000000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Aug 17 20:15:03 UTC 2015
-Subject: fix build with clang
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,26 +22,6 @@
- AC_SUBST([ADDED_CPPFLAGS])
- AC_SUBST([ADDED_CXXFLAGS])
- 
--# Extended initializer lists were added in 4.4.
--AC_MSG_CHECKING([if using a version of GCC older than 4.4])
--AC_PREPROC_IFELSE(
--  [AC_LANG_SOURCE([[
--#ifdef __GNUC__
--#if (__GNUC__ * 100 + __GNUC_MINOR__) < 404
--#FAIL
--#endif
--#endif
--  ]])],
--  [
--    AC_MSG_RESULT(no)
--  ],
--  [
--    AC_MSG_RESULT(yes)
--    AC_MSG_NOTICE([if using GCC, version 4.4 or later is required])
--    AC_MSG_ERROR([GCC too old])
--  ]
--)
--
- # /tmp/ccB6kF2d.s: Assembler messages:
- # /tmp/ccB6kF2d.s:1325: Error: symbol `_ZZN10SafeVectorIdEixEPdS1_jE19__PRETTY_FUNCTION__' is already defined
- # /tmp/ccB6kF2d.s:1330: Error: symbol `_ZZN10SafeVectorI5AngleEixEPS0_S2_jE19__PRETTY_FUNCTION__' is already defined
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index e723c4be1d88..7a38bb900964 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="gps">Use <pkg>sci-geosciences/gpsd</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/sci-geosciences/xtide/xtide-2.13.2.ebuild b/sci-geosciences/xtide/xtide-2.13.2.ebuild
deleted file mode 100644
index 16379601e784..000000000000
--- a/sci-geosciences/xtide/xtide-2.13.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="http://www.flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gps"
-
-DEPEND="
-	media-libs/libpng:0
-	>=sci-geosciences/libtcd-2.2.5_p2
-	x11-libs/libX11
-	x11-libs/libXaw3d
-	x11-libs/libXpm
-	x11-libs/libXt
-	gps? ( sci-geosciences/gpsd )"
-RDEPEND="${DEPEND}
-	media-fonts/font-schumacher-misc"
-DEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.13.1-{Werror,gps-switch}.patch \
-		"${FILESDIR}"/${P}-clang.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gps)
-}
-
-src_install() {
-	dobin xtide tide xttpd
-	doman *.[18]
-
-	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
-	doenvd 50xtide_harm
-
-	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
-
-	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}