Rebuild autotools with modern versions.

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

3 files changed, 7 insertions, 102 deletions

diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index 6faadd78e2ab..a2c80d788241 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/barnyard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.24 2010/06/17 21:37:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.25 2010/12/03 00:38:12 flameeyes Exp $
+
+  03 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -barnyard-0.2.0-r2.ebuild, barnyard-0.2.0-r3.ebuild:
+  Rebuild autotools with modern versions.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> barnyard-0.2.0-r1.ebuild,
   barnyard-0.2.0-r2.ebuild, barnyard-0.2.0-r3.ebuild:
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild
deleted file mode 100644
index 0c713a56f48e..000000000000
--- a/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild,v 1.9 2010/06/17 21:37:29 patrick Exp $
-
-WANT_AUTOMAKE="1.4"
-inherit eutils autotools
-
-DESCRIPTION="Fast output system for Snort"
-HOMEPAGE="http://www.snort.org/dl/barnyard/"
-SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2"
-
-SLOT="0"
-LICENSE="QPL"
-KEYWORDS="~amd64 -sparc ~x86"
-IUSE="mysql postgres sguil"
-
-DEPEND="net-libs/libpcap
-	postgres? ( dev-db/postgresql-server )
-	mysql? ( virtual/mysql )
-	sguil? ( dev-lang/tcl )"
-
-RDEPEND="${DEPEND}
-	net-analyzer/snort"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use sguil ; then
-		epatch "${WORKDIR}/${PV}-sguil_files.patch"
-		epatch "${WORKDIR}/${PV}-configure-in.patch"
-		cd "${S}/src/output-plugins"
-		epatch "${WORKDIR}/${PV}-op_plugbase.c.patch"
-		cd "${S}"
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	local myconf
-	if use sguil ; then
-		myconf="--enable-tcl"
-	fi
-
-	econf \
-		${myconf} \
-		--sysconfdir=/etc/snort \
-		$(use_enable postgres) \
-		$(use_enable mysql)
-	emake || die "compile problem"
-}
-
-src_install () {
-
-	make DESTDIR="${D}" install || die
-
-	dodoc docs/*
-	dodoc AUTHORS README
-
-	keepdir /var/log/snort
-	keepdir /var/log/snort/archive
-
-	insinto /etc/snort
-	newins etc/barnyard.conf barnyard.conf
-	if use sguil ; then
-		sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
-		-e "/config interface/s:fxp0:eth0:" \
-		-e "s:output alert_fast:#output alert_fast:" \
-		-e "s:output log_dump:#output log_dump:" \
-			"${D}/etc/snort/barnyard.conf" || die "sed failed"
-	fi
-
-	newconfd "${FILESDIR}"/barnyard.confd barnyard
-	if use sguil ; then
-		sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
-		-e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
-			"${D}/etc/conf.d/barnyard" || die "sed failed"
-	fi
-
-	newinitd "${FILESDIR}"/barnyard.rc6 barnyard
-	if use sguil ; then
-		sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
-			"${D}/etc/init.d/barnyard" || die "sed failed"
-	fi
-}
-
-pkg_postinst() {
-	if use sguil ; then
-		elog
-		elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
-		elog "sguil section along with supplying the appropriate database"
-		elog "information."
-		elog
-	fi
-}
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
index f499bd119ec0..65cd42b0b0e7 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild,v 1.2 2010/06/17 21:37:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild,v 1.3 2010/12/03 00:38:12 flameeyes Exp $
 
 EAPI=2
 
-WANT_AUTOMAKE="1.4"
 inherit eutils autotools
 
 DESCRIPTION="Fast output system for Snort"
@@ -35,8 +34,8 @@ src_prepare() {
 		cd "${S}/src/output-plugins"
 		epatch "${WORKDIR}/${PV}-op_plugbase.c.patch"
 		cd "${S}"
-		eautoreconf
 	fi
+	eautoreconf
 }
 
 src_configure() {