From bed3b604e16fc6075e29f1af8d47507a07035bd3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 21 Jun 2024 00:11:18 +0100
Subject: gentoo auto-resync : 21:06:2024 - 00:11:18

---
 sys-apps/util-linux/Manifest                    |  4 +--
 sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 33 ++++++++++---------------
 sys-apps/util-linux/util-linux-9999.ebuild      | 23 ++++++-----------
 3 files changed, 23 insertions(+), 37 deletions(-)

(limited to 'sys-apps/util-linux')

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 6bea3314d7ae..e9d264def2cf 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -20,6 +20,6 @@ DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923
 EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538
 EBUILD util-linux-2.39.3-r7.ebuild 11231 BLAKE2B c8734054faf407fd1d7b0f077d3f84a7c59cb7698e0b6c810f164d60d186f7efbefc117cbb3bffa701a0d83f8d1d1a42ce2a081031bed9179c5bc43cd9ed9038 SHA512 94d84e7221d67e9a061c34f7cd5eff3da45b4763b813a7071f0d9be93528da38f1d378ef56a85e19948881e8540528d2cfdab7e4bfd1858f0fa09a3f7ca857b8
 EBUILD util-linux-2.39.4-r1.ebuild 11171 BLAKE2B 40e06d4c563271a3e891270007d0a21e1743eab09e5385a21f6dcca02d2c6bf3a7c0620ff569b81a3e9fc48c9ee125f16a10d7baf71cf9ce3700cfc653905f59 SHA512 f0cbc998a7d908960bc0b9f767998280c09c02417d206ed833fb6ebf6bf3265212337ae7b5e6418221f50e14601b55df4a3d9b8cb0ffc02536f4223ccda0d14f
-EBUILD util-linux-2.40.1-r3.ebuild 11388 BLAKE2B c16ff38eb6ad3096318412e8667a3e6b6c9757cada2fde17960d2a1a8322feaf325698c45d43cdf18fe8e89e11273a4f420ef9d2bfc4b02dc4b1d1785cbd9b4f SHA512 225391cd312a2da0befcec59ae39a7772f7c2cfc1e5c762ee1c883e76175656ab65f6b7af8fc8e429e8f99e64c31ac96d8cbdd075cb050369b97d29659db0f14
-EBUILD util-linux-9999.ebuild 11332 BLAKE2B 27901988f579bb0bf9042881de771e19650f2cdd980140e953165ae2ef094b8287c80778a9ba20b9239952ac0de578baaa22da7065a2341aa82630ad0d34a08f SHA512 61b70ca620bec03ca32d049d00568200aaefa1256a931c928e27846315fb250825c4bd8ec9a430c830874b973777461f9b1a125a940ae104961b2ffcb761fb1a
+EBUILD util-linux-2.40.1-r3.ebuild 11242 BLAKE2B 7719aedf804e87e8b78a8d3eadf4ec0aeca94b4a213b34a17059003922f8efa94e0980556159c6c7e119606c1a44c092252473dbdcc3bb891b1201952f5740a5 SHA512 3d081701737757531746ed1528838dba624baf237816a5fa439dd371020e1b301036b42e534da43f05525c4de146f71ae35176a2a6465cec22b229d58ab14f98
+EBUILD util-linux-9999.ebuild 11144 BLAKE2B 6eac7c7bb6c20e7a82be199f67598f17e44b1dfa59b12e4a998db34550ac0bf65f9128cd625ced594cd01178ed416cfc85a7c6c9bd39002375da4d62b02ea69a SHA512 66dfcb2916a4882c781f49b2f7d8b2853fc4b0983bcd58c424f595d3a4f0c6bb23881bb422d3d8c46315ea74da449ee0229c02923cb066f8fdbe865fc72835d3
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index 340527c06ae4..1205062fedfc 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -110,27 +110,20 @@ pkg_pretend() {
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
+        if [[ ${PV} == 9999 ]] ; then
+                git-r3_src_unpack
+                return
+        fi
+
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 90d69b34f877..8e74d1439e60 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -115,22 +115,15 @@ src_unpack() {
 		return
 	fi
 
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {
-- 
cgit v1.2.3