Don't run eautoreconf twice

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

5 files changed, 18 insertions, 21 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 6793a388689a..f5377617e0c3 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.71 2012/06/01 12:54:18 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.72 2012/06/02 09:30:17 jlec Exp $
+
+  02 Jun 2012; Justin Lecher <jlec@gentoo.org> rsyslog-5.8.5.ebuild,
+  rsyslog-5.8.8.ebuild, rsyslog-5.8.11.ebuild, rsyslog-6.2.1.ebuild:
+  Don't run eautoreconf twice
 
 *rsyslog-6.2.1 (01 Jun 2012)
 
diff --git a/app-admin/rsyslog/rsyslog-5.8.11.ebuild b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
index 90f941c340d4..50caef41fd3e 100644
--- a/app-admin/rsyslog/rsyslog-5.8.11.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.11.ebuild,v 1.3 2012/05/31 16:50:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.11.ebuild,v 1.4 2012/06/02 09:30:17 jlec Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils eutils systemd
 
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
@@ -43,8 +43,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
 src_prepare() {
-	autotools-utils_src_prepare
-
 	# Maintainer notes:
 	# ZeroMQ support, for now it is done by hand until upstream process bug.
 	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
@@ -56,7 +54,7 @@ src_prepare() {
 
 	# Don't force '-g' CFLAG
 	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-admin/rsyslog/rsyslog-5.8.5.ebuild b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
index 4c83ff6266c2..1e60f0a13f88 100644
--- a/app-admin/rsyslog/rsyslog-5.8.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.10 2012/05/31 16:50:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.11 2012/06/02 09:30:17 jlec Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils eutils systemd
 
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
@@ -43,8 +43,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
 src_prepare() {
-	autotools-utils_src_prepare
-
 	# Maintainer notes:
 	# ZeroMQ support, for now it is done by hand until upstream process bug.
 	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
@@ -56,7 +54,7 @@ src_prepare() {
 
 	# Don't force '-g' CFLAG
 	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-admin/rsyslog/rsyslog-5.8.8.ebuild b/app-admin/rsyslog/rsyslog-5.8.8.ebuild
index d31e3bc4b292..4ec302aea2fe 100644
--- a/app-admin/rsyslog/rsyslog-5.8.8.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.8.ebuild,v 1.5 2012/05/31 16:50:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.8.ebuild,v 1.6 2012/06/02 09:30:17 jlec Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -43,8 +43,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
 src_prepare() {
-	autotools-utils_src_prepare
-
 	# Maintainer notes:
 	# ZeroMQ support, for now it is done by hand until upstream process bug.
 	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
@@ -56,7 +54,7 @@ src_prepare() {
 
 	# Don't force '-g' CFLAG
 	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-admin/rsyslog/rsyslog-6.2.1.ebuild b/app-admin/rsyslog/rsyslog-6.2.1.ebuild
index f8751360a0b5..5c5aa858abfb 100644
--- a/app-admin/rsyslog/rsyslog-6.2.1.ebuild
+++ b/app-admin/rsyslog/rsyslog-6.2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-6.2.1.ebuild,v 1.1 2012/06/01 12:54:18 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-6.2.1.ebuild,v 1.2 2012/06/02 09:30:17 jlec Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools-utils systemd
+inherit autotools-utils eutils systemd
 
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
@@ -47,8 +47,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
 src_prepare() {
-	autotools-utils_src_prepare
-
 	# Maintainer notes:
 	# ZeroMQ support,upstream bug #277
 	if use zeromq; then
@@ -62,7 +60,8 @@ src_prepare() {
 	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' \
 		-e 's/smcustbindcdr/sm_cust_bindcdr/g' \
 		-i configure.ac || die
-	eautoreconf
+
+	autotools-utils_src_prepare
 }
 
 src_configure() {