From 864315313b2c2ff39cf253e8ecae980a0c3730f7 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 1 Jul 2024 07:18:20 +0000
Subject: [PATCH] sys-apps/man-pages: Sync with Gentoo

It's from Gentoo commit a5c2c85b0d87270f0087a22d0eb61da3442413bd.
---
 .../sys-apps/man-pages/man-pages-6.06.ebuild  | 19 +++++++------------
 .../sys-apps/man-pages/man-pages-9999.ebuild  | 19 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild
index 1f1a2609c7..c0cd7d3837 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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
+		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"
 
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild
index 04246b8074..224074d21d 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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
+		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"
 
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
+		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {