Fix build with gcc-4.7, bug 419667

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

4 files changed, 34 insertions, 7 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index aaf749fd4be2..eea554b7130a 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.119 2012/06/08 12:05:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.120 2012/06/24 20:22:28 dilfridge Exp $
+
+  24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  fwbuilder-5.0.1.3592-r1.ebuild, +files/fwbuilder-5.0.1.3592-gcc47.patch:
+  Fix build with gcc-4.7, bug 419667
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   fwbuilder-5.0.1.3592-r1.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index a1dfa397b73c..b4bf868e6372 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -4,19 +4,30 @@ Hash: SHA512
 AUX fwbuilder-4.2.2.3541-ccache.patch 930 RMD160 c0dcb60e659c3dc055dc45cb57d8091979654d1e SHA1 c9ae9432a59d56162009374e15d2defd86bf186b SHA256 869dc70d8a63b819e275d93be615f88df5d1bd7b0427ecfb29d766738f55bc4e
 AUX fwbuilder-4.2.2.3541-flags.patch 845 RMD160 11cf1b9b7ba867762170a8ee346f1256c6683a0c SHA1 d9acaf1cc3d5a9a3523d0923fb013317b68ab796 SHA256 6eb882ae30cebfbd7b735aae0f357db4067930b52e33b134cea6bb07628ed5d6
 AUX fwbuilder-5.0.0.3568-ldflags.patch 469 RMD160 62e73f3737687a6cb76c4294df2d981dfd3c16ad SHA1 874c2d805a9e77c72b70d570300b09caf554435f SHA256 65f549a65b7b7c605c5a2872baac20ba80c90a2e01c8525fd2e88884798f80cc
+AUX fwbuilder-5.0.1.3592-gcc47.patch 321 RMD160 8a00e759ce2e980e103facbadf949bb300f2a69c SHA1 719ac61b688fea56a7f4338b6db4694830512f0e SHA256 c15eac3235980e7bf4824abcf3a1583a7c3053fc7376e44022237e9cf64a07f1
 AUX fwbuilder-5.0.1.3592-stdc-format-macros.patch 1684 RMD160 bcba773067ca920309b6c1ccb1ead9f25ab0401c SHA1 e651b7582f8baed29784bee3f90b68360d74cee8 SHA256 6bb4ac02615247a7102021126eae788e67f9242c11e0b865a27ba2efd33f278f
 DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685ac9778c0d SHA1 d497564988d4ef78b7717dc06e2227486be498ba SHA256 90111e0d7fcad31a9eccdbbc4d9ca7ce5182c0d93e8f9dbd8c683c3c80980482
 DIST fwbuilder-5.0.1.3592.tar.gz 6733502 RMD160 a8bef66df683822261597e4311801ed782fae26b SHA1 d9fa64ab4e844b6f8cfaa8949524e3464aac2ef7 SHA256 22120de712844b5d89a3f2924964c16cc86f96f2156ace7c3f551bd0d713c94b
 DIST fwbuilder-5.1.0.3599.tar.gz 7182573 RMD160 38cb91aaa137bb5f0bc14b8d7e70da5a83467349 SHA1 4a693eb7d5cd51b5eb16e874540cb27c5b726dc5 SHA256 452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf
 EBUILD fwbuilder-4.2.2.3541.ebuild 1219 RMD160 0008ec9f79caadaf08049eeb0db451164a203fd9 SHA1 811d609daf9d9b993bf161f6d2c5a306d38d04ec SHA256 b28a676c7495237de6590def14c10f17aaf0b97f0d45601bce0dc288c487d315
-EBUILD fwbuilder-5.0.1.3592-r1.ebuild 1231 RMD160 8f0f9a0f4473995061a6dbab12c10e560f1ce600 SHA1 aed62aea5106666a705c43e0d0072ce4dbff228c SHA256 a98eea243bc2884752fd640c6d7bf492c111d26c53fd374ea6f75422435cf95e
+EBUILD fwbuilder-5.0.1.3592-r1.ebuild 1274 RMD160 18b25ea37ca1a92912e1c2d98c5cd59f661ebf0b SHA1 4276a429f9194c7f64319859e3a3428c8c907a8b SHA256 7f547aef24aff71d756adee341abf1a371b8ccae6942f264d56dcae76101bae7
 EBUILD fwbuilder-5.1.0.3599.ebuild 1053 RMD160 577b24db101d365e1ab3be37709fbfdaaa6c8df6 SHA1 ec3cef561d520d1076ca7394047faa8b79d2e107 SHA256 d3ed24b9c3a719d7b6c748faa4728dbff831c80259b17780da37179ea6ebc815
-MISC ChangeLog 19866 RMD160 3ed84258d244b739346ec2f6f3b30bd2344344d1 SHA1 0cad1b4b0e93a53ccdb2bfadb831594988951226 SHA256 96238cec3845ab4d0d4e8187dc6f51144b835e8e1ecabeacc5d431a3ec376100
+MISC ChangeLog 20035 RMD160 46fff1d603c43ceb4c981830e9af43ca48c03802 SHA1 53020d549d74b4ec205867287afa28573eca1267 SHA256 b8c15565d63107fc16b8b9300b001d571226e99fd7e18c014047becc17d53af1
 MISC metadata.xml 206 RMD160 b967edd506f5c81d39d3780a4aea6de552ed7dc6 SHA1 506856689ca68d1a2bea94731c288946ed1ec80a SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk/R6nsACgkQuUQtlDBCeQIG4wCfXxuBKyQEcD4GEGQZxlSKTQOc
-yJcAnRc446gdk2c2Gl8zxdlGsUdgeF8c
-=Loue
+iQIcBAEBCgAGBQJP53dMAAoJENwGBM22xffe8CMP/1WPZe3qQpr6Sv4spknGppiS
+AdHHGDMcojbYgZRYbKlDKLp1kxkaP9EfloE+k4rwkf3ESS5GrjqJlLWsxesZI393
+DgnPJTCyLyTr9Xa+qj/aY7zcNOalVoKFCGUxRSaxirLk9Clts/KouTrNVXumDKNz
+02LilfjcZHWW5Mzd9jBFfgD2xlRRVka8Lo4dtGudYr4OhDx2MoCHmpxcllYlj5Ib
+Wzl0GnWxBnlJzGbxZIA3vVeP9FDPBWnRYYiPWjOmXMmnW0YIyQTx3+kK7QhbJ7pX
+JJVgL1HGm9urC6mrxXCZRo4562WwS65v/Z1SU/ubj4EO9RgYx0udzCMEHsPcyKuX
+66gEdRRiQnwu+g7pY1mOrc9WqPccroLU6gM7y0c6GlDTF8FR55gZJjhOmHKcT4BK
+oS6NnlhrFbc+DqC6BBKiB1evZbgbBFAWIv9arT6Vo6xKgPBloCkI4DvgmKVxCzgY
+z5mqQWLXgjPay/AsMRBd3t3h2bc/OSO4ceCkCqnQxvR1KXJ9JBfxoJ8qAPKr2tDC
+dr15TgBHabkFspXv+eaBGDt+VG1Nku8N1XqUwbOYDveSR9jRZf5adkdWKqcw9f1d
+kBY4Qe8DtKrot3lACqExbLSVCdHtWesuMu+lCf198Hn0Omg43gMEhFutUTVPiKDg
+YcJz4S++vqfwj4/Ds0C/
+=PCav
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
new file mode 100644
index 000000000000..7849e2b6da95
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
@@ -0,0 +1,11 @@
+--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-04 15:02:55.909203733 -0400
++++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-04 15:04:54.079198998 -0400
+@@ -31,7 +31,7 @@
+ 
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
+-
++#include <unistd.h>
+ #include <string>
+ #include <queue>
+ 
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
index 0c2cc855fec2..30da16c75bf9 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.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-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.5 2012/06/08 12:05:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.6 2012/06/24 20:22:28 dilfridge Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch"
+	"${FILESDIR}/${PN}-5.0.1.3592-gcc47.patch"
 )
 
 src_prepare() {