Clean up patch. Respect LDFLAGS (bug #334589).

Package-Manager: portage-2.2_rc69/cvs/Linux i686

4 files changed, 91 insertions, 49 deletions

diff --git a/app-arch/rzip/ChangeLog b/app-arch/rzip/ChangeLog
index f29aade98df1..c3f03bf1a6eb 100644
--- a/app-arch/rzip/ChangeLog
+++ b/app-arch/rzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rzip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.35 2010/04/08 18:13:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.36 2010/08/26 21:44:56 jer Exp $
+
+  26 Aug 2010; Jeroen Roovers <jer@gentoo.org> +rzip-2.1-r2.ebuild,
+  files/rzip-2.1-darwin.patch:
+  Clean up patch. Respect LDFLAGS (bug #334589).
 
   08 Apr 2010; Jeroen Roovers <jer@gentoo.org> rzip-2.1-r1.ebuild:
   Stable for HPPA (bug #309383).
diff --git a/app-arch/rzip/Manifest b/app-arch/rzip/Manifest
index fe1c4451a019..31dc8512b8f0 100644
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,5 +1,6 @@
-AUX rzip-2.1-darwin.patch 5209 RMD160 1ef784996ec28674f376ca23e4fde7f0e90ef038 SHA1 e0764a4c1d7d3d31cb3d0654522fe26cddbfa313 SHA256 55829f129ae9d53d9bb6a01852e41a2d3b9f130f708426042103f0728948a885
+AUX rzip-2.1-darwin.patch 4829 RMD160 49cc9e3065bfe9752724a1cfe4e01a9774acb2ca SHA1 b6a45ca0a10b5d5d64c434d9fbe4c16cbf160551 SHA256 5ed4d03416fefa613c5a38b70f2853f5d415cc1e819e0015c01741d3915b9cbd
 DIST rzip-2.1.tar.gz 46785 RMD160 7ef5299cd526c8c49a779e050ad515a53180c1c5 SHA1 efeafc7a5bdd7daa0cea8d797ff21aa28bdfc8d9 SHA256 4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7
 EBUILD rzip-2.1-r1.ebuild 1187 RMD160 3928187d1fff2e454a6eb26c28117ab45e5e76fe SHA1 47f26ca413ec7318ccb8049fe788955b442e013f SHA256 da82792ecae5c669b1dac786d00370d1ae5244d81f8ca7a197e2f420961b03d7
-MISC ChangeLog 4518 RMD160 2ebfdcffef6de2a9da6976f5daa08b7dca231b4e SHA1 5bae70f5752800677add83da6f2ee0f62808f8d5 SHA256 fbc492d71d88b740b8dd7324a46fc68f0915b1ca7b94717aab3bf6dfc54fce94
+EBUILD rzip-2.1-r2.ebuild 1192 RMD160 a1d9ce7c8795cacbb9597a1ed2e74f67e8ace5be SHA1 e6970b9d90c18283341693b4abd05f7654a38167 SHA256 e969db0973f23e35c6d51407b8dcb820bff6a1c0a45d10efc28c86564bbf211d
+MISC ChangeLog 4667 RMD160 99015e0e9f46a15396664f00f67bd578761fb439 SHA1 c007f1e7acaad448f7666890e8e187bc585374e7 SHA256 a17c5f4138f87e6602352a7fadeb4a045a8490791d729d4ddb322bdaef9d9b8a
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/app-arch/rzip/files/rzip-2.1-darwin.patch b/app-arch/rzip/files/rzip-2.1-darwin.patch
index b62a1d404051..b07aa1712309 100644
--- a/app-arch/rzip/files/rzip-2.1-darwin.patch
+++ b/app-arch/rzip/files/rzip-2.1-darwin.patch
@@ -1,6 +1,5 @@
-diff -r -uN rzip-2.1/configure.in rzip-2.1-patched/configure.in
---- rzip-2.1/configure.in	2003-11-03 09:19:11.000000000 +0100
-+++ rzip-2.1-patched/configure.in	2008-07-27 21:59:45.774740303 +0200
+--- a/configure.in	2003-11-03 09:19:11.000000000 +0100
++++ b/configure.in	2008-07-27 21:59:45.774740303 +0200
 @@ -2,6 +2,12 @@
  AC_INIT(main.c)
  AC_CONFIG_HEADER(config.h)
@@ -41,9 +40,8 @@ diff -r -uN rzip-2.1/configure.in rzip-2.1-patched/configure.in
 +AC_CHECK_FUNCS(strndup)
  
  AC_OUTPUT(Makefile)
-diff -r -uN rzip-2.1/main.c rzip-2.1-patched/main.c
---- rzip-2.1/main.c	2006-02-14 01:38:23.000000000 +0100
-+++ rzip-2.1-patched/main.c	2008-07-27 22:00:28.298071207 +0200
+--- a/main.c	2006-02-14 01:38:23.000000000 +0100
++++ b/main.c	2008-07-27 22:00:28.298071207 +0200
 @@ -18,6 +18,7 @@
  /* rzip compression - main program */
  
@@ -52,40 +50,8 @@ diff -r -uN rzip-2.1/main.c rzip-2.1-patched/main.c
  
  static void usage(void)
  {
-diff -r -uN rzip-2.1/Makefile.in rzip-2.1-patched/Makefile.in
---- rzip-2.1/Makefile.in	2006-02-14 01:38:23.000000000 +0100
-+++ rzip-2.1-patched/Makefile.in	2008-07-27 21:58:08.201419790 +0200
-@@ -3,8 +3,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--INSTALL_BIN=$(exec_prefix)/bin
--INSTALL_MAN=$(prefix)/man
-+INSTALL_BIN=$(DESTDIR)/@bindir@
-+INSTALL_MAN=$(DESTDIR)/@mandir@
- 
- LIBS=@LIBS@
- CC=@CC@
-@@ -20,7 +20,7 @@
- .SUFFIXES:
- .SUFFIXES: .c .o
- 
--OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
-+OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o
- 
- # note that the -I. is needed to handle config.h when using VPATH
- .c.o:
-@@ -35,6 +35,7 @@
- 	${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
- 	-mkdir -p ${INSTALL_MAN}/man1
- 	${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
-+	ln -s rzip $(INSTALL_BIN)/runzip
- 
- rzip: $(OBJS)
- 	$(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
-diff -r -uN rzip-2.1/rzip.h rzip-2.1-patched/rzip.h
---- rzip-2.1/rzip.h	2006-02-14 01:38:23.000000000 +0100
-+++ rzip-2.1-patched/rzip.h	2008-07-27 21:58:08.204752617 +0200
+--- a/rzip.h	2006-02-14 01:38:23.000000000 +0100
++++ b/rzip.h	2008-07-27 21:58:08.204752617 +0200
 @@ -94,7 +94,7 @@
  #define strerror(i) sys_errlist[i]
  #endif
@@ -95,9 +61,8 @@ diff -r -uN rzip-2.1/rzip.h rzip-2.1-patched/rzip.h
  extern int errno;
  #endif
  
-diff -r -uN rzip-2.1/strutils.c rzip-2.1-patched/strutils.c
---- rzip-2.1/strutils.c	1970-01-01 01:00:00.000000000 +0100
-+++ rzip-2.1-patched/strutils.c	2008-07-27 21:58:08.204752617 +0200
+--- a/strutils.c	1970-01-01 01:00:00.000000000 +0100
++++ b/strutils.c	2008-07-27 21:58:08.204752617 +0200
 @@ -0,0 +1,29 @@
 +/* 
 +   Copyright (C) 2005 Gentoo Foundation
@@ -128,9 +93,8 @@ diff -r -uN rzip-2.1/strutils.c rzip-2.1-patched/strutils.c
 +	return(memcpy(ret, s, n));
 +}
 +#endif
-diff -r -uN rzip-2.1/strutils.h rzip-2.1-patched/strutils.h
---- rzip-2.1/strutils.h	1970-01-01 01:00:00.000000000 +0100
-+++ rzip-2.1-patched/strutils.h	2008-07-27 21:58:08.204752617 +0200
+--- a/strutils.h	1970-01-01 01:00:00.000000000 +0100
++++ b/strutils.h	2008-07-27 21:58:08.204752617 +0200
 @@ -0,0 +1,31 @@
 +/* 
 +   Copyright (C) 2005 Gentoo Foundation
@@ -163,3 +127,37 @@ diff -r -uN rzip-2.1/strutils.h rzip-2.1-patched/strutils.h
 +# endif
 +
 +#endif
+--- a/Makefile.in	2006-02-14 01:38:23.000000000 +0100
++++ b/Makefile.in	2010-08-26 23:34:38.000000000 +0200
+@@ -3,8 +3,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-INSTALL_BIN=$(exec_prefix)/bin
+-INSTALL_MAN=$(prefix)/man
++INSTALL_BIN=$(DESTDIR)/@bindir@
++INSTALL_MAN=$(DESTDIR)/@mandir@
+ 
+ LIBS=@LIBS@
+ CC=@CC@
+@@ -20,7 +20,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+-OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
++OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o
+ 
+ # note that the -I. is needed to handle config.h when using VPATH
+ .c.o:
+@@ -35,9 +35,10 @@
+ 	${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
+ 	-mkdir -p ${INSTALL_MAN}/man1
+ 	${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
++	ln -s rzip $(INSTALL_BIN)/runzip
+ 
+ rzip: $(OBJS)
+-	$(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rzip $(OBJS) $(LIBS)
+ 
+ rzip.1: rzip.yo
+ 	yodl2man -o rzip.1 rzip.yo
diff --git a/app-arch/rzip/rzip-2.1-r2.ebuild b/app-arch/rzip/rzip-2.1-r2.ebuild
new file mode 100644
index 000000000000..af9327499983
--- /dev/null
+++ b/app-arch/rzip/rzip-2.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1-r2.ebuild,v 1.3 2010/08/26 21:44:56 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Compression program for large files"
+HOMEPAGE="http://rzip.samba.org"
+SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-arch/bzip2"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-darwin.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}
+
+pkg_postinst() {
+	ewarn "Warning: Gentoo shipped a broken rzip for quite some time. During"
+	ewarn "compression of large files it didn't set the right file size, so"
+	ewarn "if you have any reason to believe that your archive was compressed "
+	ewarn "with an old Gentoo rzip, please refer to "
+	ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=217552 "
+	ewarn "for the rzip-handle-broken-archive.patch patch to rescue your"
+	ewarn "data."
+	ewarn
+	ewarn "We apologize for the inconvenience."
+}