gentoo auto-resync : 06:02:2024 - 05:42:43

8 files changed, 29 insertions, 113 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 98d322246434..f801032576bf 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 8ce6f4f634a7..65fb2f16f368 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,6 +1,7 @@
 AUX shared-mime-info-2.3-clang-string-literal.patch 1319 BLAKE2B b929683d915ff7635458aa1bbb8e0e6c2a738e2dab4d670096597f1b847317a277375cb1cfd9b6efa9af4e62c8432568d9469feecc51c26872be2a29356603e8 SHA512 70369c51b83c3dece1969918aa894cfe6708b7bef21cacf7468ed2bd353dc9b61163548ec9ede161d118095180ce0d831124347a373bfa4853ceb8566dc5a18c
 AUX shared-mime-info-2.3-fsync-detection.patch 2022 BLAKE2B 52eda0b6ef9dbba0bafd98860a017952c88243dad8379b6fb619d64ff65108cf906d0d11e548c70ff0c1bb51972a50d833896721d092884a710b8b03a31b0428 SHA512 dc5efa6af36059d8353c6c24ab60da7d6a91e6ea5463fb61bdb91a5853841775c37854447fa433289a2b9dac7384cfcd10894fa9329b131df847fe896616bab8
 AUX shared-mime-info-2.3-wformat.patch 9794 BLAKE2B 525e64c3f4327c50a7d4b7439f058898bc80a58e2561d82029c6c060c88c7701fa4e60aa0d6b9beaf51c87d1dab50f3a911c5e35537119d3b3e90742242ed0d7 SHA512 deac4f195f78f99dfa257d8e647197e7e4b2d599f14f2b4a68e34286bdf133e870fe0426a3180f6f30d05b68c978e2150497d97c179ce263a1ce4c2a092935d2
+AUX shared-mime-info-2.4-libxml2.12.patch 596 BLAKE2B fd296b8197160888ea48785a0a9a4de97196ed0e063865a4c07c5fbce01663e06ccf18bf23a016de2dc9371f0b8fd8effe625793fa0385aeeb94e7d5af82fdbc SHA512 64acdafd475914cf541ca0ec09e65c6abe346c6a80423a881a000567b2614334ecd32807cad0e7897af2e3edfdf40bc1fdc846459df231ecaacef8364f95040a
 DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e
 DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762
 DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb
@@ -8,5 +9,5 @@ DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea10
 DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8
 EBUILD shared-mime-info-2.2.ebuild 2590 BLAKE2B 53f29bbfbe47f5304f75cfd3b48b111eb95c58c02a10ee6683c678be82f89ca713242d5863f46988020e93587b060a6acdec11ff44699eb4a1df95b86b42adb2 SHA512 f47451d4bf4adb1cb5c07f4c46cdb89cc9d429f112207a8b7dc322f7631eb46957eecd79c7fe1ab49f877afffd9d558a412d6dbf220f06da8a99c9d95cd80e0c
 EBUILD shared-mime-info-2.3-r1.ebuild 2816 BLAKE2B 4af2e85d620e9b9c8ad47d29067b3ba13b14b144892567fcfa6f64d132006a4fe0f3b2a7d8864fc2d6fd3e92d5f9a5e6f69c036ae573ece37b924172804cd552 SHA512 ef79fe6edecb78b7a92449ad1e5a33cc42e7318235d66826bb1d9c7ac04e9830e290ab02914de5ad4dc1a90664581e649c82c8d193299dadfcb51050fd24d3af
-EBUILD shared-mime-info-2.4.ebuild 2680 BLAKE2B 5a94b911ae679aca8c7d9ead5c8a43347406fb94d0902c62912189d3241b7e726779fb15ce5634f7b5885040f9c582fe746f99b909426e1645663b52b3533694 SHA512 ea339bc3fac97c73fc5099ac99df6a0148366d2fe9b50c309d735c2a92ad976a6401f4a0daf249fc27727e8e66f4245b6615e1ef4c48b1b946b05a7bbc3409eb
+EBUILD shared-mime-info-2.4-r1.ebuild 2730 BLAKE2B 32da67b3a9fd4b3ca1046e97a00c5621e0ed9c59383048633e5c5da3ad9bca93076e5fec4e390dd63437ba0e6f32c5d67b20f688cad16fe5d5898754e9cfb60a SHA512 eb514653b56f29045a02953f2b9624a87c29f83d07fac66e6e803365291ae545fc8ccad85f0807eb9cf19a92c1093ff51013d1819dd39c0ffff9ded70ae2cd1e
 MISC metadata.xml 326 BLAKE2B f1dab1cfd169c5cb1be051aafeff74601494801bf89257f2727ebfc7999392bfc4dbb94af165a52f045ea4b7d9b178ae8f658123f4d9ec22aae50f9e4470845e SHA512 0c0d4f09ec5bcbbc9bb592c4676761524ce38094d62a2da3dfb1618e9ef933a599770e78fe5a94e0f9c5b7b295742fb39c2484cd07f641fd041aa68fe41b38c8
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch
new file mode 100644
index 000000000000..22d2349053f5
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/917561
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573
+
+From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 19 Nov 2023 11:18:11 +0100
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes #219
+--- a/src/test-subclassing.c
++++ b/src/test-subclassing.c
+@@ -1,4 +1,5 @@
+ #include <libxml/tree.h>
++#include <libxml/parser.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
+-- 
+GitLab
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
index 82a520646c8e..75a1866ef66f 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.4.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( HACKING.md NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libxml2.12.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 621a3f8c4459..79a40bced67d 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,10 +1,7 @@
-AUX xdg-utils-1.2.0-xdg-icon-resource-syntax.patch 732 BLAKE2B 6d5a01f4eaf6557b12d374b2c8ab8906dcd3e501a64a6cedf06cae5141e2950ef1d8411c14a77ab782f29acf0c79c2884fc20a70d16721d3df740086b0d71dd9 SHA512 45026fac076f77264b92425313c64aded0145449de89cf97d5b253dc6bdfe0b2caabcaa5330be679ad68ca490cdaf324c63653ebfa17b591865e46e801397cd9
 AUX xdg-utils-egrep.patch 760 BLAKE2B 641a75615aa54000acee26ad65e802245c12db388f372b1f7cfe4df29c025a8eb5e4523ef89a6e209e00c7ec0288c799f16a5d4ac04fa25da3375d2d128b1de2 SHA512 80976c70974c670432a48ab467ca68126f699816914b806a65f48b234c631cc470b7399b389a15a6181a0fbbf486692d0583f791c0592bdc70186df319075ac6
 DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
-DIST xdg-utils-1.2.0_beta1_p20231203.tar.bz2 291213 BLAKE2B 65004e451f002175a1dd5c142f9be312e66b16917ea61e3e8a907c92c99aa7e8a0111951ef075830ac2b2a09e809778a91770c6021edd82174ff4eef2a72fca1 SHA512 a19750fa9b18dbad434134e7b336c622419a9e272d310e10cd711fca592ecd5b6ee4fe648222108ada463c18c103310d92b4ca209057ee0372414e9041f489de
-DIST xdg-utils-v1.2.0.tar.bz2 293400 BLAKE2B 896678febecbb8dff8d272d0901b28692406fa11d97ab0c43c45d2097f18d95a38c44f4eacd7ce2b9e14bb52835009755d50232904958b57d260e8f9d84ce020 SHA512 6562d728c0eac50a650ed5917eab83259f340691d7e7b94e4a6c58f3068fd1b62cfabc38efd3e39a246001c689d2cb2f001cef93af8281e868a20a49282daf91
+DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc
 EBUILD xdg-utils-1.1.3_p20210805-r1.ebuild 2411 BLAKE2B d865d9ef3b77bca4f346ac0bfd7e331160dff65fee28a20f4316c27063be4e108b36d0d889f9539a3ae387ab34c006ec3688f6ad55119535cf9a10743addf78d SHA512 31e1afb2b8a199a38a56a5ffe3252146e0be6c539f86292578a58abcbb568183ac4b1ada97cf1128e6d039fe324cbd2a040b5793fbb80fec28c674caa41effba
-EBUILD xdg-utils-1.2.0.ebuild 2349 BLAKE2B 539417e25e04322c0581c22eef277637048f4e508159b7ba886ebc497e6cece3560f47bffbffc16774384fce252121c330ba2196f12f458ae501f9daa3a65d8e SHA512 d370ae41d2d88fd3c8ef2be25db5b12ba72968e77a0139a98a1ff927b4abc7ba5b2609d95f64d2d3487f39a023f6f0d19cc502c8014ff8109909b5657c9b3403
-EBUILD xdg-utils-1.2.0_beta1_p20231203.ebuild 2121 BLAKE2B fb9902cdff93f1f8443f7e0af7a2807b2c1c601682edb3e170a1496e3f5eb348251bb82b4d579d4cc09808c7fe30ecdc29f1be1d62d496ad25ddad4437da4886 SHA512 8ddf04e6c960dccb65d725bda6f17f525d32ce1d853a5f12ac611b322ff32555e35c90fa8caed56934646c1fbf6ce6f52bb8a96a37e639ed01f6813db5613801
+EBUILD xdg-utils-1.2.1.ebuild 2285 BLAKE2B 77bc90cac8382c24fbe1c20d21124ca8acbdc20185bcd4f44041a48326904912e78c310d87f6d4a2d0657876f4280caf8413fe40fe491e5b98f5c85e7ce8cbc2 SHA512 763c67b57d6b18e79410f53ca63754606c573e26c1cd84e21f3f3169a4a4662f77d332860ea583c5d363e4889f8e5892da934b7d7ba66918d9767738a2703ffa
 MISC metadata.xml 319 BLAKE2B 4910953400fa3f3b0b72b8baba239a1e0c3466c38f84b6a60bc816620b789473179c151b1af68d0629ba7f79a1ea826b536f0f29678007bba025714ceb514061 SHA512 c07b03f20aeedd0ceaf7de137b76578142c703317d98ac7a57ae5143cab7523974a50aafa58e92c541d4a84ec0961b7de180d11d95c7da45f5698e3c19e7182d
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
deleted file mode 100644
index 272daad9073e..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9
-
-From af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 30 Jan 2024 11:24:41 +0100
-Subject: [PATCH] xdg-icon-resource: unbreak syntax by removing stray grave
- accent
-
---- a/scripts/xdg-icon-resource.in
-+++ b/scripts/xdg-icon-resource.in
-@@ -306,7 +306,7 @@ fi
- need_kde_icon_path()
- {
-   local path
--  path="$(xdg_realpath "$1")" 2> /dev/null` # Normalize path
-+  path="$(xdg_realpath "$1")" 2> /dev/null # Normalize path
-   DEBUG 2 "need_kde_icon_path $path"
-   if [ -z "$path" ] ; then
-      DEBUG 2 "need_kde_icon_path RETURN 1 (not needed, no xdg icon dir)"
--- 
-GitLab
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild
deleted file mode 100644
index 2e2d0e72ceea..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *_p* ]] ; then
-		# If you choose to do git snapshot instead of patchset, you need to remember
-		# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-		# all the files
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	dodoc RELEASE_NOTES
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1.ebuild
index 0332fe3c66b7..110d275dac9b 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1.ebuild
@@ -45,10 +45,6 @@ BDEPEND="
 # that block forever
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-xdg-icon-resource-syntax.patch
-)
-
 src_prepare() {
 	default