gentoo resync : 12.03.2021

4 files changed, 126 insertions, 20 deletions

diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 34df0a20593b..ae59c85b4af9 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,5 +1,6 @@
 AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
-DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab1e0158cac4afe2bf8e7d0d9e1d452b3275219fdd8599ebf2044c17267899f2b0508fc36f274557c1db253320 SHA512 ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
+DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.7-r1.ebuild 1939 BLAKE2B af65d6185272c5a71256e8928de8c4dc06c2da8a930ecdb08b89e8016b53073afd29f0e90786c76d2802ddc7d96e4dfdadcb789df88bac2f3bee56b88c3c1739 SHA512 18a4ffdafe72f226e8538e9a1a5214839d35881e6f86453f2faf73217c1ecf48c6b5a5e219abf4126b8df93bb70c7b0be2e69ec647b44a9f9b52621262d2de02
-MISC metadata.xml 907 BLAKE2B 10a21eba422ae7af3ffe08730b31f9304352b3a286b9f91b1e96e202fc5d631d37847ea8ae864b7476d39a705fa82dd90958134915f4572adfbc2d5f359cb0d2 SHA512 5ccd7d0323e266977a06e74c9896e211b903d40915631771956cddf8176ad01c5e4b4df7b8f5494c78ae92027cb9314d354254cc671cb498238059d6465d96b7
+EBUILD viking-1.8-r1.ebuild 2005 BLAKE2B fa260af8911ce785a8784a44746fd364dfeeb34bd8e34eefd752d212e7f23baa76447df37fb197fc3b9de32cd47e3d97fd304ab1e740d27a0c05c6c73e1310ae SHA512 76716a6434498e46bf2733abc7380cc2a0f1177d058d9e2eee0c757026805e473d09a9ac135d507da95661506979faf2fd14161b4a9ee1704db951c8576050de
+EBUILD viking-1.8.ebuild 2037 BLAKE2B 5e9cf7ad142e3178da1ac92a50adee5f67d28655b02b594fd385c1c1a9582f27e6eaaddf7c0296d7d812ab31a8434608a2e056787d125c8842cd85238dfa491b SHA512 fa63ac4da0792172a596ce1a68de4d6c0213e0618bcac9958c0a6e36ffd0ee3eae162a83b04959a93e46e6cc0ef96456dceedd215ae48734aedafe9008d41bc4
+MISC metadata.xml 833 BLAKE2B b0c8b498cf7786b610e6528448bfab45e88967dca7cc59779ea9e3f51684f7ca85296de3b258971adf23618e1a60bed663be32ecf85a367157d0e7381010aa8d SHA512 8354f387678813b1c78e28a8b28475fca3a148297bcd13555f6e3fdf5fea600b242f82f68265c16cb760d927b6adf07b7dd328a06ff245e8eef70fa3833717df
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index 12c39a7e155e..7051ff1293ba 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -15,9 +15,6 @@
     <flag name="libexif">
       Use <pkg>media-libs/libexif</pkg> for EXIF support
     </flag>
-    <flag name="mapnik">
-      Enable a layer based on mapnik
-    </flag>
     <flag name="oauth">
       Enable OAuth authentication for OSM
     </flag>
diff --git a/sci-geosciences/viking/viking-1.8-r1.ebuild b/sci-geosciences/viking/viking-1.8-r1.ebuild
new file mode 100644
index 000000000000..fc94ad904522
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.8-r1.ebuild
@@ -0,0 +1,100 @@
+# 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" )
+
+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.7-r1.ebuild b/sci-geosciences/viking/viking-1.8.ebuild
index 49c888a29271..144c066bb68e 100644
--- a/sci-geosciences/viking/viking-1.7-r1.ebuild
+++ b/sci-geosciences/viking/viking-1.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite"
+HOMEPAGE="https://github.com/viking-gps/viking/"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth sqlite"
 SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+	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"
@@ -26,11 +26,10 @@ COMMONDEPEND="
 	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	geoclue? ( app-misc/geoclue:2.0 )
-	gps? ( >=sci-geosciences/gpsd-2.96 )
+	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 )
-	mapnik? ( sci-geosciences/mapnik )
 	oauth? ( net-libs/liboauth )
 	sqlite? ( dev-db/sqlite:3 )
 "
@@ -40,6 +39,7 @@ RDEPEND="${COMMONDEPEND}
 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
@@ -47,7 +47,15 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}/${P}-no-common.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.7-no-common.patch" )
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare()
+{
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
@@ -63,12 +71,12 @@ src_configure() {
 		--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 mapnik) \
 		$(use_enable nls) \
 		$(use_enable oauth) \
 		$(use_enable sqlite mbtiles )
@@ -82,11 +90,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
 }