Adding metadata

5 files changed, 186 insertions, 65 deletions

diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 986df5190009..2b7dea53528d 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,9 +1,6 @@
-DIST josm-bin-19396.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
-DIST josm-bin-19396.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
-DIST josm-bin-19412.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
-DIST josm-bin-19412.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-bin-19423.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
 DIST josm-bin-19423.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
-DIST josm-snapshot-19396.jar 19208876 BLAKE2B c59b7fddd4ad436458d3625287814f3662a3bde2252a020497cfffd2dea5f2c39a6f9545a82d9c48651835b8c2d6c1022b47764287871ffdb219b941c4362502 SHA512 d4549e6dbb91036c038bcb8c9ccce30af8d2595391a4c296f51978be60c0b6e13743970c88b8299297fa76f3f7f82ef47e578c15904def3cc76ace18267bbbfd
-DIST josm-snapshot-19412.jar 19233959 BLAKE2B 7e6d89e01e2b27b0c86148d501b5dc11b7cdf14f60bf6c8e054c53b39564a0f43e2892bfe5233058aa7df4d61e230a15417986bb21f02ee17a7d197e2827cf47 SHA512 e43122a357a90960e5028a85a4dc29cbf1d982e791388cbfba0d06726ae23bbae65cca579bdd9a69ce1cbddcda38059348b2f7c092c27a5b3b20a83b15c98060
+DIST josm-bin-19439.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
+DIST josm-bin-19439.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-snapshot-19423.jar 19256265 BLAKE2B 7838f10d34234126dd095ff12ecfe09d1c22e4abc32a6bf241da470dca806473f96803633f6318271bfa169958f8760af329294dcb4740c1304f95e6dc2c4f01 SHA512 59a76db3c0d83ebfba669d43ff33fdbdfb65b8401ac7325a6b9e89bdc1f3096398693735302019a2e7eb6054506cd387e87185e247155621d431fa10b1384359
+DIST josm-snapshot-19439.jar 19265757 BLAKE2B 8b3bfcb9a1cd61c87471c2096ff6b6c3454300b55abd1052e4d34efb803db8217c073d847e2b0d6c1524e593a15136613931e2235cebee81811b5a42129b8541 SHA512 5f083bc2ad11f8d6bf0f381394525e4d551a02bb9ed826476ede4e53926068aa8c56a839cc7927a052b8b3a14ba24de0f99698aa37f0bc1fc54c8246807301a7
diff --git a/sci-geosciences/josm-bin/josm-bin-19412.ebuild b/sci-geosciences/josm-bin/josm-bin-19412.ebuild
deleted file mode 100644
index 23f514e83b7c..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19412.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop java-utils-2 xdg
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage
-SRC_URI="
-	https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar
-	https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop -> ${P}.desktop
-	https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/mime/packages/josm.xml \
-		-> ${P}.mime.xml
-"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-BDEPEND="app-arch/unzip"
-
-src_unpack() {
-	default
-
-	cp "${DISTDIR}/${P}.desktop" "org.openstreetmap.${PN}.desktop" || die
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/^Exec=josm/Exec=josm-bin/' "org.openstreetmap.${PN}.desktop" || die
-	sed -i -e 's/^Icon=org.openstreetmap.josm/Icon=org.openstreetmap.josm-bin/' "org.openstreetmap.${PN}.desktop" || die
-}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/josm-snapshot-${PV}.jar" ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar \
-		--java_args "\
-			--add-exports=java.base/sun.security.action=ALL-UNNAMED \
-			--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \
-			--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
-
-	local icon_size
-	for icon_size in 16 32 48; do
-		newicon -s ${icon_size} -t hicolor \
-			images/logo_${icon_size}x${icon_size}x32.png "org.openstreetmap.${PN}.png"
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png "org.openstreetmap.${PN}.png"
-	done
-	newicon -s scalable images/logo.svg "org.openstreetmap.${PN}.svg"
-	domenu "${WORKDIR}/org.openstreetmap.${PN}.desktop"
-	insinto /usr/share/mime/packages
-	newins "${DISTDIR}/${P}.mime.xml" "${PN}.xml"
-}
diff --git a/sci-geosciences/josm-bin/josm-bin-19396.ebuild b/sci-geosciences/josm-bin/josm-bin-19439.ebuild
index 23f514e83b7c..eb0c8cfe550b 100644
--- a/sci-geosciences/josm-bin/josm-bin-19396.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-19439.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 BDEPEND="app-arch/unzip"
diff --git a/sci-geosciences/viking/files/viking-1.10-c23.patch b/sci-geosciences/viking/files/viking-1.10-c23.patch
new file mode 100644
index 000000000000..d1139fa3eabd
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.10-c23.patch
@@ -0,0 +1,82 @@
+From d447c19b6a2fe499fd60aa8969ea91c5cbfda159 Mon Sep 17 00:00:00 2001
+From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
+Date: Wed, 29 Jan 2025 00:49:42 +0200
+Subject: [PATCH] C23 compatibility
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In C23, empty paramter list in function declaration actually means that
+function takes parameters. Update to declare parameters for all
+functions that take them, and pass NULL as needed.
+
+Without this change, building with C23 fails with errors like shown
+below. These broke build for Fedora 42, which comes with GCC 15 and
+uses C23 by default.
+
+    vikaggregatelayer.c: In function ‘vik_aggregate_layer_create’:
+    vikaggregatelayer.c:631:27: error: too many arguments to function ‘vik_aggregate_layer_new’; expected 0, have 1
+      631 |   VikAggregateLayer *rv = vik_aggregate_layer_new (vp);
+          |                           ^~~~~~~~~~~~~~~~~~~~~~~  ~~
+    In file included from viking.h:57:
+    vikaggregatelayer.h:48:20: note: declared here
+       48 | VikAggregateLayer *vik_aggregate_layer_new ();
+          |                    ^~~~~~~~~~~~~~~~~~~~~~~
+    vikaggregatelayer.c: In function ‘aggregate_layer_unmarshall’:
+    vikaggregatelayer.c:680:27: error: too many arguments to function ‘vik_aggregate_layer_new’; expected 0, have 1
+      680 |   VikAggregateLayer *rv = vik_aggregate_layer_new(vvp);
+          |                           ^~~~~~~~~~~~~~~~~~~~~~~ ~~~
+    vikaggregatelayer.h:48:20: note: declared here
+       48 | VikAggregateLayer *vik_aggregate_layer_new ();
+          |                    ^~~~~~~~~~~~~~~~~~~~~~~
+    vikaggregatelayer.c: At top level:
+    vikaggregatelayer.c:700:20: error: conflicting types for ‘vik_aggregate_layer_new’; have ‘VikAggregateLayer *(VikViewport *)’ {aka ‘struct _VikAggregateLayer *(struct _VikViewport *)’}
+      700 | VikAggregateLayer *vik_aggregate_layer_new (VikViewport *vvp)
+          |                    ^~~~~~~~~~~~~~~~~~~~~~~
+    vikaggregatelayer.h:48:20: note: previous declaration of ‘vik_aggregate_layer_new’ with type ‘VikAggregateLayer *(void)’ {aka ‘struct _VikAggregateLayer *(void)’}
+       48 | VikAggregateLayer *vik_aggregate_layer_new ();
+          |                    ^~~~~~~~~~~~~~~~~~~~~~~
+---
+ src/vikaggregatelayer.h | 2 +-
+ src/viklayerspanel.c    | 2 +-
+ test/test_file_load.c   | 2 +-
+ test/vik2vik.c          | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
+index fe726600..38061152 100644
+--- a/src/vikaggregatelayer.h
++++ b/src/vikaggregatelayer.h
+@@ -45,7 +45,7 @@ GType vik_aggregate_layer_get_type ();
+ typedef struct _VikAggregateLayer VikAggregateLayer;
+ 
+ void vik_aggregate_layer_uninit ();
+-VikAggregateLayer *vik_aggregate_layer_new ();
++VikAggregateLayer *vik_aggregate_layer_new ( VikViewport *vvp );
+ void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering );
+ void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, VikLayer *crt_layer, gboolean allow_reordering );
+ void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up );
+diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
+index 2ac4b33e..cc513885 100644
+--- a/src/viklayerspanel.c
++++ b/src/viklayerspanel.c
+@@ -659,7 +659,7 @@ static void vik_layers_panel_init ( VikLayersPanel *vlp )
+   vlp->hbox = gtk_hbox_new ( TRUE, 2 );
+   vlp->vt = vik_treeview_new ( );
+ 
+-  vlp->toplayer = vik_aggregate_layer_new ();
++  vlp->toplayer = vik_aggregate_layer_new ( NULL );
+   vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer"));
+   g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(layers_panel_emit_update), vlp );
+ 
+diff --git a/test/vik2vik.c b/test/vik2vik.c
+index e53a9746..ff8c8fa1 100644
+--- a/test/vik2vik.c
++++ b/test/vik2vik.c
+@@ -43,5 +43,5 @@ int main(int argc, char *argv[])
+   // Also get lots of warnings about no actual drawing GCs available
+   // but for file processing this seems to be good enough
+   VikLoadType_t lt;
+-  VikAggregateLayer* agg = vik_aggregate_layer_new ();
++  VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL );
+   VikViewport* vp = vik_viewport_new ();
diff --git a/sci-geosciences/viking/viking-1.10-r1.ebuild b/sci-geosciences/viking/viking-1.10-r1.ebuild
new file mode 100644
index 000000000000..7fe5568bdfed
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.10-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 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/"
+SRC_URI="
+	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
+	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
+
+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-build/gtk-doc-am
+	dev-libs/libxslt
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-terraserver.patch" "${FILESDIR}/${P}-c23.patch" )
+
+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
+}