Add patch from Fedora to fix tests with gcc4 #88214 by Ryan Hill.

Package-Manager: portage-2.0.51.19

4 files changed, 31 insertions, 8 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index b921a88d06e6..4af8ba3af80f 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tar
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.44 2005/03/27 00:38:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.45 2005/04/07 01:49:24 vapier Exp $
+
+  07 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/tar-1.15.1-gcc4-test.patch, tar-1.15.1.ebuild:
+  Add patch from Fedora to fix tests with gcc4 #88214 by Ryan Hill.
 
   27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> tar-1.15.1.ebuild:
   Stable on ppc.
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 4a20ab60b619..a77ab43e4fc4 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,12 +1,13 @@
-MD5 e3ae7c0cd3dad23afa5880a6264b4bfd tar-1.13.92-r3.ebuild 1628
-MD5 b13bce0c0909b22aaeed118bf989e891 tar-1.15.1.ebuild 1415
+MD5 79d998566bc3f2d831a05e89567740ac ChangeLog 9662
+MD5 b9ff09ea76c683f077e51de0971ca291 tar-1.15.1.ebuild 1458
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 11b849890a22b615ca96740730fedc86 ChangeLog 9487
 MD5 8225082dd117d92a599d4b01e9d2ee74 tar-1.14.ebuild 1344
-MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
+MD5 e3ae7c0cd3dad23afa5880a6264b4bfd tar-1.13.92-r3.ebuild 1628
+MD5 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
 MD5 a1433bcc25f8f63d8ee96bddbf877962 files/1.15.1-flex-arg.patch 519
+MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
 MD5 c94df05539a43d66c055452ef5acfb3b files/tar.1 12154
+MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
 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 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
-MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
+MD5 971970980dc4f15a093acfe810dae560 files/tar-1.15.1-gcc4-test.patch 637
diff --git a/app-arch/tar/files/tar-1.15.1-gcc4-test.patch b/app-arch/tar/files/tar-1.15.1-gcc4-test.patch
new file mode 100644
index 000000000000..576c548ee8d0
--- /dev/null
+++ b/app-arch/tar/files/tar-1.15.1-gcc4-test.patch
@@ -0,0 +1,17 @@
+Taken from fedora to fix tests with gcc4
+
+http://bugs.gentoo.org/show_bug.cgi?id=88214
+
+--- tar-1.15.1/tests/genfile.c
++++ tar-1.15.1/tests/genfile.c
+@@ -60,8 +60,8 @@
+ /* Block buffer for sparse file */
+ char *buffer;
+ 
+-static const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
+-static const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
++const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
++const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ static char doc[] = N_("genfile generates data files for GNU paxutils test suite");
+ 
+ static struct argp_option options[] = {
diff --git a/app-arch/tar/tar-1.15.1.ebuild b/app-arch/tar/tar-1.15.1.ebuild
index e976f16fc90f..eb4098528037 100644
--- a/app-arch/tar/tar-1.15.1.ebuild
+++ b/app-arch/tar/tar-1.15.1.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/app-arch/tar/tar-1.15.1.ebuild,v 1.6 2005/03/27 00:38:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v 1.7 2005/04/07 01:49:24 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-flex-arg.patch
+	epatch "${FILESDIR}"/${P}-gcc4-test.patch
 }
 
 src_compile() {