gentoo auto-resync : 04:12:2022 - 21:03:51

3 files changed, 42 insertions, 8 deletions

diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 7cdc7e9b9f8b..266ad518d666 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,6 +1,6 @@
+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_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
-EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2075 BLAKE2B 299764eba14b1d6f5406abef797d2c28a6446e1e705b85c45d8b1b240039835c1d569088539cab2f92f1d7bcfcf5f3fdace40809f77b05d28561d443246c2870 SHA512 3422f1cb9ef212fc71a70e8f9f6f11e95b785958a16fd67c95f813e4939522b720cb66971483c09c7b2d86561a5c503208e8b6a3181032ad489af943508ab54c
+EBUILD xdg-utils-1.1.3_p20210805-r1.ebuild 2418 BLAKE2B 478dfc8810ca4eb5867f6864f50c9d341a992519c16b4c253e1d111d3b39888686ec4d986736f5719d2fc99ca6e5398a76aa054514769bb9d108bfe02bce5e29 SHA512 02497ebc89d0c955f3b50c76e5640aa43383ebdcbd0ea0c472b2e2a683e9e908d2869f4a8f860a7ab67fdcf708d00d9a4e191b76a43dfe972db9db33d3a20b0d
 EBUILD xdg-utils-1.1.3_p20210805.ebuild 2310 BLAKE2B f56c24d95bb66e5ee34b2d201a83472bd1ab0f81586e2017afe1e2f72620404b31250038924d6b7266e473a8f85cd66b4529c9cc3a57e3e8010c21b2b10ea99c SHA512 6208c19056110e361a0dbefea246a8caaf38ed502b41558b5dc30787d7035660342039291e14c3e9f93a229623eb15771ac5a6b51cf7423034148a66f9c2819b
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
new file mode 100644
index 000000000000..71608552a08b
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
@@ -0,0 +1,25 @@
+From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
+From: E5ten <ethancsommer@gmail.com>
+Date: Thu, 16 Jan 2020 02:06:09 +0000
+Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
+
+---
+ scripts/xdg-open.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 202f3e3..35b0522 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -72,7 +72,7 @@ get_key()
+ is_file_url_or_path()
+ {
+     if echo "$1" | grep -q '^file://' \
+-            || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
++            || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
+         return 0
+     else
+         return 1
+-- 
+GitLab
+
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
index 1ec5697fd2d0..7aec38025c3e 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools
 
-EGIT_COMMIT="9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197"
+MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
 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/${EGIT_COMMIT}/${P}.tar.bz2"
-S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
+SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
+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"
+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 )"
 
@@ -42,8 +44,15 @@ DOCS=( ChangeLog README RELEASE_NOTES TODO )
 # that block forever
 RESTRICT="test"
 
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
+	# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
+	"${FILESDIR}"/${PN}-egrep.patch
+)
+
 src_prepare() {
 	default
+
 	# 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