gentoo auto-resync : 21:06:2024 - 00:11:18

11 files changed, 45 insertions, 69 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 583c9589c64d..78e2514f0c66 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 55e081c7bd45..9377b47bd2ac 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -3,6 +3,6 @@ DIST man-pages-6.06.tar.sign 833 BLAKE2B 7198f7a024731fcaeb97c131ff02611cefc60cf
 DIST man-pages-6.06.tar.xz 2166012 BLAKE2B 49c022204f8ce82fafd6f34a590a310beb6618d884290123a755efd38a71c974aa2e49d729655fcf82df0b96db8f782c1b2eac5174b319b6a383740e715fa11a SHA512 c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-6.05.01.ebuild 3585 BLAKE2B d0fadcaf3f096029d388447a0cb9f0f281786fada32a79a2f6cfa400226f653cdeceec92fdafc56a13f8fcfc7b788f2ccb124ff6763d0082c8cf9d0b738bb763 SHA512 d4f0ada88c0aefc8a753300f930170ea1d3faad28d24bec4df9fffae8c285974360f00a6ded62bd6b301af1881a15f5ac732267304473dba95edc973942f2ad7
-EBUILD man-pages-6.06.ebuild 4441 BLAKE2B cf2d091f3b0354bbcfd969a7882cc6b0484016699d51ee5bb41f76179ad5782744ff25f86a7848cd56234db0aac566e05189d4833fe360f3ef9c6c80c1ddf34f SHA512 d76e9e4ca1309b0c0cb48738e18e44a31b87a8818894a0f0dc2ad2711300e05b4880568a20fc659264bfdc84eeea7bd2cc731043d3af12884c51555c5a3daa5f
-EBUILD man-pages-9999.ebuild 4449 BLAKE2B a0753ea92b599e432710e8c9cfe291fd23370426a7c64e15e9bfa29e3749d3eb0ff4a57c9f0d4120462e0b18d98ef990cd59d4deb8bbf9326e95a896a237f711 SHA512 c409a7c58bfbbf15d2e76d330e1b9ccfd42712516dc07aa61a27b5968a39edb793124ed8f904055a9423ac41a3519ad067665455d79dc273a7b9767ac27d2de7
+EBUILD man-pages-6.06.ebuild 4309 BLAKE2B 59d3dfb555d1209d4a72196c6e681ba407ad0c7ff6be688941cee55081df7a8c2dd157ee5acb3708f809993f3b35982c91880ec255a8f134743fba5c80cd0d6c SHA512 c32b9bdd8e29b36b7e88f544c87d162e8a3b8fcde676ea125dee9f8b4019db12b95f575ca31ba6298f8feaa7acb05a3f11d5718c64ff1a8db2e8df9ae31ba216
+EBUILD man-pages-9999.ebuild 4317 BLAKE2B 7138f7674f852d47e9ce4ca2e83831d9f710a412f1e01e36375408801801ec9cb645c721f5d48751e0658e5ddb81d3d9d3422263053d5c486826d0ae2b1a5db1 SHA512 bc53d544478ce474106362dac22994665f9ff901bb0b2a4e6a6b5516a38778d1214f09ce8fa054a86813e917d2fc1d70069be01b19b1c87753601039795cbbde
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.06.ebuild b/sys-apps/man-pages/man-pages-6.06.ebuild
index 1f1a2609c79c..c0cd7d383769 100644
--- a/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sys-apps/man-pages/man-pages-6.06.ebuild
@@ -95,21 +95,16 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && 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}"/${P}.tar.xz . || die
-		xz -d ${P}.tar.xz || die
-		verify-sig_verify_detached ${P}.tar "${DISTDIR}"/${P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
+		einfo "Unpacking ${P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
 
-	default
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	else
+		default
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index 04246b807452..224074d21d27 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -95,21 +95,16 @@ src_unpack() {
 	fi
 
 	if [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && 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}"/${P}.tar.xz . || die
-		xz -d ${P}.tar.xz || die
-		verify-sig_verify_detached ${P}.tar "${DISTDIR}"/${P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
+		einfo "Unpacking ${P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
 
-	default
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	else
+		default
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index faecfeea7349..e582ed9f8936 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,6 +4,6 @@ DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae
 DIST pciutils-3.12.0.tar.gz 668358 BLAKE2B 6d57b0654a26e959d2a953a102fd616ba0a0a183ec6d40f65a1274ad33330df9c81b95d4b2274edc240cbcf576ce93a0b61252bae0b6348a29df659b3fc219eb SHA512 b1efd3e24efad4f80e1a942d23d6ea12acec9642714e47d24bff7f7c53ff475b0252c6f75c0053b7ec64635037e72b150b3e313229b36479dc0cbf96902096c5
 DIST pciutils-3.13.0.tar.gz 672999 BLAKE2B d779ca0fd8c96a54bf81f6234d6a38eae2882d39dd1a52a508246bc46b5f4ac9318bbca20266378ec3917e72fe6ec30c47b1b5e9df4e86d3f59cbe860e2ac70e SHA512 73f99b5c2251676368738e0dc9d82529f3516966f1658a96149768b9775a0e177d630512dc7ea33087a7fcb960a3498f0c4c1a9f7233ec1cf242b9ab087fa0d1
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
-EBUILD pciutils-3.12.0.ebuild 4906 BLAKE2B 7f34d5ff16c89d7fe6112c252b0db3d6afa919d037d82709ef8fc1e4decd17e1c813653baa873dc3d195bf543ae2198ccf8229b5c3143c7c846cda26ae00682e SHA512 ea32c95dbffc4fe0d5a0e04a482355b5e59ba78f2c0ee3a190e99b7d384fed6673433b6b7cd05bbba370b54ada69d3fd0051b8bd924da3a781fa1669ce96777a
+EBUILD pciutils-3.12.0.ebuild 4905 BLAKE2B cad6c1d863f7abd2bb357da7e4ff70aae73793dbd7cebad082ff15c098b77a74ad8cd323471e76ced701fe572f3114f3d37849f98c7e2897d462ceedf0f1e437 SHA512 9c7e8c45acaa4d03c86092e79b369c0d94f818c68a975c46db017246e9161cc89f94c461390ab0b61abdbd4334cc0dc16b40683cb68e197483cc141a825bacd1
 EBUILD pciutils-3.13.0.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.12.0.ebuild b/sys-apps/pciutils/pciutils-3.12.0.ebuild
index 57b9f333b119..612e1edd227f 100644
--- a/sys-apps/pciutils/pciutils-3.12.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8fa44c2328d0..4774957439ac 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -15,6 +15,6 @@ DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270
 DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
 EBUILD systemd-utils-254.10-r1.ebuild 13355 BLAKE2B 9e88dd7b2bc7c280aa4430d9e4ec9bea942b365408c775d0e5a53ae9d6b1eee3f79bada47ac83f3f3b4bd0fa5245b3158fc48e4b5003ba15bb7c3eb9179c9bc2 SHA512 86199fe50859269f739b37d2fa6d345b17ad90edd0aefd203f3beafdfd36c79affb16a61546da919e984836fcaded2831bd406f7123b0a84ee50ef65ac4d8b5c
 EBUILD systemd-utils-254.12.ebuild 13363 BLAKE2B 21cc042bc1041556b71f12c160a8fd5b23f31a9598d6a85b13b77ccd01b5b0e34350bde236f151662873734003fe2fd5a001c746370c16fb8308fb51e283d843 SHA512 9660bcde5c1a06aa03dd7bc90aad59421eeea53757ed1edc2d674c1cddc0addf6b7670520426bd569c5f3e309f66ab641362c260c1fbdfdd20fb10198032677a
-EBUILD systemd-utils-254.13.ebuild 13356 BLAKE2B b4892ba9c9ab31ded67652533fabf4f36d5b76377ea14e5d145795bb45cbdcf300660f1a54abe61a050a3287c08309e8fadfcf5f4d17b0c4bc7640b5382499ba SHA512 c8d72fe488c33f75f3e9ff11fc885befed66b61f3dea70c1e367b91a037536bc7d4668983644048c1099e07ee0977203a8ea6908b89dbd27371f5b1e4ce1bbd1
+EBUILD systemd-utils-254.13.ebuild 13355 BLAKE2B 9e88dd7b2bc7c280aa4430d9e4ec9bea942b365408c775d0e5a53ae9d6b1eee3f79bada47ac83f3f3b4bd0fa5245b3158fc48e4b5003ba15bb7c3eb9179c9bc2 SHA512 86199fe50859269f739b37d2fa6d345b17ad90edd0aefd203f3beafdfd36c79affb16a61546da919e984836fcaded2831bd406f7123b0a84ee50ef65ac4d8b5c
 EBUILD systemd-utils-255.7-r4.ebuild 14239 BLAKE2B 9eb4a58556fb3bbeb3e53dfb375c3b757d0e0b206261eead1e74fea79d9e58707d80bafbe5d34443df3233e10bd26b8c2cff26a7cab26fcbd474eb7717fff334 SHA512 3662b02df1eb89d642087d017c99a8784894ad60f021797f26609dc3eeed0fe7989eaef006b9b65bf139a3a9f452be10005da2cb9ee6a967a199b5dc685e50bc
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 3f52033ed095..af3b023e8eb8 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
 REQUIRED_USE="
 	|| ( kernel-install tmpfiles sysusers udev )
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() {