gentoo resync : 05.12.2021

4 files changed, 293 insertions, 0 deletions

diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 9dcceb2d1401..57b5d2bb557d 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,7 +1,12 @@
 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
diff --git a/sci-geosciences/viking/files/viking-1.9-geocache.patch b/sci-geosciences/viking/files/viking-1.9-geocache.patch
new file mode 100644
index 000000000000..4779c10dcd4c
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.9-geocache.patch
@@ -0,0 +1,88 @@
+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/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild
new file mode 100644
index 000000000000..131abba15633
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.10.ebuild
@@ -0,0 +1,100 @@
+# 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}"
+
+src_prepare()
+{
+	default
+	eautoreconf
+
+	sed -i -e '/Avoid creator line/isrcdir=test' test/check_gpx.sh || die
+}
+
+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.9.ebuild b/sci-geosciences/viking/viking-1.9.ebuild
new file mode 100644
index 000000000000..3a74ac41d23c
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.9.ebuild
@@ -0,0 +1,100 @@
+# 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
+}