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

4 files changed, 2 insertions, 111 deletions

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