mail-mta/nullmailer: Fix incompatibilities with some automake versions, #478312

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 11 insertions, 5 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 1c01649d7f6f..c8e619c6847c 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.74 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.75 2013/09/25 10:21:20 jlec Exp $
+
+  25 Sep 2013; Justin Lecher <jlec@gentoo.org> nullmailer-1.11-r2.ebuild,
+  nullmailer-1.11-r3.ebuild, nullmailer-1.13-r2.ebuild:
+  Fix incompatibilities with some automake versions, #478312
 
 *nullmailer-1.13-r2 (25 Sep 2013)
 
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
index 60e4a1eebf8e..4ba3bbadb2e7 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild,v 1.5 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild,v 1.6 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=4
 WANT_AUTOMAKE="1.10.3"
@@ -56,6 +56,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
index 8fad494ff650..0e109bd05bff 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild,v 1.2 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild,v 1.3 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=4
 
@@ -64,7 +64,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
-
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
index fef08af7079c..2fefde57e987 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.1 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.2 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=5
 
@@ -68,6 +68,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }