fix #248482

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 46 insertions, 8 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/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
 }