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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 24 insertions, 54 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/Manifest b/net-analyzer/netdiscover/Manifest
index 4fb2a90153ee..307e312eabca 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151877 SHA256 bac5accfcf233ef483552a319970fe2ec9f6dcfe02d8158c0bd10f62855c5104
-DIST netdiscover-0.3-beta6.tar.gz 411018 SHA256 19c367f823c49999e2c05c485cac0a5d5685d23c6b33deae1e957406571924db
-EBUILD netdiscover-0.3_beta6-r2.ebuild 1073 SHA256 2b1e2681d619344c9ff67a1e0a1b8dc4cc61c430277d2122b6ef46a60ae971f9 SHA512 62f16ec6f3ccfcba375ccf2133681f3d28a90b1a6890f3e6a821a738f908193420d49dcad652588d16123071d7c9bf86039376ecd9379c38aa50e7766a9e24d5 WHIRLPOOL b16a796c2958fdc2c809a861394ecfece655ebeeff302f657d66201cd954d3e7897cae72de3898a08badec9e5290716b2745120d8a6860aff4333b44ec6369be
-EBUILD netdiscover-0.3_beta6-r3.ebuild 1138 SHA256 45363ddd53766ae68275db2a657b6201ff9a5c1c2c4ee1b14e1ba025641c1d45 SHA512 b1e135d456414cb5e5bf80c5a380c98a4e6dfdb197e4043e4d3f79f3b4632a54ce7fdc011f99578521d01ea87d286316cdfd4237a7946c4d27fd4a0675e126a3 WHIRLPOOL 1d924ceabc5470a67cfc81e0b25ed14a7dd342c2f203a6f15105819d9152c37891a88229efc2d1b883590b0ac6a80ebcd5579807a5b5e76d44f971da55e9fa30
-MISC ChangeLog 1794 SHA256 110e6d2eb151e128c5d088394f4b96ac2788303daae30aea61c5bcedc8eb9e1a SHA512 19e954196dd657ab88ae6700bb14a083100b9de170f87a8ccbe0aa305381a6e1254f4e08db3930df09d183d34777be0167f3f3760ba68b9c6498cb2cab4febbf WHIRLPOOL 508cc880fb3f3c60e05f1fefb6a530c24abb24f526e5d4025b8399ccec1526500719a9dceae946826891af83674fb438e1d4c6747d6c438f19ae5a13b86287e6
+DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151877 SHA256 bac5accfcf233ef483552a319970fe2ec9f6dcfe02d8158c0bd10f62855c5104 SHA512 785024a3ffac3974df9879233a2b76000a734f59d54300c027deef9754a9bdf78ea899780a23f3a7657b769b748d4fa056f5d0acdf85422f7452ced32f204cea WHIRLPOOL 5866276af024bf56e7f8600d9cbd9e8ba7765413ad34ce6e4d63de072d341bef3cb4ef9f022f4401e4e3de4adba7f2c118fcd70c67c4c176f381a85a8260909a
+DIST netdiscover-0.3-beta6.tar.gz 411018 SHA256 19c367f823c49999e2c05c485cac0a5d5685d23c6b33deae1e957406571924db SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2 WHIRLPOOL 9386451a26a3fb147aadd772bfc71c89cc67185c54c24b306fc421b43799f00402ff383c96944945b06baf90ad22ff409dc0c57a4370b98a20a89951595310fb
+EBUILD netdiscover-0.3_beta6-r3.ebuild 1186 SHA256 83dbe6335b281d3b93eb22719e2e9d3f69d8ebdef5b98b766601337ba24799e3 SHA512 631f0d1f58bb3a7aa03f20178a45766858717e4f52db9f0a314622847a9b1c54265426ed9aca1602452909ebc2309575b4ea1794eaccda7d1fe968bcf08a2926 WHIRLPOOL 627d4855bfdd0d41a8ea77447a995f3f43c229725cbf55cfd2e9452fe1f9a17a589edd9ee8bef833a2ce2360ccc2c4552f5b624665b4e2b3642d432bd6c7bb08
+MISC ChangeLog 1979 SHA256 f63455ac43678eaf30217f14a07f16ef05c264d8c1a5b1b4c43a9649400712fb SHA512 1eeb7cb35f487d13e1efd7b8f438d94d46026951d90c686d8873c6e68a06618124510394115bb0f3675957b5097cd2f28156f20bfcca917b0022efaebc1af0a6 WHIRLPOOL d8dc373611b783bd4a74f8d813d0514eaf5aefedcc1d5f5ec87a19eca6fd35c26b87d546802e3f07a49798e29a682d034d9b10d30a3d0dc8d47b14eb1e141e19
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlENAVsACgkQCaWpQKGI+9RfTQCdE/wfLR6IMjLDK/BwTKFxyDWh
-4Y0An0I7R87e7rEg/iJ+9VI3NTL2urL/
-=7u3I
+iEYEAREIAAYFAlGD0qMACgkQVWmRsqeSphPThwCfcRvx0HXCZSpJDVEFZpGbWAwb
+Fw0AnicOSQ2YhwgUKAPj1TaHOT0JiiUV
+=gy3h
 -----END PGP SIGNATURE-----
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
-}