gentoo auto-resync : 07:11:2024 - 03:03:27

3 files changed, 62 insertions, 39 deletions

diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 61fce9797aec..530ea57bd0ba 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -2,10 +2,12 @@ DIST josm-bin-19207.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b8
 DIST josm-bin-19207.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-bin-19230.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
 DIST josm-bin-19230.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
-DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a
+DIST josm-bin-19253.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
+DIST josm-bin-19253.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af
 DIST josm-snapshot-19230.jar 18351669 BLAKE2B 9df67d0006b21d72bd7d3aec5fa1699d00ff806085311cc57aa678cec20f66bf4627511d58b952c736e144a3b4d0f134f8e39ef1e713802fff0f658bda5cb596 SHA512 964a4f3de4edd3db8323585ad171a4cd2108acd2d9a379ea31a997619e3bdbda48de94fd8bc537c01772baa7cca4454f83e66483bc34869a8f40ebcc121f4767
-EBUILD josm-bin-19160.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
+DIST josm-snapshot-19253.jar 18361067 BLAKE2B b2765e33c73e7ed3b9bbc72ba52ed6df142a81f9ee31ecf1b20e8dbe79cf61e18fab80c15dbbeaf9b29c06d1f04c0f362a157ef3a0993a1baa7a1eadca00b6b8 SHA512 36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7
 EBUILD josm-bin-19207-r2.ebuild 1969 BLAKE2B baad638518fde94eb87a85f57df5be474bcf12c4784f3eed00b91e72d258b93c895052a3bbd07ba8c47a1709c03fb7f9b7dbc4f6179a398ed9052c40d2a72998 SHA512 a96c3ffb5990ca7d0ae735ea8390760e23bff382d4fd764b335fe88978cfebfa24e86755689e6c3ed0690010b7ba2139a7f4eb76ab99fd2f6e848194c3d41998
 EBUILD josm-bin-19230.ebuild 1970 BLAKE2B f307d08bde4ac65c784720d8d5032180d258b004b16615f74e560dae709bbd0d18195ff27f9d9593fb512c94e770545b01497ee531d150deed694d19d721731e SHA512 2ab7f1d2d07ce04b7230c4e7414da8e5793de3dff58e12650c0057739aba647acdaf030b1280654fa5645b6b027bb542f0c16cd00ea9df145562db9719fa79f7
+EBUILD josm-bin-19253.ebuild 1970 BLAKE2B f307d08bde4ac65c784720d8d5032180d258b004b16615f74e560dae709bbd0d18195ff27f9d9593fb512c94e770545b01497ee531d150deed694d19d721731e SHA512 2ab7f1d2d07ce04b7230c4e7414da8e5793de3dff58e12650c0057739aba647acdaf030b1280654fa5645b6b027bb542f0c16cd00ea9df145562db9719fa79f7
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19160.ebuild b/sci-geosciences/josm-bin/josm-bin-19160.ebuild
deleted file mode 100644
index 3c2c192c743d..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19160.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"
-}
diff --git a/sci-geosciences/josm-bin/josm-bin-19253.ebuild b/sci-geosciences/josm-bin/josm-bin-19253.ebuild
new file mode 100644
index 000000000000..eaa3dcd4cde6
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-19253.ebuild
@@ -0,0 +1,58 @@
+# 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
+	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"
+}