Fix compilation with gcc-4.7, bug 423695

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

4 files changed, 35 insertions, 18 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index eea554b7130a..ecc4967e5686 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.120 2012/06/24 20:22:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.121 2012/06/27 00:38:01 dilfridge Exp $
+
+  27 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  fwbuilder-5.1.0.3599.ebuild, +files/fwbuilder-5.1.0.3599-gcc47.patch:
+  Fix compilation with gcc-4.7, bug 423695
 
   24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   fwbuilder-5.0.1.3592-r1.ebuild, +files/fwbuilder-5.0.1.3592-gcc47.patch:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index b4bf868e6372..341553300b88 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -6,28 +6,29 @@ AUX fwbuilder-4.2.2.3541-flags.patch 845 RMD160 11cf1b9b7ba867762170a8ee346f1256
 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
+AUX fwbuilder-5.1.0.3599-gcc47.patch 509 RMD160 31e8556d0b5efcbb15a9ebfd2cbb26cf2c844d63 SHA1 f643492f82e8729d7a4176cb6c6b1d588e6e215a SHA256 91d7ef708f94d31efecb1af6663efb825072ea77b0b4494a82afd3c6df3c74dd
 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 1274 RMD160 18b25ea37ca1a92912e1c2d98c5cd59f661ebf0b SHA1 4276a429f9194c7f64319859e3a3428c8c907a8b SHA256 7f547aef24aff71d756adee341abf1a371b8ccae6942f264d56dcae76101bae7
-EBUILD fwbuilder-5.1.0.3599.ebuild 1053 RMD160 577b24db101d365e1ab3be37709fbfdaaa6c8df6 SHA1 ec3cef561d520d1076ca7394047faa8b79d2e107 SHA256 d3ed24b9c3a719d7b6c748faa4728dbff831c80259b17780da37179ea6ebc815
-MISC ChangeLog 20035 RMD160 46fff1d603c43ceb4c981830e9af43ca48c03802 SHA1 53020d549d74b4ec205867287afa28573eca1267 SHA256 b8c15565d63107fc16b8b9300b001d571226e99fd7e18c014047becc17d53af1
+EBUILD fwbuilder-5.1.0.3599.ebuild 1097 RMD160 35be0d47c1d3bdd724978122996b66294e5679be SHA1 5ce2bfeb866d53216f85b283894a45e94243e9fa SHA256 d7ba9734b1dddd8181c6109886f4c6f0694ce0193f65b5f875a2f4bf6ce54b3a
+MISC ChangeLog 20208 RMD160 23f23a30cb95d8a623183062f77310d9077f5837 SHA1 e5b87d69a14b84287c502a38a3e192b88735e41e SHA256 0f5bfd637a0b013b497f2468ae3ed6a3ddf4b127da9b61a2608aebc6af0e5609
 MISC metadata.xml 206 RMD160 b967edd506f5c81d39d3780a4aea6de552ed7dc6 SHA1 506856689ca68d1a2bea94731c288946ed1ec80a SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJP6lY/AAoJENwGBM22xffeyisP/2qcLOJ9kmWETO7PT0p+Bz79
+bVmzP+g2ENBx7ZGKxory35spKNi5Zejx8IX1fXfwzc5iHJ9ojJDrumu3faNB3Ri/
+Rjn+lc8VILZzi6O0gvKUCwKuAcAqBFlnmnn/bB8muh3vD/fQHIDJKjHrw1V53GJP
+sI5S5iv84OF2ZqnHz6I6GBdTYMHatWNvPzBOeCzkZzvVm7FEjwoUcUVQdTH81s3t
+NBNoVLdQY/iAgLG+zpkdiWxnptbOOTKZsoA8dTjRDrTrwqLdAqWLccxQJCFVBT0a
+TBm6EUSv6IL/Rc6yki28EmlERGJaEyz52ECA/xFZRgqeE30i4UmL5lt2IbQrow3I
+JPkgJhQapOGHD/uI5CXZMV+JkoG3NNkwjP5V46Dfdg1xYz3YrDrPiDkY1POJmzWI
+POIxIZDprkWRIK1Y5drTtooIak4Qea8XmPjvSZLAyJDJSDTnsETwRNp/ECG4McXR
+Aolh2tUGLef1gvrLAC2Viym7tv5GwpA5QFnfB6xFu7wvQptNkBGAm3EMyONKvYKe
+tIPGfu6tsuMzIxixXjrS316kPw+btpzIzKVSu+Q/2i2cXn34RVYBnxa/Q349sE2a
+JBP4heL7xamp+Sga5THAkATptQxUWSMggZHO1jopOIjzjD2EZYn12LDaUYv5/Jkc
+diJlOibd5Pnbgf37pfRj
+=WO1y
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch
new file mode 100644
index 000000000000..c909028467a8
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch
@@ -0,0 +1,11 @@
+diff -ruN fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h
+--- fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-03-23 07:10:54.000000000 +0100
++++ fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-27 02:33:32.122340892 +0200
+@@ -31,6 +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.1.0.3599.ebuild b/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild
index 2189b3a30450..90f80cc37cc5 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.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.1.0.3599.ebuild,v 1.1 2012/06/01 21:30:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild,v 1.2 2012/06/27 00:38:01 dilfridge Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch"
+	"${FILESDIR}/${PN}-5.1.0.3599-gcc47.patch"
 )
 
 src_prepare() {