added a patch from James Couzens that fixes building tar 1.14.90 with newer glibc snapshots

4 files changed, 33 insertions, 9 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 8927cac1569f..b0a7ac874cac 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/tar
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.36 2004/10/16 04:15:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.37 2004/11/03 15:48:16 lv Exp $
+
+  03 Nov 2004; Travis Tilley <lv@gentoo.org> +files/1.14.90-optimize.patch,
+  tar-1.14.90-r1.ebuild:
+  added a patch from James Couzens that fixes building tar 1.14.90 with newer
+  glibc snapshots
 
 *tar-1.14.90-r1 (16 Oct 2004)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 8102c07043ae..0a161bed3dfc 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,17 +1,18 @@
+MD5 f20131d78735cb4de56721422ec29026 ChangeLog 8803
 MD5 d0b3e45115a461b08fc996e4036fa171 tar-1.14.ebuild 1337
-MD5 091a6972853071b4b764eddcdc658398 tar-1.13.92-r3.ebuild 1624
-MD5 26dd5d782b71bf90876b5d01cb16ad82 ChangeLog 8611
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 0ed7fffca1f3e59802efe2ab207ec2e7 tar-1.14.90.ebuild 1781
-MD5 0b21bf71698f5900e776bdbbfa702e8f tar-1.14.90-r1.ebuild 1893
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 091a6972853071b4b764eddcdc658398 tar-1.13.92-r3.ebuild 1624
+MD5 1b6c394114300974aea425c366ea6cd3 tar-1.14.90-r1.ebuild 1935
 MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
-MD5 e05d36a6f2aeb7f6374d04d61872bd53 files/tar-1.13.92-fix-one_file_system.patch 547
 MD5 23ab0e636547af36f83f3d7db78c9776 files/tar.1 12155
+MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594
 MD5 4cdef5c71729b03a10fb5e066b358398 files/1.14.90-tests.patch 879
 MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90 65
 MD5 404c6b2a90334fe682029e5d5771620d files/1.14.90-gnulib.patch 3403
-MD5 8adb291e1142c213ed26260319bef9f4 files/tar-1.13.92-dont-strip-dot_slash.patch 893
 MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
-MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594
+MD5 8adb291e1142c213ed26260319bef9f4 files/tar-1.13.92-dont-strip-dot_slash.patch 893
+MD5 e05d36a6f2aeb7f6374d04d61872bd53 files/tar-1.13.92-fix-one_file_system.patch 547
 MD5 6e38cbcf3c8dddd5c1e3e00d18f0d378 files/1.14.90-scripts.patch 1829
 MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90-r1 65
+MD5 08149db3d06186298b1c60683aa65740 files/1.14.90-optimize.patch 381
diff --git a/app-arch/tar/files/1.14.90-optimize.patch b/app-arch/tar/files/1.14.90-optimize.patch
new file mode 100644
index 000000000000..37e9c1d58c4b
--- /dev/null
+++ b/app-arch/tar/files/1.14.90-optimize.patch
@@ -0,0 +1,17 @@
+01 Nov 2004 jcouzens
+
+This patch fixes the stupid bug in argp-fs-xinl.c
+--- lib/argp-fs-xinl.c.orig 2004-10-29 13:45:06.806318952 +0100
++++ lib/argp-fs-xinl.c      2004-10-29 13:45:26.385342488 +0100
+@@ -22,8 +22,9 @@
+ #endif
+
+ #define ARGP_FS_EI
+-#undef __OPTIMIZE__
+-#define __OPTIMIZE__
++#ifndef __OPTIMIZE__
++#define __OPTIMIZE__ 1
++#endif
+ #include "argp-fmtstream.h"
+
+ #if 0
diff --git a/app-arch/tar/tar-1.14.90-r1.ebuild b/app-arch/tar/tar-1.14.90-r1.ebuild
index 8cbac20fee07..d6447366e36a 100644
--- a/app-arch/tar/tar-1.14.90-r1.ebuild
+++ b/app-arch/tar/tar-1.14.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90-r1.ebuild,v 1.1 2004/10/16 04:15:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90-r1.ebuild,v 1.2 2004/11/03 15:48:16 lv Exp $
 
 inherit flag-o-matic eutils gnuconfig
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-tests.patch #67023
 	epatch ${FILESDIR}/${PV}-gnulib.patch #67038
 	epatch ${FILESDIR}/${PV}-scripts.patch
+	epatch ${FILESDIR}/${PV}-optimize.patch #69395
 	gnuconfig_update
 }