6 files changed, 4 insertions, 41 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ba0fb8537e36..d4852833032e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 05f25f02e3ac..626eda486a49 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,6 +2,6 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf
 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
 DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
 EBUILD grass-8.3.2-r1.ebuild 7085 BLAKE2B b68b36f7a1495d5c61853d102653ff8ae78c54117a8ce4e277b35c31b3f3705a5b34e4e571ee8ad4603baea65d9e2cb190772954fea757802365d3aa7d10783b SHA512 feee69d50bc31a1dabbf350a6db478313d0e69c53bc7a5ba5f9ee9deec8ad3f0826681bf744f1f843a27fd78342cadee49e5b0e625ced5f67cb77ea0280a6b94
-EBUILD grass-8.4.0.ebuild 7108 BLAKE2B 4a4a06b09e27ecfa22c90edcfe7de10f429e117f4c117eea0a8f3313c41f8bbf5cab1047727a9227e6d34bb46e3cab322e48db72806fd3da03829812e891cd76 SHA512 186867e9d072a20d8724903f8e2420d6e2135918dd1a7f4fc26e7e3a1f7fac189267fe1fa80152a28c037daddb34488ce0cdf35624c99efa49736ee905680a97
+EBUILD grass-8.4.0.ebuild 7107 BLAKE2B 2036a2438a6811517ebfb8f57822c7595194914615b64bd663cc35b0b1a8ec031bd2f786dff0a34d70ba4fd4e53f9e0a6cf52f017a6a6217ab5361af5c58a276 SHA512 2fe01605c2f842ad58b7ddb3afc3a175d0a1455e68a89f1afefefd211e80b9641045f45985c3fec39112dc8cc9096ee5afc65e4627c2673913a481be366f94ba
 EBUILD grass-9999.ebuild 7048 BLAKE2B 269ba74ebbe05764255e18f2632fa873d994dd4d0301650bcf582406e6688c007e63dd9f4d8d63e63142445aa9f50de8d853714199a6ccc08e3c3ece6859087c SHA512 ee8bd2435b5d0f382aa9c8a45e6211cda13051b84e373ad0270afe660ec6e00cde492d14a2b0331af56273e04301246c6318f171a5cad76a260ee0d3bfa7975d
 MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
index 9903823c07a3..51d356ba10d0 100644
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ b/sci-geosciences/grass/grass-8.4.0.ebuild
@@ -30,7 +30,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
+		KEYWORDS="amd64 ~ppc ~x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index ce05164150f6..eba0e24c25e2 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -3,6 +3,5 @@ DIST josm-bin-19207.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6
 DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a
 DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af
 EBUILD josm-bin-19160.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
-EBUILD josm-bin-19207-r1.ebuild 1903 BLAKE2B 454672d4de1ee94af243f053939e64f788feed5663060dc8868db48baf291d5d27aef9000a99aa81fa3f802d31b32aa914daab4ba708127aee5844f9881658de SHA512 cce863da7621c83175a8e8ab9f45fd8c34c2fd35d79be5656152f42ed062df0b77b00e43f575ea34290f69348bfeb92ba63697fc45aa40a90154c8abeb99a891
-EBUILD josm-bin-19207.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c
+EBUILD josm-bin-19207-r2.ebuild 1970 BLAKE2B f307d08bde4ac65c784720d8d5032180d258b004b16615f74e560dae709bbd0d18195ff27f9d9593fb512c94e770545b01497ee531d150deed694d19d721731e SHA512 2ab7f1d2d07ce04b7230c4e7414da8e5793de3dff58e12650c0057739aba647acdaf030b1280654fa5645b6b027bb542f0c16cd00ea9df145562db9719fa79f7
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19207-r1.ebuild b/sci-geosciences/josm-bin/josm-bin-19207-r2.ebuild
index e7e8259415b6..eaa3dcd4cde6 100644
--- a/sci-geosciences/josm-bin/josm-bin-19207-r1.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-19207-r2.ebuild
@@ -51,6 +51,7 @@ src_install() {
 		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-19207.ebuild b/sci-geosciences/josm-bin/josm-bin-19207.ebuild
deleted file mode 100644
index 6303fb8bbeed..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19207.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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 \
-		--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 ${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"
-}