Rename patch. Regenerate configure. Convert sed script into (same) patch. Set proper dependencies.

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

4 files changed, 91 insertions, 41 deletions

diff --git a/net-misc/lanmap/ChangeLog b/net-misc/lanmap/ChangeLog
index 4cdcae362ebf..0317b96d0531 100644
--- a/net-misc/lanmap/ChangeLog
+++ b/net-misc/lanmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/lanmap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/ChangeLog,v 1.7 2013/09/26 01:29:27 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/ChangeLog,v 1.8 2014/07/18 17:01:09 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> lanmap-81-r1.ebuild,
+  +files/lanmap-81-make.patch, -files/makefile.patch:
+  Rename patch. Regenerate configure. Convert sed script into (same) patch. Set
+  proper dependencies.
 
   26 Sep 2013; Rick Farina <zerochaos@gentoo.org> lanmap-81-r1.ebuild:
   fix bug 485878 and bump eapi
diff --git a/net-misc/lanmap/files/lanmap-81-make.patch b/net-misc/lanmap/files/lanmap-81-make.patch
new file mode 100644
index 000000000000..b92d6f611f72
--- /dev/null
+++ b/net-misc/lanmap/files/lanmap-81-make.patch
@@ -0,0 +1,66 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2,8 +2,8 @@
+ # $Id: lanmap-81-make.patch,v 1.1 2014/07/18 17:01:09 jer Exp $
+ 
+ # complation
+-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
+-LDFLAGS = -lpcap -lm
++CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
++LDFLAGS += -lpcap -lm
+ CFLAGS_DEBUG = -D_DEBUG -ggdb
+ LDFLAGS_DEBUG = -pg
+ BINARY = lanmap
+@@ -14,12 +14,12 @@
+ 	$(CC) $(OBJS) -o $(BINARY) $(LDFLAGS)
+ 
+ static:
+-	make clean
+-	make LDFLAGS="$(LDFLAGS) -static" all
++	$(MAKE) clean
++	$(MAKE) LDFLAGS="$(LDFLAGS) -static" all
+ 
+ debug:
+-	make clean
+-	make CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)"  all
++	$(MAKE) clean
++	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_DEBUG)" LDFLAGS="$(LDFLAGS)"  all
+ 
+ # for testing the classify code by itself
+ os_classify: os_classify.c misc.c
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,16 +10,16 @@
+ DATADEST = ${prefix}/share/lanmap/
+ 
+ all:
+-	cd ./src && make LANMAP_DATADIR="$(DATADEST)"
++	cd ./src && $(MAKE) LANMAP_DATADIR="$(DATADEST)"
+ 
+ install:
+-	install -m 0755 ./src/$(BINARY) $(BINDEST)
++	install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
+ 	install -m 0755 -d $(DATADEST)
+ 	install -m 0755 -d $(DATADEST)data/
+ 	install -m 0755 -d $(DATADEST)data/graph/
+ 	install -m 0755 -d $(DATADEST)graph/img/
+ 	install -m 0644 ./data/mac_vendor $(DATADEST)data/
+-	install -m 0644 -d $(DATADEST)graph
++	install -m 0755 -d $(DATADEST)graph
+ 	install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
+ 	for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f $(DATADEST)graph/img/; done
+ 	
+@@ -29,11 +29,11 @@
+ 
+ clean:
+ 	rm -f ./src/$(BINARY)
+-	cd ./src && make clean
++	cd ./src && $(MAKE) clean
+ 
+ distclean: clean
+ 	rm -f Makefile config.cache config.log config.status config.h
+ 
+ debug:
+-	cd ./src && make debug
++	cd ./src && $(MAKE) debug
+ 
diff --git a/net-misc/lanmap/files/makefile.patch b/net-misc/lanmap/files/makefile.patch
deleted file mode 100644
index 2977370d121b..000000000000
--- a/net-misc/lanmap/files/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- lanmap/src/Makefile.in	2006-03-07 15:44:32.000000000 +0100
-+++ lanmap/src/Makefile.in.new	2008-12-02 16:08:13.000000000 +0100
-@@ -2,8 +2,8 @@
- # $Id: makefile.patch,v 1.1 2009/12/25 05:56:25 darkside Exp $
- 
- # complation
--CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
--LDFLAGS = -lpcap -lm
-+CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
-+LDFLAGS += -lpcap -lm
- CFLAGS_DEBUG = -D_DEBUG -ggdb
- LDFLAGS_DEBUG = -pg
- BINARY = lanmap
---- lanmap/Makefile.in	2008-12-03 14:40:22.000000000 +0100
-+++ lanmap/Makefile.in.new	2008-12-03 14:40:33.000000000 +0100
-@@ -13,7 +13,7 @@
- 	cd ./src && make LANMAP_DATADIR="$(DATADEST)"
- 
- install:
--	install -m 0755 ./src/$(BINARY) $(BINDEST)
-+	install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
- 	install -m 0755 -d $(DATADEST)
- 	install -m 0755 -d $(DATADEST)data/
- 	install -m 0755 -d $(DATADEST)data/graph/
diff --git a/net-misc/lanmap/lanmap-81-r1.ebuild b/net-misc/lanmap/lanmap-81-r1.ebuild
index 6ba929b24ada..ed4231a7ee33 100644
--- a/net-misc/lanmap/lanmap-81-r1.ebuild
+++ b/net-misc/lanmap/lanmap-81-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/lanmap-81-r1.ebuild,v 1.5 2013/09/26 01:29:27 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lanmap/lanmap-81-r1.ebuild,v 1.6 2014/07/18 17:01:09 jer Exp $
 
 EAPI=5
-
-inherit toolchain-funcs eutils
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
 HOMEPAGE="http://www.parseerror.com/lanmap"
@@ -13,26 +12,30 @@ SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
 
-RDEPEND="net-libs/libpcap
-	 media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+CDEPEND="net-libs/libpcap"
+RDEPEND="
+	${CDEPEND}
+	media-gfx/graphviz
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+"
 
-S="${WORKDIR}"/${PN}
+S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/makefile.patch
-	sed -e 's:install -m 0644 -d:install -m 0755 -d:' -i Makefile.in || die
-	chmod +x configure || die
+	epatch "${FILESDIR}"/${P}-make.patch
+	rm configure || die
+	eautoreconf
 }
 
 src_compile() {
-	emake -j1 CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	emake prefix="${ED}"/usr install
-	dodoc {README,TODO}.txt
+	dodoc README.txt TODO.txt
 }