From caf75e073ac1a28e42e725ad3d302115d45e4e36 Mon Sep 17 00:00:00 2001
From: Jason Stubbs <jstubbs@gentoo.org>
Date: Thu, 8 Sep 2005 23:57:44 +0000
Subject: [PATCH] Fixing parameters to tar Package-Manager: portage-2.0.52-r1

---
 sys-apps/portage/Manifest                     | 11 +++---
 sys-apps/portage/files/2.0.52-fixes.patch     | 37 +++++++++++++++++++
 ...ortage-2.0.52 => digest-portage-2.0.52-r1} |  0
 ...2.0.52.ebuild => portage-2.0.52-r1.ebuild} |  3 +-
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 sys-apps/portage/files/2.0.52-fixes.patch
 rename sys-apps/portage/files/{digest-portage-2.0.52 => digest-portage-2.0.52-r1} (100%)
 rename sys-apps/portage/{portage-2.0.52.ebuild => portage-2.0.52-r1.ebuild} (97%)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9a001bef3dcb..608332df5687 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,19 +5,20 @@ MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
 MD5 8acf56587de4c66daf1cfed2cc8be000 portage-2.0.51.19.ebuild 13221
 MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r2.ebuild 5708
 MD5 7c109f64a1b96c1134ac490d0233fa3b portage-2.1.0_alpha20050718.ebuild 2566
-MD5 47e348ad87ace8881e8af2166825e2f3 portage-2.0.52.ebuild 3593
 MD5 fc0f2ec6f18f9744037a47705057b9d1 ChangeLog 1108
+MD5 d84a1f0f9b6dad85ff874923647de011 portage-2.0.52-r1.ebuild 3640
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 MD5 f29e1e5ab80c7078b004e60002173ccb files/2.0.51.22-fixes.patch 9339
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r2 70
 MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
-MD5 635a143e3d0587687c2f43209de5c53e files/digest-portage-2.0.52 67
+MD5 7e8e000ab445e5860a8dae291ea2dfe7 files/2.0.52-fixes.patch 1420
+MD5 635a143e3d0587687c2f43209de5c53e files/digest-portage-2.0.52-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIF0WxvWNPsk/ZP4RAinfAJ9gIgZC1cDL1xZjeZ9Ak5LnRkKzLwCdEikS
-tvf8BH9y+JPjoyfUQdZeDDc=
-=6D3P
+iD8DBQFDINAPxvWNPsk/ZP4RAs1jAJ0VgkrUNI45hm9mTpYsKPtODA2/cQCgjh/F
+5AeM8aOXvScHqy2FxH0phHo=
+=MAKm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.0.52-fixes.patch b/sys-apps/portage/files/2.0.52-fixes.patch
new file mode 100644
index 000000000000..70e519e09a62
--- /dev/null
+++ b/sys-apps/portage/files/2.0.52-fixes.patch
@@ -0,0 +1,37 @@
+diff -uNr portage-2.0.52/bin/ebuild.sh portage-2.0.52-r1/bin/ebuild.sh
+--- portage-2.0.52/bin/ebuild.sh	2005-09-08 20:39:50.000000000 +0900
++++ portage-2.0.52-r1/bin/ebuild.sh	2005-09-09 08:46:44.452389888 +0900
+@@ -365,10 +365,10 @@
+ 		myfail="failure unpacking ${x}"
+ 		case "${x##*.}" in
+ 			tar)
+-				tar ${tarvars} xf "${srcdir}${x}" || die "$myfail"
++				tar ${tarvars} -xf "${srcdir}${x}" || die "$myfail"
+ 				;;
+ 			tgz)
+-				tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail"
++				tar ${tarvars} -xzf "${srcdir}${x}" || die "$myfail"
+ 				;;
+ 			tbz2)
+ 				bzip2 -dc "${srcdir}${x}" | tar xf - ${tarvars}
+@@ -379,7 +379,7 @@
+ 				;;
+ 			gz|Z|z)
+ 				if [ "${y}" == "tar" ]; then
+-					tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail"
++					tar ${tarvars} -xzf "${srcdir}${x}" || die "$myfail"
+ 				else
+ 					gzip -dc "${srcdir}${x}" > ${x%.*} || die "$myfail"
+ 				fi
+diff -uNr portage-2.0.52/pym/portage.py portage-2.0.52-r1/pym/portage.py
+--- portage-2.0.52/pym/portage.py	2005-09-09 00:21:09.080009560 +0900
++++ portage-2.0.52-r1/pym/portage.py	2005-09-09 08:47:34.006856464 +0900
+@@ -4,7 +4,7 @@
+ # $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $
+ 
+ 
+-VERSION="2.0.52"
++VERSION="2.0.52-r1"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
diff --git a/sys-apps/portage/files/digest-portage-2.0.52 b/sys-apps/portage/files/digest-portage-2.0.52-r1
similarity index 100%
rename from sys-apps/portage/files/digest-portage-2.0.52
rename to sys-apps/portage/files/digest-portage-2.0.52-r1
diff --git a/sys-apps/portage/portage-2.0.52.ebuild b/sys-apps/portage/portage-2.0.52-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.0.52.ebuild
rename to sys-apps/portage/portage-2.0.52-r1.ebuild
index 8f6330f384de..de1952cc9db0 100644
--- a/sys-apps/portage/portage-2.0.52.ebuild
+++ b/sys-apps/portage/portage-2.0.52-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.52.ebuild,v 1.1 2005/09/08 15:47:01 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.52-r1.ebuild,v 1.1 2005/09/08 23:57:44 jstubbs Exp $
 
 inherit toolchain-funcs
 
@@ -22,6 +22,7 @@ S=${WORKDIR}/${PN}-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	patch -p1 < ${FILESDIR}/2.0.52-fixes.patch
 }
 
 src_compile() {
-- 
2.26.2