diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:30:04 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:30:04 +0000 |
| commit | b654fc0a34d113827a797af47d912bf52ce23c70 (patch) | |
| tree | aa9cfc60b71970def7ebc9f77ee8e11ec02c6642 /www-misc/mergelog | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-b654fc0a34d113827a797af47d912bf52ce23c70.tar.gz gentoo-2-b654fc0a34d113827a797af47d912bf52ce23c70.tar.bz2 gentoo-2-b654fc0a34d113827a797af47d912bf52ce23c70.zip | |
Fix as-needed patch for newer autoconf
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'www-misc/mergelog')
| -rw-r--r-- | www-misc/mergelog/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/mergelog/files/mergelog-4.5-asneeded.patch | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/www-misc/mergelog/ChangeLog b/www-misc/mergelog/ChangeLog index 6722277efa21..9d3fda1d9c7b 100644 --- a/www-misc/mergelog/ChangeLog +++ b/www-misc/mergelog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/mergelog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.11 2012/11/27 19:42:49 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.12 2012/11/30 17:30:04 pinkbyte Exp $ + + 30 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> + files/mergelog-4.5-asneeded.patch: + Fix as-needed patch for newer autoconf 27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch index 77573cc60f9e..bfac735fed09 100644 --- a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch +++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch @@ -1,15 +1,3 @@ -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 |