dev-util/dropwatch: version bump and fixes

- update to the latest git HEAD snapshot (20150706);
- update to EAPI 6;
- add subsolt dep on binutils-libs (fixes bug 599908), thanks
  Thomas Deutschmann (whissi@gentoo.org) for the report and the patch.

Package-Manager: portage-2.3.2
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

4 files changed, 89 insertions, 12 deletions

diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index e4cc3b5420e3..c7d20960544e 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1 +1,2 @@
 DIST dropwatch-1.4.tbz2 32199 SHA256 ede45fd3b4a847a9befa73e9e8f6336aee5418fc3e041648c684e5085113a3b4 SHA512 a5744ea156464c53d31d5b54bcaf9bd61f2035285059bc05a3eec20be71d1451a6191237f194dc5d8e6fb6fcbb81d9ef87adf5ac2d878cc1f159191c47118e29 WHIRLPOOL 3d8661ab85da0a7485e8f6312eeb99e1ed14f6af38d119093c835e94f518918908e596d3e5744be5f529d280b6644b459106eb503112df58b63865737f8eecc1
+DIST dropwatch-1.4_p20150706.tar.xz 14880 SHA256 c0977172d1d1f14ddadf4fd5f5449f1ef0ced77c73b34c4ce9d256c7380c9b29 SHA512 f78f19f063408cb655869e662e92709b1cec820ab35b11272b87a990c380e0799c6e9067dcf53edab795916347dfe3fd04932f9699c3f5649f96d62567957fbd WHIRLPOOL 26e460964db3c71bb9a0d7f89fcec5985471a7ad94cdaadd4fdef0e0a70f1d990fd8db1092945fd30e34fe54868647d31d60235b4fa7d60533c58e4e1e050d4d
diff --git a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
new file mode 100644
index 000000000000..69c033d45ddc
--- /dev/null
+++ b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A utility to interface to the kernel to monitor for dropped network packets"
+HOMEPAGE="https://fedorahosted.org/dropwatch/"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libnl:3
+	sys-libs/binutils-libs:=
+	sys-libs/readline:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NET_DROP_MONITOR"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-1.4-binutils-2.23.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" -C src
+}
+
+src_install() {
+	dobin "src/${PN}"
+	doman "doc/${PN}.1"
+	dodoc README
+}
+
+pkg_postinst() {
+	einfo "Ensure that 'drop_monitor' kernel module is loaded before running ${PN}"
+}
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
index 43702c4ff385..1a7fa7913e42 100644
--- a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
+++ b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
@@ -1,6 +1,16 @@
-diff -aurd src.orig/lookup.c src/lookup.c
---- src.orig/lookup.c	2011-10-03 22:51:38.000000000 +0400
-+++ src/lookup.c	2013-02-18 09:13:56.683214438 +0400
+commit a5aa2c3cbae207d12b9f2fded36a47031c55be36
+Author: Andrew Savchenko <bircoph@gmail.com>
+Date:   Thu Nov 17 00:04:47 2016 +0300
+
+    Fix build with recent binutils
+    
+    Gentoo-Bug:         457980
+    Upstream Ticket:    5
+
+diff --git a/src/lookup.c b/src/lookup.c
+index ba54991..809981b 100644
+--- a/src/lookup.c
++++ b/src/lookup.c
 @@ -27,13 +27,13 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -16,9 +26,10 @@ diff -aurd src.orig/lookup.c src/lookup.c
  
  extern struct lookup_methods bfd_methods;
  extern struct lookup_methods kallsym_methods;
-diff -aurd src.orig/lookup.h src/lookup.h
---- src.orig/lookup.h	2011-10-03 22:51:38.000000000 +0400
-+++ src/lookup.h	2013-02-18 09:11:00.506895026 +0400
+diff --git a/src/lookup.h b/src/lookup.h
+index e6568d8..47a7b56 100644
+--- a/src/lookup.h
++++ b/src/lookup.h
 @@ -28,6 +28,9 @@
  #include <stdlib.h>
  #include <asm/types.h>
@@ -29,9 +40,10 @@ diff -aurd src.orig/lookup.h src/lookup.h
  
  /*
   * Initalization routine
-diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c
---- src.orig/lookup_bfd.c	2012-01-16 22:34:11.000000000 +0400
-+++ src/lookup_bfd.c	2013-02-18 09:14:02.472984310 +0400
+diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
+index cc7010b..271d426 100644
+--- a/src/lookup_bfd.c
++++ b/src/lookup_bfd.c
 @@ -25,13 +25,13 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -47,9 +59,10 @@ diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c
  
  
  static int lookup_bfd_init(void)
-diff -aurd src.orig/lookup_kas.c src/lookup_kas.c
---- src.orig/lookup_kas.c	2012-05-31 02:43:23.000000000 +0400
-+++ src/lookup_kas.c	2013-02-18 09:14:07.906101713 +0400
+diff --git a/src/lookup_kas.c b/src/lookup_kas.c
+index 16e639f..556cb62 100644
+--- a/src/lookup_kas.c
++++ b/src/lookup_kas.c
 @@ -25,7 +25,6 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
new file mode 100644
index 000000000000..d2a9a6b761b6
--- /dev/null
+++ b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/src/Makefile b/src/Makefile
+index 5bc6aaa..4eab2e8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,14 +1,14 @@
+ all: dropwatch
+ 
+ CPPFLAGS += -D_GNU_SOURCE
+-CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
++CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0)
+ LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
+ 
+ OBJFILES := main.o lookup.o\
+ 	 lookup_bfd.o lookup_kas.o
+ 
+ dropwatch: $(OBJFILES) 
+-	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
++	$(LINK.o) $(CFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+ 
+ clean:
+ 	$(RM) dropwatch *.o