From 62ea91b40c7650011a72ed2443f76b88b06123fe Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 29 Sep 2022 03:21:54 +0100
Subject: gentoo auto-resync : 29:09:2022 - 03:21:54

---
 eclass/Manifest.gz       | Bin 37296 -> 37294 bytes
 eclass/tests/unpacker.sh |   7 ++++++-
 eclass/unpacker.eclass   |   4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 45c6c8ad25d7..78d1e091020f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/tests/unpacker.sh b/eclass/tests/unpacker.sh
index b15953966f65..105f28fd4858 100755
--- a/eclass/tests/unpacker.sh
+++ b/eclass/tests/unpacker.sh
@@ -42,9 +42,14 @@ test_unpack() {
 	eval "${packcmd}"
 	assert "packing ${archive} failed"
 	cd testdir || die
+
+	# create a symlink to flush out compressor issues and resemble distdir more
+	# https://bugs.gentoo.org/873352
+	ln -s "../${archive}" "${archive}" || die
+
 	local out
 	out=$(
-		_unpacker "../${archive}" 2>&1
+		_unpacker "${archive}" 2>&1
 	)
 	ret=$?
 	if [[ ${ret} -eq 0 ]]; then
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 3d23151b636e..6c9bcbdd7a7b 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -523,11 +523,11 @@ _unpacker() {
 	if [[ -z ${arch} ]] ; then
 		# Need to decompress the file into $PWD #408801
 		local _a=${a%.*}
-		${comp} "${a}" > "${_a##*/}"
+		${comp} < "${a}" > "${_a##*/}"
 	elif [[ -z ${comp} ]] ; then
 		${arch} "${a}"
 	else
-		${comp} "${a}" | ${arch} -
+		${comp} < "${a}" | ${arch} -
 	fi
 
 	assert "unpacking ${a} failed (comp=${comp} arch=${arch})"
-- 
cgit v1.2.3