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

7 files changed, 87 insertions, 40 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 2a6ef4db3fd8..254be1147f43 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 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"
+}
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index d1bd3838ccc7..207e2e38f761 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -2,10 +2,11 @@ AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064ce
 AUX liblas-1.8.1-CVE-2018-20540-fixup.patch 901 BLAKE2B 81f8a3e8ea076146ad8ec258e37d75c0e3a567b1304d1283dff0151cb0a7318a70816b1dbb1c3c46ed7798be47f8a3fca4add34940150f093549fe55553d1b0f SHA512 919e91732b91e2d9b3de2365291c7679e08dd2f3d5262a2fe026ef9360be2b367bd1f3822f7fc6cead04da58c3f454066bc4776282f66d268e06cddb3be65d4a
 AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
 AUX liblas-1.8.1-boost-1.73.patch 1448 BLAKE2B adddc5aacf2961fbfdcc3a8eb82cf197e861ced0a027672ff1de5c70255e7a27d582143f63e1ed3b6e100838c08667787e01a39f4b74ae9ec17dd31ce50e66a9 SHA512 e4a71a3a229c075b4657e8ccca44682b29545ceafe5e2cfb4cdcf096f1813765219cf784c036964affd14a877ae0da95c96ed83a1ad96669634dbf67468cc237
+AUX liblas-1.8.1-c99.patch 726 BLAKE2B 9b169883d3a90c1f9f26efc0765e9e55527ef886807da59ca684843fe18bffc79112d2e799a084dadcc930f994bf0e94c0fcc13237bb55568f15fdaedb389aa1 SHA512 981d0aaec0bcfbd70b119d080ed4827d1699342b49613a2c80bb83e01d2e94d96b0c96c9655524eeef9dbb22b74cc1df3d206e9db2071f171242148623f9511d
 AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 AUX liblas-1.8.1-gcc11.patch 1332 BLAKE2B 1efbee0111a2368aa3820b1a6fb34b77c1bd1231fe381a892e0e2930089b101114f6b0b756cedc1a9c1858b094955227494ed1246df71b91b18be981065601a2 SHA512 588b65702580a851822f02068b9343d901c5794920f97120617c35cc2b4eb9ed71ee8c34351301a8a78b51bc36794e51414595e3ddfe5077c1371c873c3d99e8
 AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r3.ebuild 1531 BLAKE2B 11b66a7913683dfe28bd0d3d41227a3c2346befaf62cffe7869a5ae0fce0a0f0e4ca115743e67f04e7d7b6898f6f609a156f1c0cca6b28ae9bf4a33babe5483b SHA512 d1ab8a194efde6fdfda283f94116f640d51323f779ba1dc3ce962085226ff359e297c67671a763aa1dca7e8e7f781203fda8573ae4d34f3c87e9f956b9e1e65d
+EBUILD liblas-1.8.1-r4.ebuild 1574 BLAKE2B eacc8e68e425b0710a328323b1e86357543d87b7de0db3b40956a09bcf73b855e6c922affb88c15ac76ac17fbb56b1e2793a1619bfd660565e0b2c99f37cd69b SHA512 9e99391f785d829dd14d067d453a06937d2251c97bba06efe6228f684f834e2731afe553cd8f3876a07f34dbd05e5a78e89fd9438d2618fb03ad1b320adb4f0d
 MISC metadata.xml 452 BLAKE2B c4ac1295f6f729401772e456fec9dfb21e94fac4f7b71c330fedf83bdd015c9e06390c23f0123353c6aea1e9fc0df5a2c59dc38714a2a951101d66d45bbb39aa SHA512 3c541125d703fa55b3ac8b3a339ca4aa72415b8db91dcff228e791ef0cb8a025342ba935ff066e533b10efd0fcf11b4b43dd68669e2cd041210769e4dadd1aae
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch b/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch
new file mode 100644
index 000000000000..71ef666010a2
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/933089
+https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493
+
+From e789d43df4500da0c12d2f6d3ac1d031ed835493 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <ben.boeckel@kitware.com>
+Date: Wed, 31 Oct 2018 11:38:19 -0400
+Subject: [PATCH] las2col: use fflush for FILE*
+
+The `fsync` function operates on file descriptors, not C `FILE`
+pointers. Instead, use `fflush`.
+--- a/apps/las2col.c
++++ b/apps/las2col.c
+@@ -1042,7 +1042,7 @@ int main(int argc, char *argv[])
+         fflush(files_out[i]);
+         if (verbose)
+             printf("close file %d\n", i);
+-        fsync(files_out[i]);
++        fflush(files_out[i]);
+         fclose(files_out[i]);
+     }
+     free(files_out);
+
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r4.ebuild
index 1c896bcd74f1..c55fc20687a9 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r4.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-debug.patch # bug 668778
 	"${FILESDIR}"/${P}-boost-1.73.patch # bug 722878
 	"${FILESDIR}"/${P}-gcc11.patch # bug 789732
+	"${FILESDIR}"/${P}-c99.patch # bug 933089
 )
 
 src_prepare() {