Add patch for proper compilation with binutils 2.23, wrt bug #457980. Thanks to Andrew Savchenko for the patch

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 96 insertions, 7 deletions

diff --git a/dev-util/dropwatch/ChangeLog b/dev-util/dropwatch/ChangeLog
index 287bcf974190..de2a7bbdda58 100644
--- a/dev-util/dropwatch/ChangeLog
+++ b/dev-util/dropwatch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/dropwatch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dropwatch/ChangeLog,v 1.1 2012/10/24 09:46:02 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dropwatch/ChangeLog,v 1.2 2013/02/18 11:56:18 pinkbyte Exp $
+
+  18 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> dropwatch-1.4.ebuild,
+  +files/dropwatch-1.4-binutils-2.23.patch:
+  Add patch for proper compilation with binutils 2.23, wrt bug #457980. Thanks
+  to Andrew Savchenko for the patch
 
 *dropwatch-1.4 (24 Oct 2012)
 
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index c6b00004b6d8..0d16e836c5ea 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dropwatch-1.4-binutils-2.23.patch 1712 SHA256 8accf3cd241faa974015676e2bd1d3eae01f094fb7cf803c74c26f70766adcbf SHA512 354b81734ff9d0811bdc3d6c6e54716be101fbc95df1e250c4f6c82c4f28dab99b6a220e1c7c82b7033e39e42fbb99d2915d6ce860ef1cb1f0f6fbe5e581005d WHIRLPOOL aba33f939556d2d808916ca2598841210e249bf63708f9a3f62988bfc24930ff6092b1c891e0833fc959197a34a72e298edbf115a4cf0c690e5aa1dabeabb4d3
 AUX dropwatch-1.4-makefile.patch 639 SHA256 d966d5e8a0a7f15e5acf41dbd63d2670bf472013619d83a1fe721f2d59b58752 SHA512 cf9756fe238041d5a9a764e81f5294832146905a809fccff999cf45d28015fc70ac0239b57b2e7d994095d5b45b484ea2b14e36210cc10bc1e4ef8ad3d9031f5 WHIRLPOOL b03ae2ed1005b384bc5948a9a01d16ee22d1016d3ab900403551684d49a0872aff190bde6447fd3165bb6bb514b1547016a62066b2d31dd9dce8e3208e99bfa8
 DIST dropwatch-1.4.tbz2 32199 SHA256 ede45fd3b4a847a9befa73e9e8f6336aee5418fc3e041648c684e5085113a3b4 SHA512 a5744ea156464c53d31d5b54bcaf9bd61f2035285059bc05a3eec20be71d1451a6191237f194dc5d8e6fb6fcbb81d9ef87adf5ac2d878cc1f159191c47118e29 WHIRLPOOL 3d8661ab85da0a7485e8f6312eeb99e1ed14f6af38d119093c835e94f518918908e596d3e5744be5f529d280b6644b459106eb503112df58b63865737f8eecc1
-EBUILD dropwatch-1.4.ebuild 927 SHA256 0d59bc86337af4c85e58ccbdb5bd78e862d04f754eb5cf1b8d4a7c95f6410572 SHA512 2a0df7901d0999c361e2fac396f7015452ce408247fd6970e50e2d8c6420455964c422a83b262b1be6fd61f9d03addacd6eb79d79369db753443cbf77facf1fd WHIRLPOOL fc0a4bb3971bef04024bbb5ab0dd9ddfaf4b7d7b25d4b08d4c2cc451703ba5280cd4ae2be2efa8aec33009a261bc0eaf32919f90d6664e9b88a29b84aeb65716
-MISC ChangeLog 577 SHA256 87025967a8b2fe0df5eae29d0a8552a3f9245513bc4af224fc35e976135270d0 SHA512 4214a24546dfb8c81ee1684af4f30789449f216a688ba60cef1e58cab1bfcea1102c32bf5a0cab848e157acd2489e8f5a1960dfbdc1d5a3ad0eedbfa8c00a6d1 WHIRLPOOL a01b188dd77c336051f600844baa8edaf8db4bd84fa9d35d129841095c4b99d672a54ad7fdfc26544e35d146c3f9301e00777571e7a19fa42709fda5437e0892
+EBUILD dropwatch-1.4.ebuild 976 SHA256 ddcb09e907181a48f8cec6d5b6ad1e092f7d1b76319079f2cb5ff4a2ff84a063 SHA512 cba777679afa496b5655a0c866cc15d285aa70743e37594bff6681f22a5c2050040db25d4c120b0e34ad781d2eaeb2506b7fad68cfd3bcf68e3dd7368194236e WHIRLPOOL 18d3631cf337941579e3648342c762b0da06cd25083ce0a7798926e2c1fa0b71fd0983d54a0ffe1c623797da4ac9f7dba0b13c22e0fda396809d350ca67c1c06
+MISC ChangeLog 809 SHA256 ff3c4318c0d13858a049396d0692dec97d0b628d83ba5a4046b9da3acb222280 SHA512 eea95854ea60332656a7146a1b185de6bb2bb19b8302522ec9df6725f901a46938a4327ca7492ab763e5de431a569ccd3eba2ab15e450eaf0af41447bbb7eefe WHIRLPOOL f07d23c19f477f58ddca3f6d54853af4b13c60810b8de2c8e5902362f6bb34fdb4e909a47b7b89651cbd13a6195982272d0d9f70c42028437b4e32ca097682b8
 MISC metadata.xml 483 SHA256 ac1fa8e3992eac90bf348e2378fc646ab350b906a209b937dfb6054ea83ba21d SHA512 702aa2eda4cec54dbf47fabb16615d875b4693cd8aea94f7f7d9ce3a9827e01fa99b859aa60d19adb2d31356372ce34fcf48badf8d699dddd913017ba469456a WHIRLPOOL 8899d73784f923b8b2a33e344a94a2cf5c52ddf0487a73c5aea8d5f0467a381919323069dca599e2dbf6152d5ad766c3a09a3c56ed1260a471c852755774ce9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRIhbjAAoJECo/aRed9267pAoH/RhrGRo2TmZzxV0FQZtlcBAV
+HbRhgLzD6su2o2IMiiIfvlKcTTKpkXGjevTDAYSrKLbg5fEHsMwycRHrDmeetLGr
+QeCsUJ+CaSvMhYpGKngJxIK2ICf3UljkamqwalXNyp+9bT+geunkGMu3ALygnXJa
+ZyP7xLDm1wzzKghXKfqXf/jZnv95m/jE6xAc8PkkBWLSLt5KglcRkotzth/4P43d
+GBCxAXn4jF63wJjuj4EArb4GtG4RXO1VtghwkLtjgAdT3+cNM4McavuCBt1kw9eh
+iN61OS1z1h3CiOk4Jqo4x2uh1vR5cTMIFEtaEqaqLSQmTD10rHlZgMtMOL3pAVo=
+=/9U0
+-----END PGP SIGNATURE-----
diff --git a/dev-util/dropwatch/dropwatch-1.4.ebuild b/dev-util/dropwatch/dropwatch-1.4.ebuild
index 9fe1bd165c60..995ea397f5ed 100644
--- a/dev-util/dropwatch/dropwatch-1.4.ebuild
+++ b/dev-util/dropwatch/dropwatch-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dropwatch/dropwatch-1.4.ebuild,v 1.1 2012/10/24 09:46:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dropwatch/dropwatch-1.4.ebuild,v 1.2 2013/02/18 11:56:18 pinkbyte Exp $
 
 EAPI=4
 
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 
 CONFIG_CHECK="~NET_DROP_MONITOR"
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch"
+          "${FILESDIR}/${P}-binutils-2.23.patch" )
 
 src_compile() {
 	emake CC="$(tc-getCC)" -C src
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
new file mode 100644
index 000000000000..43702c4ff385
--- /dev/null
+++ b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
@@ -0,0 +1,68 @@
+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
+@@ -27,13 +27,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ 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
+@@ -28,6 +28,9 @@
+ #include <stdlib.h>
+ #include <asm/types.h>
+ 
++// satisfy PR 14072 in bfd.h
++#define PACKAGE 1
++#define PACKAGE_VERSION 1
+ 
+ /*
+  * 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
+@@ -25,13 +25,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ 
+ 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
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -33,6 +32,7 @@
+ #include <sys/queue.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ struct symbol_entry {
+ 	char *sym_name;