gentoo auto-resync : 15:02:2025 - 00:13:02HEADnextmaster

3 files changed, 5 insertions, 67 deletions

diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index af7402ee3488..21331269698c 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,13 +1,9 @@
-DIST josm-bin-19253.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
-DIST josm-bin-19253.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
-DIST josm-bin-19265.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
-DIST josm-bin-19265.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-bin-19277.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
 DIST josm-bin-19277.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
-DIST josm-snapshot-19253.jar 18361067 BLAKE2B b2765e33c73e7ed3b9bbc72ba52ed6df142a81f9ee31ecf1b20e8dbe79cf61e18fab80c15dbbeaf9b29c06d1f04c0f362a157ef3a0993a1baa7a1eadca00b6b8 SHA512 36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7
-DIST josm-snapshot-19265.jar 18383098 BLAKE2B 986ac6b09a1ac042da5ec922914da7cc6a752b3c2bde8281fe24fdc395534d4bedd4b166e7f0b616ad233f03d2926cbe071f06a2440bc6812ccb13cf3783288a SHA512 6c13b9ab7849265df153af0c2cf0b00ec0f73cacb15b16c0d7e4e5fb3e73e15b15b769f279ee51f89539c7c479060a8676892d6cf869ddbb0158bd57c3dbf7ee
+DIST josm-bin-19307.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
+DIST josm-bin-19307.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-snapshot-19277.jar 18592729 BLAKE2B 37171bb80822168b923b0b0e6564a71a243bc7ac5397fd3f9c748b9658480d6a6f59bfa899c01fdc132ab10ce175732d256bf8f2ca5f505343821d5cabe62695 SHA512 c95817edb1694fc0a35bf69cfb2efc6eabea8ba97d0c86b9da258b6eb5fd1d22dad1bfc371f6a0fa3189765db48353d0d72ca9185b8943ddc455d73e889a2719
-EBUILD josm-bin-19253.ebuild 1969 BLAKE2B baad638518fde94eb87a85f57df5be474bcf12c4784f3eed00b91e72d258b93c895052a3bbd07ba8c47a1709c03fb7f9b7dbc4f6179a398ed9052c40d2a72998 SHA512 a96c3ffb5990ca7d0ae735ea8390760e23bff382d4fd764b335fe88978cfebfa24e86755689e6c3ed0690010b7ba2139a7f4eb76ab99fd2f6e848194c3d41998
-EBUILD josm-bin-19265.ebuild 1970 BLAKE2B f307d08bde4ac65c784720d8d5032180d258b004b16615f74e560dae709bbd0d18195ff27f9d9593fb512c94e770545b01497ee531d150deed694d19d721731e SHA512 2ab7f1d2d07ce04b7230c4e7414da8e5793de3dff58e12650c0057739aba647acdaf030b1280654fa5645b6b027bb542f0c16cd00ea9df145562db9719fa79f7
+DIST josm-snapshot-19307.jar 18720348 BLAKE2B 163bf92d62ac68e227645d31b185131e3a6b3ff4a2f1008dcb92064b0a8404fb2cd15685e0df8414d1a56e25f80e73b133b2ee07a7301feeb1a5ed56d511bbe8 SHA512 15f582eb19d1af3e969e17333cdfe933cdb4011954909fe5a6f36f96d90d83cc61a7fd8200a9dc2d36f1f12df32ed1581d0a64fef9f37a21cf54286b5d8b0bde
 EBUILD josm-bin-19277.ebuild 1969 BLAKE2B e77958b09896d5af11def7dbf7655857a0de3e0793b3206bd8a477eec421cddd26eeef203d7233ef4ed6a810760b439d935a175d679a3448942d56c3c5f05dbd SHA512 acd4d5fc7689039cf7075ed0b3eebbba4d03e66e2cfd093e0f0be8cb978a9bdc37223e96c39b00c2fe8ffa7623be21b1f4cbcb5c5d3dff727446aa62ef1a11f4
+EBUILD josm-bin-19307.ebuild 1970 BLAKE2B 94ba9f7df00db5943e7a04ee28ea3aeab2e89ba12dcc8843affef89db4c43dfd13605653bd58c06da3f511964b488f676f41704ebd0020269264cef62799a53c SHA512 fb9b975bea737fe86ce098722b5995b736d9f31ed07f34e81f2354f5ddecb4e4d58d76e656971070ed9c2541c405136928059204ae171ee5ba194083eae19965
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19253.ebuild b/sci-geosciences/josm-bin/josm-bin-19253.ebuild
deleted file mode 100644
index 9d9039a4a7d7..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19253.ebuild
+++ /dev/null
@@ -1,58 +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
-	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-19265.ebuild b/sci-geosciences/josm-bin/josm-bin-19307.ebuild
index eaa3dcd4cde6..eb0c8cfe550b 100644
--- a/sci-geosciences/josm-bin/josm-bin-19265.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-19307.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8