6 files changed, 10 insertions, 42 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index fde4dc34180a..e98dbfa1d1f6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 2f864529c59d..ed46a4160931 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,5 @@
-DIST josm-snapshot-18678.jar 16376303 BLAKE2B 9db4a9bd90e0f2deac4474462091d91505874f936fde330c6a676d4beecf029966d692bc2dadc0f2d44bfcb53d8f40a075a95d0bb4b07f6ffffb160080d88ceb SHA512 af621dab4ad5495fe895639811e6c0e24e463b1c8fbcb70c5626ca68a0b9b1a9b16a34dd746335553dd84974197ba37ab3bb9c5eee19da2209f41da94a8cc28f
 DIST josm-snapshot-18700.jar 16421003 BLAKE2B 67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2 SHA512 7d6923bf3d5ba1f7331a3904d1b54920a301eacc53c720991132cecb00bfc2dca2e0fd9d58d90e88ff0e3f46207bed06b6ac002e13baa69e95cbc0c11b4e191e
 DIST josm-snapshot-18721.jar 16460468 BLAKE2B 6c5e86b31691a366211ea93e3094a8650ac6e2b42f4f72883ffc17819108cf717f1b29f2918788acfe07aae946f57b4b88be637069fc97b830af067de9a69de1 SHA512 53244e668d5269e8c20a0efadab9ab7ab665f40f1e02366e3491b3dac9ff1595a2a10ba34e063f56bef1c8e3c450abd237f6c02218484817960e8dfd7959db41
-EBUILD josm-bin-18678.ebuild 976 BLAKE2B aaf25951cb28d38145349c597d78289352b8f67583009721e4212953b6c230f40140542da3a5c6e426a1bbcb5a31d8f607af2a11b66cfcfb28af5cd5db71e7fc SHA512 4dde794985c520f37d8a0ad83de71cb2d0cc5385b156c4337fd52e2193c705788015aebc6028dd42b0504fdd0ac764a00c600b4c041003ad448adad4d462355a
 EBUILD josm-bin-18700.ebuild 976 BLAKE2B aaf25951cb28d38145349c597d78289352b8f67583009721e4212953b6c230f40140542da3a5c6e426a1bbcb5a31d8f607af2a11b66cfcfb28af5cd5db71e7fc SHA512 4dde794985c520f37d8a0ad83de71cb2d0cc5385b156c4337fd52e2193c705788015aebc6028dd42b0504fdd0ac764a00c600b4c041003ad448adad4d462355a
 EBUILD josm-bin-18721.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18678.ebuild b/sci-geosciences/josm-bin/josm-bin-18678.ebuild
deleted file mode 100644
index 60cd9ef522d0..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-18678.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 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"
-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_install() {
-	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-
-	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 ${PN}.png
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 988b8fc6ef25..1290212f22b5 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,6 +1,6 @@
 DIST opencpn-5.6.2.tar.gz 82919992 BLAKE2B a45e19d293d63262f2bb6bd0bd5d18723cadd0b93af8e64484b55d246cebbe623dccbb6a1d257eccd74fb9111953d9cdd4b44d6f3fb38c3a9f40fa253718f337 SHA512 6d90b21448b2d2a58685592e92647108978012cbaa25999d98855dca222e013784ca4e351eb08efd0a18980cccffb28b0d3c171ea9207e5fb37889e3a3b377e3
 DIST opencpn-5.8.2.tar.gz 87960698 BLAKE2B ecce27972a00af412283923a1720b9d74c80905101f383815e801691ab9dacb7c60328f6cd597811d4538bccf383e66465e08e2094420187272298151327b717 SHA512 c23bb322c2dcfb017347427cf6041d28fc0c1b8101f21d5cafc9b9306a4d265156ded90af09c385086e99a462a26787e7f4bb817ad19efa50624c952ba89c726
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
-EBUILD opencpn-5.6.2-r1.ebuild 1278 BLAKE2B 8c94324fb628d56fbb0e54c9781510e2bb2ee0fab8565c8f2efe2d16b3430530076471d32d909ff48657e7ccc4244e10a0559ef56e81375c0fac89ea0d6e841c SHA512 02ffc6cf58074d7dbdfc24caf4499071ef079fa37eeb1d304be10d23f4e0809733015f76f269512a72df79095eab5005ab4b2802bdc1db6ae29050c2dda27483
-EBUILD opencpn-5.8.2.ebuild 1300 BLAKE2B 2d23de08971302b83921eb351c0ce5e679800509ad3499ef583c63c317807c3444b36909e737b375d3af70cdcf89f898f001a96a76c7ca3c83b3341285cf0c76 SHA512 783eac9d8904baf30d541306bc8c94c45d3470afa16305757b712675b682e46bd4a3783a5895dd2243a10e56c445be4907a00913b58f3616750e4b5dba0584f2
+EBUILD opencpn-5.6.2-r2.ebuild 1279 BLAKE2B 2cf87c8ad1088bb674d3a8d93e0d3d1ca60051b5f07dff25b2feaae1faa0cfe4c5a7223387b7377b4cb5078e3eda84c5be19677cf3ef295cebd4c5718730083e SHA512 ad7b97e7d54eca2b33990fa602ed75ed4cb45d3c3c89a58713c13b8f22d6fa1ed958af37eba6a591338ca6c4832e01c7949b587a87b8638652b3e8076f850d39
+EBUILD opencpn-5.8.2-r1.ebuild 1355 BLAKE2B cd6dac293edf3c4197351db8611b3d90e765ca630ab99273486770d6e5b6dcb8df3b7a081e3496b87a42755fb55b69ae6a3e11b29d695060c17cbbbb2c26827b SHA512 15e840c6f0b769328dbbbf4ec5bf36631bc43f2499e4f3d8873373cfd842eddb6c90ce6006ece57329c5ec5a977f73db4e678904bf7ac9adb82be2bd585d5498
 MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72
diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r1.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
index 5fe2fd8b60ba..53ecdb5e91ac 100644
--- a/sci-geosciences/opencpn/opencpn-5.6.2-r1.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib
 	opengl? ( virtual/opengl )
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sci-geosciences/opencpn/opencpn-5.8.2.ebuild b/sci-geosciences/opencpn/opencpn-5.8.2-r1.ebuild
index 0f5f7e400c1e..029224a474a9 100644
--- a/sci-geosciences/opencpn/opencpn-5.8.2.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.8.2-r1.ebuild
@@ -22,21 +22,24 @@ IUSE="doc lzma opengl"
 
 RDEPEND="
 	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
 	dev-libs/tinyxml
+	lzma? ( app-arch/xz-utils )
 	media-libs/freetype:2
+	media-libs/glew:0
 	media-libs/jasper
 	media-libs/portaudio
 	net-misc/curl
-	sys-libs/zlib
 	opengl? ( virtual/opengl )
+	sys-libs/zlib
 	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X]
+	x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X]
 	"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/gettext
+	dev-cpp/gtest
+	dev-libs/rapidjson
 	sys-apps/lsb-release
+	sys-devel/gettext
 	"
 
 src_configure() {