gentoo auto-resync : 30:01:2024 - 23:49:25

7 files changed, 124 insertions, 10 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f2d7017a2677..9b52dee3d424 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 26899da85b66..e2e5faf05185 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,9 +1,9 @@
 AUX copyq-7.1.0-fix-gpg-2.1-support.patch 20025 BLAKE2B faab876bfd8813afea0ed2f9e822e4604cf1813233af86bd9a49ee54ff0fc121333b9a7e8aa549c9a39751cd9cb4f12b73c7b8bfd714f00715a93a8acc7a553f SHA512 d1022e3141273d1bcd1bf85822e1113cc03503c740e27f38453d1e29c8d5524e8f9dc3be4b41b82db9e5cdb845f66dcf234aac207556ca80275c63e1bda87d66
 AUX copyq-7.1.0-fix-qt-6.6.0-build.patch 1671 BLAKE2B f5e563ff590ee05ae09f37887e2ce6e72000ac13f37ccfcff7a7f9cfece2d83160fa2e8c462087f2eed377601f87bb5bc8469d2ef6734e375e662838b889356c SHA512 773b31a7976358be31a09aed93d2eca12768f8c3a8541b822e833cef409f39eb26819db2fd49ce7e2eec7b8419e0ed60bbe92c25f69de2f15a9a15fd6fa812aa
 AUX copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch 3822 BLAKE2B f95dfe294136907ee0f22d8f9810989928da18642ab674da9725daa029d75adebe4b8c5fd9d71a92298bd46b464ed9b20a6a12c2689f6f96c09742c1fda5d96b SHA512 415a24815233668e51303b3188bde028f0cfcb9483f92ec143a4350d2130f2b4752f704aa5ee27997be1ce44c3dabf2a384a7fb97756367a6be1029a10e04ec0
-AUX copyq-7.1.0-support-plugin-dir-envvar.patch 766 BLAKE2B 6e837fe85d2279b67027ccfd37558cd88fe1ecb8b160c97030d5eadc83b53aebe6ddbdee10da75672fd1ee61cfc7b4641180ec6838dd23e659d432a91e54617d SHA512 b03fa69c770c8517162e0e5462248088c8f4cd8017de53ae0d97a12e2c395b6e11649fb34ba96fea8a536d003921e3cfc463fd878c2c2b71ca72faf3d4d1c67d
+AUX copyq-7.1.0-support-plugin-dir-envvar-r1.patch 782 BLAKE2B 9cb80e575a08dad54c54e8144fa06f45691ed5914d42af07073e3882930a636a0ac1557563d2c559d20f73525374c79d3a2523b6d5f24807b9032f33e3f0b362 SHA512 3d03c47873a3a2940ce5a239d620a46d63bb28a3f0ff0f547af247f74365403b52e1a91b402cbb64921c31bc4d6fff2f7e725b71edd3ea298058ad3a2d514a25
 DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
 DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909
 EBUILD copyq-7.0.0.ebuild 1942 BLAKE2B 04362e75f351d9ffc2477588fbe7ffa89f58d5461b3b9784b0c5c541c21f0f11687c64f7df8ffa4b5e2f9e9a696e4a8e1bbe49e5c0ba87dd8eedd1bbbe2fdb63 SHA512 7b669810c75a9317941690ab9a42462de2e4db7c7db204e0f1cef2a69fe3f5f384267e7cbb8327cdc1214feaecc98c0454da12e17bedc262cfb488e0889868ea
-EBUILD copyq-7.1.0.ebuild 3627 BLAKE2B 5f20de414218f4cd2cc5673528c86b319255c04e626b9ec48d74aa4c526d40520fe24baddd4dddf2a8463ff6c32ae7f4a2898d16a2ca86c03c24d2788c82bc4e SHA512 38ff1ab91ac10b9377f60940ef9fc51aec87a028d310861f49e4901099bdf3dc91473d800cba5f0d75b2564c6529e421339c69691fe8831ecb2b52a77e85d0ee
+EBUILD copyq-7.1.0-r1.ebuild 3630 BLAKE2B 1524647e6231a99ed85be4c954a36092a2318321938617b1a8a4f93de1cf3c3f7bdbca4541d92fb8f6c84cad125b2565105fb53c44a668b4605a4acbd4e75483 SHA512 8d86cfb0d90fb9a9facd2648bfd69786a98a260758724f192e154c1eb02389ec7685a9c8aec77283b20dd196bb724b33951d568d5c2949daadd707cd09516529
 MISC metadata.xml 429 BLAKE2B 22f09cc6c63f32d0d0bcc5dc2cf7fb8d437653e0358ba30aeb3ab79978cafd9ea971fb0f56931744146e5ab7a16401e5f366d31f91ffba52ca6c2c26c1ba5931 SHA512 32f0a4a4c0065463ae826511758b42f7a2c815a6d49657dec47560b9510f21d44fe0d6f397922998fd3ad022e9b4fa88c45babdd9aa3874d8db0cfdbab7813d8
diff --git a/x11-misc/copyq/copyq-7.1.0.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild
index 8d39c5de4835..85ed9029ecee 100644
--- a/x11-misc/copyq/copyq-7.1.0.ebuild
+++ b/x11-misc/copyq/copyq-7.1.0-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
@@ -69,7 +69,7 @@ PATCHES=(
 	"${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch"
 	"${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch"
 	"${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch"
-	"${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar.patch"
+	"${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch"
 )
 
 src_prepare() {
diff --git a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar.patch b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch
index 21c60f87011b..d2d0ec94b659 100644
--- a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar.patch
+++ b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch
@@ -1,6 +1,6 @@
-From 32b45b42f0d9dbdaae077f81d11fff7bd2455492 Mon Sep 17 00:00:00 2001
+From 6d20653b924481048fa017dc40cf9d7360f95a13 Mon Sep 17 00:00:00 2001
 From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 6 Dec 2023 06:16:36 +0200
+Date: Tue, 30 Jan 2024 20:44:18 +0200
 Subject: [PATCH] itemfactory: Add support for setting plugin dir in the
  environment
 
@@ -12,11 +12,11 @@ Signed-off-by: Alfred Wingate <parona@protonmail.com>
  bool findPluginDir(QDir *pluginsDir)
  {
 +    QString pluginDirEnv = qEnvironmentVariable("COPYQ_PLUGIN_DIR");
-+    if ( !pluginDirEnv.isEmpty() )
++    if ( !pluginDirEnv.isEmpty() ) {
 +        pluginsDir->setPath(pluginDirEnv);
-+
-+    if ( pluginsDir->isReadable() )
-+        return true;
++        if ( pluginsDir->isReadable() )
++            return true;
++    }
 +
  #ifdef COPYQ_PLUGIN_PREFIX
      pluginsDir->setPath(COPYQ_PLUGIN_PREFIX);
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index f6caf8e02efb..621a3f8c4459 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,7 +1,10 @@
+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
 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
 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
new file mode 100644
index 000000000000..272daad9073e
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
@@ -0,0 +1,21 @@
+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.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
new file mode 100644
index 000000000000..0332fe3c66b7
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+if [[ ${PV} == *_p* ]] ; then
+	MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
+	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+	S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
+else
+	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}"/${PN}-v${PV}
+fi
+
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xdg-icon-resource-syntax.patch
+)
+
+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."
+}