Fix building with automake 1.12 (bug #426484); fix building with forced --as-needed. Patches sent upstream.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 63 insertions, 30 deletions

diff --git a/net-analyzer/flowgrind/ChangeLog b/net-analyzer/flowgrind/ChangeLog
index 88a8fb69ebaf..9d6f6d187207 100644
--- a/net-analyzer/flowgrind/ChangeLog
+++ b/net-analyzer/flowgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/flowgrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flowgrind/ChangeLog,v 1.3 2012/03/21 05:01:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flowgrind/ChangeLog,v 1.4 2012/08/22 00:42:56 flameeyes Exp $
+
+  22 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/flowgrind-0.5.8-gentoo.patch, -files/flowgrind-0.5.8-cflags.patch,
+  flowgrind-0.5.8.ebuild:
+  Fix building with automake 1.12 (bug #426484); fix building with forced --as-
+  needed. Patches sent upstream.
 
   21 Mar 2012; Tim Harder <radhermit@gentoo.org> flowgrind-0.5.8.ebuild:
   Update HOMEPAGE and SRC_URI.
@@ -13,4 +19,3 @@
   18 Mar 2012; Tim Harder <radhermit@gentoo.org> +flowgrind-0.5.8.ebuild,
   +files/flowgrind-0.5.8-cflags.patch, +metadata.xml:
   Initial import (bug #344923). Ebuild by me.
-
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index 9a5245463143..90b0d9769ddd 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX flowgrind-0.5.8-cflags.patch 335 RMD160 877c28aa1ee6d117fa104194629a026b24ea70c0 SHA1 878bf754d97fe312b9f99efc0fd6149003bdfa96 SHA256 bbd7eebde783b7cab245725fe8b6b1e9528d26a77106fcaae5dc7528ed59ec16
-DIST flowgrind-0.5.8.tar.bz2 171161 RMD160 b4e8b0d7bad2dab61fcadd4609374f0d01f6eab3 SHA1 8480a578725e9c2e7120905e37e4ea6f475b862d SHA256 318fc9936c6b971b7c291f2931eb1b1c5b8f96e44326eccb85f29fdf7a893820
-EBUILD flowgrind-0.5.8.ebuild 785 RMD160 d8ae34b0ae392d9c8ee0c35aab3418145f604eb7 SHA1 8687490b6af87b42d8792dd2c3e93f1c0794b58d SHA256 457b852d6dfc47234beb350f0623f1c5cdcc8dc62cb124d9ac98f26a7cb920a3
-MISC ChangeLog 625 RMD160 03fa54d452c9fe8255cdb7617af9d69f140ed41d SHA1 91a27a2da6358a4e6fd812a8e3c7d0ff0e6ed14a SHA256 2526f777fcaf63bb4786771cae877915553a57cd5d276ba2c7e9454390006950
-MISC metadata.xml 268 RMD160 56cda669620ef531e13b96e7af220d0562d719a3 SHA1 ec08af0214bccd59747aabef2d29862c44142952 SHA256 696354fe5c6f9edf6f2415ae6df6be2bc3027b6b3705e4567d1d4221b85b9a5e
+AUX flowgrind-0.5.8-gentoo.patch 1005 SHA256 fb00f79e6cb28d96e587bb877c5f2921c6762e3fd92a474f246b31e8a827841a SHA512 a80ea546616084fef4538028bed5fb677fbb40fe603950ff94aa92b68eb8f9aa59f7b3c00697b652ac0998dbfc2b54e5a9d525d804d1be45a253a389f1bffc80 WHIRLPOOL 98d1e1c42861cc6ac5f6cb9138daf8460515a29131132476cab1cb45ee17edd5203c52ec8120dd632e16f25ce710ec93db8b6d7db233bc35bbe2f96f0ffe77d7
+DIST flowgrind-0.5.8.tar.bz2 171161 SHA256 318fc9936c6b971b7c291f2931eb1b1c5b8f96e44326eccb85f29fdf7a893820 SHA512 8996d5531404de8c70073e428f8b1a411cb9389b4985558f86d73db74e914d0862d5d93ddbb7852081afb3a88fbfa58c0e2c76cde3d72a08927a8d51e8be0952 WHIRLPOOL 1cf5eca0344b4b4fd571cd4d6a08ec7d376edace66f4310d920f047333e9c410c49e089bf4958148891dcaab0c00a1711ded939df8dd7ba58eb4bd7b62f4f515
+EBUILD flowgrind-0.5.8.ebuild 856 SHA256 72b6348edf21718377a4ec3b33e55857187dfe0e8f4461588e2ecaeca8380898 SHA512 a3a0a59ee51dfdffaafc903257b51b7013920c6b232c99e6a66fee39aa79d030b8e8eb8afe821d841ad12abfdbb0f8de69c8032cff0c5dd28bdbf2ffcd1606fb WHIRLPOOL 564fe9f58f2d8f728d4e36b7ef225005489698b267fa1a359361902440553ac4e69132db3f84a6a8e38b0ebc8815dce8ec91a03f6674d64ddd5dfbeb78838504
+MISC ChangeLog 896 SHA256 7ea85cf7757de7634255c4b17cf68d645f40b053cbef2946ea10d8f49b0bc47d SHA512 b9ecb7477315922e24d28e90a0eb6e8ea46b17a86524a7cfc01f473bef42c7c17c2a88159326365f611cdb52015c5eec1eeb7428f1452c67746f0bb599ae949c WHIRLPOOL 3bce8ac6ea519c499610fb0a45a256523a47e64e9c0b4c44a42b64a997dbecd16538f111501b441d2dd2b3bbbccebdcd017318fa9f3a20b47c5a2581c5d197ac
+MISC metadata.xml 268 SHA256 696354fe5c6f9edf6f2415ae6df6be2bc3027b6b3705e4567d1d4221b85b9a5e SHA512 4af22c8d924b52e2ae869f0dd05c721a318d2ce452b2f68a6b3a981d12ab44cac8c51afdb01f4ff8a1412cf04f92d9bb3da636d0892d430765012fe88f7669c0 WHIRLPOOL ee2a3b92d17536b07286afcb95c68bbffc6de9a6efdb9d0f02d74a4afbd53e65f2fc1bbab0dad4dc30d52341c53ad1d02d638a2c81275914d4bcca5b09e24538
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPaWC9AAoJEEqz6FtPBkyjVFIH/20PXBRiHVtsfD7QseGKK9Gi
-1MzwLDRT70FLcmbFGTpQzPsBuVNn2Q4jeeNSBF12TxImW8N4p6MaejGUWta/+kAf
-iRXbMWHDTrG7qHLPRohhTtNVrXvv96WlkpAEsxYiDTzbCzWybpGhc/F01aEge2sq
-g64wC53RtV2yAwgLZ/zucCSovkpCqnEFfJzlZu4yUyskfCM3A/6DdM9k8fgyiL/g
-GboOfIIKpjmqny+BtgdK9EJnFFBGRa1X58fBrvvSocDQGXdt/gOdfayXoT9xEmqR
-T8yt8vY3jkJb8Kq5+BBruYIOsQ3G7v07pGJ3KmT9Vlvwk1RY6cn7nU+kcWnBDEk=
-=52Sp
+iQEcBAEBCAAGBQJQNCscAAoJEBzRPIrUMBNCrjAH/3c1jN0THOn2xPAcUKZOUME2
+CIkgyEGcCLZIvrFSEJAoIjaOHAASwMuOroe+A+s7y6gvuP8Om3w1Y5L4Bo3V6JnT
+txT7jjsubChtUSHUWgSPU1nzaAyspyJsSI4d5RF6R+N2bxh198T1mHTemQMMCzrR
+ppdXqbWG1++aCQuGkZzt7ttO2VkIvDTD1NG74g2HPRPo6G2PU3mtNvCYhcXQkHFr
+1zavq7YbY+fGpb9jqE3X+GmYxEPxmqa2TSW/edYZdDQHz9fxqWiDHeDmzUkuQ0Kx
+J1TZp+tNImiwOzcsA4iUIfr2pWbLU45r4lTRKvDJxH0j0q8M/QMnBI63Ug5ubmY=
+=RTAu
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.5.8-cflags.patch b/net-analyzer/flowgrind/files/flowgrind-0.5.8-cflags.patch
deleted file mode 100644
index 2f7b11eefec6..000000000000
--- a/net-analyzer/flowgrind/files/flowgrind-0.5.8-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- flowgrind-0.5.8/configure.ac
-+++ flowgrind-0.5.8/configure.ac
-@@ -135,9 +135,6 @@
- 
- if test "$enable_debug" = yes ; then
- 	AC_DEFINE(DEBUG, [1], [Use debugging])
--	CFLAGS="-ggdb3 $CFLAGS"
--else
--	CFLAGS="-O3 $CFLAGS"
- fi
- 
- AC_ARG_ENABLE(pcap,[AS_HELP_STRING(--enable-pcap, enable lipcap for packet capturing [[default: yes]] )])
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.5.8-gentoo.patch b/net-analyzer/flowgrind/files/flowgrind-0.5.8-gentoo.patch
new file mode 100644
index 000000000000..5f6dca0d7cde
--- /dev/null
+++ b/net-analyzer/flowgrind/files/flowgrind-0.5.8-gentoo.patch
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index bd025e5..2c78c96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,6 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
+-AM_C_PROTOTYPES
+ AC_PROG_MAKE_SET
+ AC_PATH_PROG(PERL, perl)
+ AC_LIB_RPATH
+@@ -89,6 +88,7 @@ AC_CHECK_HEADERS([ \
+ 	stdarg.h \
+ 	stdio.h \
+ 	stdlib.h \
++	string.h \
+ 	sys/ioctl.h \
+ 	syslog.h \
+ 	sys/param.h \
+@@ -127,7 +127,7 @@ AC_CONFIG_FILES([
+ AC_SEARCH_LIBS([log], [m])
+ AC_SEARCH_LIBS([clock_gettime], [rt])
+ AC_SEARCH_LIBS([socket], [socket])
+-AC_SEARCH_LIBS([pthread_mutex_lock], [pthread])
++AC_SEARCH_LIBS([pthread_create], [pthread])
+ 
+ AC_SUBST(LIBS)
+ 
+@@ -135,9 +135,6 @@ AC_ARG_ENABLE(debug,[AS_HELP_STRING(--enable-debug, enable debugging output and
+ 
+ if test "$enable_debug" = yes ; then
+ 	AC_DEFINE(DEBUG, [1], [Use debugging])
+-	CFLAGS="-ggdb3 $CFLAGS"
+-else
+-	CFLAGS="-O3 $CFLAGS"
+ fi
+ 
+ AC_ARG_ENABLE(pcap,[AS_HELP_STRING(--enable-pcap, enable lipcap for packet capturing [[default: yes]] )])
diff --git a/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild b/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild
index 8d2eb5b04023..b1cdf21eae4e 100644
--- a/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild
+++ b/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild,v 1.3 2012/03/21 05:01:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flowgrind/flowgrind-0.5.8.ebuild,v 1.4 2012/08/22 00:42:56 flameeyes Exp $
 
 EAPI="4"
 
@@ -21,7 +21,8 @@ RDEPEND="dev-libs/xmlrpc-c[abyss,curl]
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
+	# see https://github.com/gentoo/flowgrind/tree/flowgrind-0.5.8-gentoo
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	eautoreconf
 }