Fix building with automake-1.13 (bug #468368 by Aleksandr Yakimov).

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 17 insertions, 46 deletions

diff --git a/net-analyzer/netdiscover/ChangeLog b/net-analyzer/netdiscover/ChangeLog
index a7e68bb109f3..aae7e944479d 100644
--- a/net-analyzer/netdiscover/ChangeLog
+++ b/net-analyzer/netdiscover/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/netdiscover
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.12 2013/02/02 12:06:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.13 2013/05/03 15:07:14 jer Exp $
+
+  03 May 2013; Jeroen Roovers <jer@gentoo.org> -netdiscover-0.3_beta6-r2.ebuild,
+  netdiscover-0.3_beta6-r3.ebuild:
+  Fix building with automake-1.13 (bug #468368 by Aleksandr Yakimov).
 
   02 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup up due #48914
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r2.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r2.ebuild
deleted file mode 100644
index 7ca6fea1a30e..000000000000
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r2.ebuild,v 1.1 2009/10/11 08:52:18 pva Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An active/passive address reconnaissance tool."
-HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
-SRC_URI="http://nixgeneration.com/~jaime/netdiscover/releases/${MY_P}.tar.gz
-		mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-DEPEND=">=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libpcap-0.8.3-r1"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${WORKDIR}"/netdiscover-0.3-beta6-oui-db-update-20091010.patch
-	# Avoid installation of ChangeLog, LICENSE, etc. We do this ourselves.
-	sed -i 's:netdiscoverdoc:noinst:' Makefile.am
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Make install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
index a86b9618cd59..1827086b1f7b 100644
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild,v 1.1 2009/10/17 14:26:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild,v 1.2 2013/05/03 15:07:14 jer Exp $
 
-EAPI="2"
+EAPI=5
 inherit eutils autotools
 
 MY_PV="${PV/_/-}"
@@ -23,15 +23,18 @@ DEPEND=">=net-libs/libnet-1.1.2.1-r1
 
 S=${WORKDIR}/${MY_P}
 
+DOCS=( AUTHORS ChangeLog README TODO )
+
 src_prepare() {
 	epatch "${WORKDIR}"/netdiscover-0.3-beta6-oui-db-update-20091010.patch
 	sed '/char tmac/{s:6:7:}' -i src/misc.c || die #, drop in beta7
 	# Avoid installation of ChangeLog, LICENSE, etc. We do this ourselves.
-	sed -i 's:netdiscoverdoc:noinst:' Makefile.am
+	sed -i \
+		-e 's:netdiscoverdoc:noinst:' \
+		Makefile.am || die
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e '/AM_PROG_CC_STDC/d' \
+		configure.in || die
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Make install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}