repackage patch since hanno clearly has nfc how to do it

(Portage version: 2.0.51.22-r1)

3 files changed, 267 insertions, 4 deletions

diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.6.25-gcc4.patch b/sys-fs/xfsprogs/files/xfsprogs-2.6.25-gcc4.patch
new file mode 100644
index 000000000000..a7669e3af551
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.6.25-gcc4.patch
@@ -0,0 +1,263 @@
+--- xfs-cmds/xfsprogs/db/agf.c
++++ xfs-cmds/xfsprogs/db/agf.c
+@@ -31,5 +31,4 @@
+ 
+ #include <xfs/libxfs.h>
+-#include "agf.h"
+ #include "command.h"
+ #include "type.h"
+@@ -41,4 +40,5 @@
+ #include "output.h"
+ #include "init.h"
++#include "agf.h"
+ 
+ static int agf_f(int argc, char **argv);
+--- xfs-cmds/xfsprogs/db/agf.h
++++ xfs-cmds/xfsprogs/db/agf.h
+@@ -30,6 +30,4 @@
+  */
+ 
+-struct field;
+-
+ extern const struct field	agf_flds[];
+ extern const struct field	agf_hfld[];
+--- xfs-cmds/xfsprogs/db/agfl.c
++++ xfs-cmds/xfsprogs/db/agfl.c
+@@ -31,5 +31,4 @@
+ 
+ #include <xfs/libxfs.h>
+-#include "agfl.h"
+ #include "command.h"
+ #include "type.h"
+@@ -41,4 +40,5 @@
+ #include "output.h"
+ #include "init.h"
++#include "agfl.h"
+ 
+ static int agfl_bno_size(void *obj, int startoff);
+--- xfs-cmds/xfsprogs/db/agfl.h
++++ xfs-cmds/xfsprogs/db/agfl.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	agfl_flds[];
+ extern const struct field	agfl_hfld[];
+ 
+--- xfs-cmds/xfsprogs/db/agi.c
++++ xfs-cmds/xfsprogs/db/agi.c
+@@ -31,7 +31,6 @@
+  */
+ 
+ #include <xfs/libxfs.h>
+-#include "agi.h"
+ #include "command.h"
+ #include "type.h"
+ #include "faddr.h"
+@@ -41,6 +40,7 @@
+ #include "bit.h"
+ #include "output.h"
+ #include "init.h"
++#include "agi.h"
+ 
+ static int agi_f(int argc, char **argv);
+ static void agi_help(void);
+--- xfs-cmds/xfsprogs/db/agi.h
++++ xfs-cmds/xfsprogs/db/agi.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	agi_flds[];
+ extern const struct field	agi_hfld[];
+ 
+--- xfs-cmds/xfsprogs/db/bmapbt.h
++++ xfs-cmds/xfsprogs/db/bmapbt.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	bmapbta_flds[];
+ extern const struct field	bmapbta_hfld[];
+ extern const struct field	bmapbta_key_flds[];
+--- xfs-cmds/xfsprogs/db/bmroot.h
++++ xfs-cmds/xfsprogs/db/bmroot.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	bmroota_flds[];
+ extern const struct field	bmroota_key_flds[];
+ extern const struct field	bmrootd_flds[];
+--- xfs-cmds/xfsprogs/db/bnobt.h
++++ xfs-cmds/xfsprogs/db/bnobt.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	bnobt_flds[];
+ extern const struct field	bnobt_hfld[];
+ extern const struct field	bnobt_key_flds[];
+--- xfs-cmds/xfsprogs/db/cntbt.h
++++ xfs-cmds/xfsprogs/db/cntbt.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	cntbt_flds[];
+ extern const struct field	cntbt_hfld[];
+ extern const struct field	cntbt_key_flds[];
+--- xfs-cmds/xfsprogs/db/dquot.c
++++ xfs-cmds/xfsprogs/db/dquot.c
+@@ -34,7 +34,6 @@
+ #include "bit.h"
+ #include "bmap.h"
+ #include "command.h"
+-#include "dquot.h"
+ #include "type.h"
+ #include "faddr.h"
+ #include "fprint.h"
+@@ -43,6 +42,7 @@
+ #include "io.h"
+ #include "init.h"
+ #include "output.h"
++#include "dquot.h"
+ 
+ static int	dquot_f(int argc, char **argv);
+ static void	dquot_help(void);
+--- xfs-cmds/xfsprogs/db/dquot.h
++++ xfs-cmds/xfsprogs/db/dquot.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	disk_dquot_flds[];
+ extern const struct field	dqblk_flds[];
+ extern const struct field	dqblk_hfld[];
+--- xfs-cmds/xfsprogs/db/inobt.h
++++ xfs-cmds/xfsprogs/db/inobt.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	inobt_flds[];
+ extern const struct field	inobt_hfld[];
+ extern const struct field	inobt_key_flds[];
+--- xfs-cmds/xfsprogs/db/sb.h
++++ xfs-cmds/xfsprogs/db/sb.h
+@@ -30,8 +30,6 @@
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+  */
+ 
+-struct field;
+-
+ extern const struct field	sb_flds[];
+ extern const struct field	sb_hfld[];
+ 
+--- xfs-cmds/xfsprogs/db/bmap.c
++++ xfs-cmds/xfsprogs/db/bmap.c
+@@ -33,6 +33,9 @@
+ #include <xfs/libxfs.h>
+ #include "command.h"
+ #include "type.h"
++#include "fprint.h"
++#include "faddr.h"
++#include "field.h"
+ #include "bmap.h"
+ #include "io.h"
+ #include "inode.h"
+
+--- xfs-cmds/xfsprogs/db/check.c
++++ xfs-cmds/xfsprogs/db/check.c
+@@ -37,9 +37,12 @@
+ #include "check.h"
+ #include "command.h"
+ #include "io.h"
++#include "type.h"
++#include "fprint.h"    
++#include "faddr.h"     
++#include "field.h"     
+ #include "sb.h"
+ #include "output.h"
+-#include "type.h"
+ #include "init.h"
+ #include "malloc.h"
+ 
+
+--- xfs-cmds/xfsprogs/db/command.c
++++ xfs-cmds/xfsprogs/db/command.c
+@@ -32,9 +32,6 @@
+ 
+ #include <xfs/libxfs.h>
+ #include "addr.h"
+-#include "agf.h"
+-#include "agfl.h"
+-#include "agi.h"
+ #include "block.h"
+ #include "bmap.h"
+ #include "check.h"
+@@ -46,6 +43,9 @@
+ #include "faddr.h"
+ #include "fprint.h"
+ #include "field.h"
++#include "agf.h"
++#include "agfl.h"
++#include "agi.h"
+ #include "frag.h"
+ #include "freesp.h"
+ #include "help.h"
+
+--- xfs-cmds/xfsprogs/db/faddr.c
++++ xfs-cmds/xfsprogs/db/faddr.c
+@@ -32,7 +32,9 @@
+ 
+ #include <xfs/libxfs.h>
+ #include "type.h"
++#include "fprint.h"
+ #include "faddr.h"
++#include "field.h"
+ #include "inode.h"
+ #include "io.h"
+ #include "bit.h"
+
+--- xfs-cmds/xfsprogs/db/type.c
++++ xfs-cmds/xfsprogs/db/type.c
+@@ -31,9 +31,6 @@
+  */
+ 
+ #include <xfs/libxfs.h>
+-#include "agf.h"
+-#include "agfl.h"
+-#include "agi.h"
+ #include "block.h"
+ #include "command.h"
+ #include "type.h"
+
+--- xfs-cmds/xfsprogs/mkfile/xfs_mkfile.c
++++ xfs-cmds/xfsprogs/mkfile/xfs_mkfile.c
+@@ -39,7 +39,7 @@
+ 
+ #define	MAXBUFFERSIZE	(256 * 1024)
+ 
+-static char *progname;
++char *progname;
+ 
+ static void
+ usage(void)
+
diff --git a/sys-fs/xfsprogs/files/xfsprogs_gcc4.gz b/sys-fs/xfsprogs/files/xfsprogs_gcc4.gz
deleted file mode 100644
index 9720ab63d02f..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs_gcc4.gz
+++ /dev/null
diff --git a/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild b/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild
index 3521ee4b98d3..40b0573a33dc 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.6.25.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-fs/xfsprogs/xfsprogs-2.6.25.ebuild,v 1.14 2005/05/30 03:30:40 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild,v 1.15 2005/06/02 01:42:03 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -19,12 +19,12 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/xfsprogs_gcc4.gz
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 
 	# temp work around till a _syscall6() exists. bug #73855
-	use elibc_uclibc && epatch ${FILESDIR}/2.6.25-uclibc-fadvise.patch
+	use elibc_uclibc && epatch "${FILESDIR}"/2.6.25-uclibc-fadvise.patch
 
 	# Inject our own CFLAGS / docpath
 	sed -i \