fix #248482

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

5 files changed, 50 insertions, 11 deletions

diff --git a/www-misc/mergelog/ChangeLog b/www-misc/mergelog/ChangeLog
index 9e5950fc4f04..16f4ffeb34e8 100644
--- a/www-misc/mergelog/ChangeLog
+++ b/www-misc/mergelog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-misc/mergelog
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.8 2007/09/15 09:37:08 hollow Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.9 2009/07/05 20:05:12 hollow Exp $
+
+  05 Jul 2009; Benedikt Böhm <hollow@gentoo.org>
+  +files/mergelog-4.5-asneeded.patch, mergelog-4.5.ebuild,
+  mergelog-4.5-r1.ebuild:
+  fix #248482
 
   15 Sep 2007; Benedikt Böhm <hollow@gentoo.org> mergelog-4.5-r1.ebuild:
   maybe fix #192272
diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest
index 611e903931c5..0277a67d03b1 100644
--- a/www-misc/mergelog/Manifest
+++ b/www-misc/mergelog/Manifest
@@ -1,6 +1,7 @@
+AUX mergelog-4.5-asneeded.patch 1106 RMD160 b73937b930ea88c2c6977666f374f5c86d302bf8 SHA1 8beda0c5fdcaaa15f2f3165eac814632d630f5a8 SHA256 eb7b0df76642cfa1c93dcabaff48388c7051b517aa6e48137af7f2876c491db2
 AUX mergelog-4.5-splitlog.patch 13678 RMD160 2db19a3357a979e3305c4657e95d2b599c1e8e26 SHA1 0e0f9af9c7c13b62af786a95d16917362b9168a7 SHA256 904df097cb884fe497440dbd9a967d933490861552e45bc62afa0feabe0664f5
 DIST mergelog-4.5.tar.gz 39407 RMD160 19e7d067816ebab79da30ab326aa7aa49c3f6ab0 SHA1 bc9bdfddc561301e417a2de949ce3c4203b54c94 SHA256 fd97c5b9ae88fbbf57d3be8d81c479e0df081ed9c4a0ada48b1ab8248a82676d
-EBUILD mergelog-4.5-r1.ebuild 783 RMD160 617e53c5cc6808b3298f7460a5747e1035fa6cdd SHA1 1d27f50deb278eda7e0dd67db7ce7d5adcba7ab9 SHA256 2c1974a4c7f8c66b01d24039edb19c6924e87ad667ac93b62c7ae3e56a3c10e8
-EBUILD mergelog-4.5.ebuild 665 RMD160 ee89c83b8b6f5fe60f0817b1b9e4d9c4db9659f6 SHA1 6ef661487989acf4659c97e9944aaa3b64558735 SHA256 0b2428b1e9a853e2264f3cf0ff42cbe34297e67cfd5334c4a1d90e38799ccfb8
-MISC ChangeLog 1534 RMD160 7cf2672623677e26db60cae04a44617d88e0b7ec SHA1 abf9587b8d89cbfd7b6c3f3e5dd46edcdcaee96c SHA256 3139b852e70490acc3d5490ad933edf01c5aae76f6ec5b196c798819ca1e44e5
+EBUILD mergelog-4.5-r1.ebuild 817 RMD160 e90b482c1fc6cc1633f40756c6ac48ecec0707dd SHA1 143ad3fa98f31cdfdc81eca056f5ec183d6b883c SHA256 a99eb59e28efb456378adfa2aa16e9ebbe507ea4aa1653639e075e706d48c1fc
+EBUILD mergelog-4.5.ebuild 658 RMD160 8ac8412431ce020e2e69b22e3396fcaa04b93db0 SHA1 66ed52873bd4a27ae06271d204769e92ecd999f0 SHA256 161f257db15246da7ef0e36a52f435bf29672274cad5ac16764f7662505b2d70
+MISC ChangeLog 1684 RMD160 adc65ec5d0ded8608dd5e8c19c4a72d6a0ae7c4d SHA1 70ed510a90880069dfd41a9926cfcd47bf04b16c SHA256 3d16db49c023b769bb8af16be954c012a679cbf3bfe265b28c3edb24e923ede0
 MISC metadata.xml 501 RMD160 79f77bdfc5f207f47a3e1d77b571eed20f1cc162 SHA1 55327763075528fc1854719cd85a10db3c29735d SHA256 4c9a94dc644d343e5283715a8d5fbaa4bb4aa93b34e759c90da14cae3d9e7730
diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch
new file mode 100644
index 000000000000..77573cc60f9e
--- /dev/null
+++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch
@@ -0,0 +1,32 @@
+Index: mergelog-4.5/configure.in
+===================================================================
+--- mergelog-4.5.orig/configure.in
++++ mergelog-4.5/configure.in
+@@ -10,6 +10,7 @@ AC_PROG_INSTALL()
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lz:
+Index: mergelog-4.5/src/Makefile.am
+===================================================================
+--- mergelog-4.5.orig/src/Makefile.am
++++ mergelog-4.5/src/Makefile.am
+@@ -1,7 +1,10 @@
+ bin_PROGRAMS=mergelog zmergelog
+ 
+-mergelog: mergelog.c
+-	$(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall mergelog.c -o $@
+-
+-zmergelog: mergelog.c
+-	$(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall -DUSE_ZLIB mergelog.c -o $@
++# This is a bit of a hack, but it preserves the original design of the
++# upstream Makefile.am in assuming that $VERSION will be defined in the
++# Makefile that is actually fed to make.
++AM_CPPFLAGS=-DVERSION=\"@VERSION@\"
++AM_CFLAGS=-Wall
++mergelog_SOURCES = mergelog.c
++zmergelog_SOURCES = mergelog.c
++zmergelog_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_ZLIB
diff --git a/www-misc/mergelog/mergelog-4.5-r1.ebuild b/www-misc/mergelog/mergelog-4.5-r1.ebuild
index 66edde7765a9..b5949c2bdad5 100644
--- a/www-misc/mergelog/mergelog-4.5-r1.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/mergelog-4.5-r1.ebuild,v 1.2 2007/09/15 09:37:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/mergelog-4.5-r1.ebuild,v 1.3 2009/07/05 20:05:12 hollow Exp $
 
 inherit autotools eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-splitlog.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 	eautoreconf
 }
 
@@ -33,5 +34,5 @@ src_install() {
 	dobin src/mergelog src/zmergelog
 
 	doman man/*.1
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 }
diff --git a/www-misc/mergelog/mergelog-4.5.ebuild b/www-misc/mergelog/mergelog-4.5.ebuild
index 340e273948e4..bec63577f9c7 100644
--- a/www-misc/mergelog/mergelog-4.5.ebuild
+++ b/www-misc/mergelog/mergelog-4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/mergelog-4.5.ebuild,v 1.5 2007/05/16 07:28:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/mergelog-4.5.ebuild,v 1.6 2009/07/05 20:05:12 hollow Exp $
 
 DESCRIPTION="A utility to merge apache logs in chronological order"
 SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
@@ -24,5 +24,5 @@ src_install() {
 	dobin src/mergelog src/zmergelog
 
 	doman man/*.1
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 }