Replacing AM_CONFIG_HEADER by AC_CONFIG_HEADERS in configure.ac to support sys-devel/automake:1.13, fixes bug #468692 reported by Torsten Kaiser. Thanks to CrowX- and inferit on IRC to point me to this bug.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

6 files changed, 27 insertions, 6 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 02a152c4a666..390a07781ebe 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.67 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.68 2013/05/05 21:53:24 tomwij Exp $
+
+  05 May 2013; Tom Wijsman <TomWij@gentoo.org> dante-1.1.19-r4.ebuild,
+  dante-1.3.2-r1.ebuild, dante-1.3.2.ebuild, dante-1.4.0_pre1-r1.ebuild,
+  dante-1.4.0_pre1.ebuild, metadata.xml:
+  Replacing AM_CONFIG_HEADER by AC_CONFIG_HEADERS in configure.ac to support
+  sys-devel/automake:1.13, fixes bug #468692 reported by Torsten Kaiser. Thanks
+  to CrowX- and inferit on IRC to point me to this bug.
 
 *dante-1.3.2-r1 (09 Apr 2013)
 *dante-1.4.0_pre1-r1 (09 Apr 2013)
diff --git a/net-proxy/dante/dante-1.1.19-r4.ebuild b/net-proxy/dante/dante-1.1.19-r4.ebuild
index ed50f8e45ce0..5e7bd50adda0 100644
--- a/net-proxy/dante/dante-1.1.19-r4.ebuild
+++ b/net-proxy/dante/dante-1.1.19-r4.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/net-proxy/dante/dante-1.1.19-r4.ebuild,v 1.10 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r4.ebuild,v 1.11 2013/05/05 21:53:24 tomwij Exp $
 
 inherit eutils autotools
 
@@ -34,6 +34,8 @@ src_unpack() {
 		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
 		doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5}
 
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/net-proxy/dante/dante-1.3.2-r1.ebuild b/net-proxy/dante/dante-1.3.2-r1.ebuild
index 9bdb31456ab6..c4181fecdd8e 100644
--- a/net-proxy/dante/dante-1.3.2-r1.ebuild
+++ b/net-proxy/dante/dante-1.3.2-r1.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/net-proxy/dante/dante-1.3.2-r1.ebuild,v 1.1 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.2-r1.ebuild,v 1.2 2013/05/05 21:53:24 tomwij Exp $
 
 EAPI="5"
 
@@ -36,6 +36,9 @@ src_prepare() {
 		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
 		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
 		|| die
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/net-proxy/dante/dante-1.3.2.ebuild b/net-proxy/dante/dante-1.3.2.ebuild
index d990a5a12910..4bbc6a84ef8c 100644
--- a/net-proxy/dante/dante-1.3.2.ebuild
+++ b/net-proxy/dante/dante-1.3.2.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/net-proxy/dante/dante-1.3.2.ebuild,v 1.5 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.2.ebuild,v 1.6 2013/05/05 21:53:24 tomwij Exp $
 
 EAPI="4"
 
@@ -36,6 +36,9 @@ src_prepare() {
 		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
 		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
 		|| die
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild b/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
index 4d3cac389847..d95bda53ea59 100644
--- a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1-r1.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/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.1 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.2 2013/05/05 21:53:24 tomwij Exp $
 
 EAPI="5"
 
@@ -38,6 +38,9 @@ src_prepare() {
 		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
 		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
 		|| die
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
index 919078a93e64..a5fb5a5a62aa 100644
--- a/net-proxy/dante/dante-1.4.0_pre1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1.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/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.3 2013/04/09 18:09:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.4 2013/05/05 21:53:24 tomwij Exp $
 
 EAPI="5"
 
@@ -38,6 +38,9 @@ src_prepare() {
 		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
 		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
 		|| die
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+
 	eautoreconf
 }