Fix build with GCC 4.7 (bug #440000).

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

3 files changed, 24 insertions, 21 deletions

diff --git a/net-im/minbif/ChangeLog b/net-im/minbif/ChangeLog
index 20c18fe1cc43..db735e139efc 100644
--- a/net-im/minbif/ChangeLog
+++ b/net-im/minbif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/minbif
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.13 2012/08/21 08:41:43 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.14 2013/03/03 06:59:19 dirtyepic Exp $
+
+  03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> files/minbif-1.0.5-gcc47.patch:
+  Fix build with GCC 4.7 (bug #440000).
 
   21 Aug 2012; Johannes Huber <johu@gentoo.org> minbif-1.0.5.ebuild:
   Stable for x86, wrt bug #428058
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
index 193de74f1f7f..2cf835d08bbc 100644
--- a/net-im/minbif/Manifest
+++ b/net-im/minbif/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX minbif-1.0.1-as-needed.patch 2031 SHA256 f7e22e3de97e9eebfb8079729ea450634633a5323025cca32cdc94ca8c913347 SHA512 973d9228910299cd76a8a7c1c979a8b227e0e685361790c7a8cfa5e82b6a0d38388c12f931333e137d570bdd29aa7e6fbb86eb5cc54eeb941f36220bd97c26d7 WHIRLPOOL e7a776a5ee74159daf4d38f69bbce05e4c4c9333208aa7c76f3413c47d10f5e6e6c1c907c94af9c5911ec769ced9b1345a5113ac5a9203145dca52a87bc82cea
-AUX minbif-1.0.5-gcc47.patch 2067 SHA256 c219fb548dc591e47d38ccc506795140cef8ad732680afc89cb56d1ff1be9bba SHA512 46c6d7cd769799e3c069743d985b916137944610656a0fc12d52f91796c1a2c99a58549b0276e1c2bac2e84651866f73078a58b516e87a8d6e606113a0f7405d WHIRLPOOL 6e0bdde8868dbc022b7445ebd80d5ffe8f2007125c63e2a464ee51849416b265702e4e290c6e9891b66173f5b2aa7ffa5dfed6e3bc5e8991596911bf4bdf0fc2
+AUX minbif-1.0.5-gcc47.patch 1835 SHA256 b95081452749405842c55d38f0093f1f01691fd510f3b8fb9e9df3c95e19b9f0 SHA512 673d82b856af74b16ec5e9db8e5d17521e07369fc8f34902bd72ee1d630ebd13b47de308d4591091029cfed37eaca8146b762185c5761a245acf82e3546b9b88 WHIRLPOOL a76d0cad3ee51dc758a5e59f8559ac1aefca6da151aabbab038965d1fbd8689503bd7cde345997e6d50312aa1d8971c78da500baa925edcc1e98b45e3bef3ceb
 AUX minbif-1.0.5-glib-single-includes.patch 754 SHA256 65c27d01bd9d774da8ef38a1364bf74caf4ce5891776ac0cbb8e391cb57bab4e SHA512 fd7c27d1e171aa1e321e82f5e41e6908109101b52519dcad32a9107d14c95b0664dcf7d6ed1969dfce7397976712a6f094966bb06e36ff21fa0c75fe6d86ea91 WHIRLPOOL 9a42c62d9f9677d9768920dffcbd37690be34dc8ae9bd249b86d637aa013ebbc75596a232298826920f5d505e2ae92212dd01b5a0c9e6a4d704127c3851063c9
 AUX minbif.initd 561 SHA256 0a66ca96897ae7fb948150e1d7e01b328de2c2d32521de4c6fe24fdd2f630c7a SHA512 6106657567b5fca1255f30b89d2893f46e5593177c2bfc073676d9628ca31743b44d53e2864d1e1296e11b1d3b69f3037fcbcae3d12ac22e374c763cee4f19f4 WHIRLPOOL dae8be81c5f3844ed6684a99d05f99f8068148625710c813cfe807b6206550c90043995261c2954eedb6cd6dc6b51423546a282aa5dd6af09f87e4d1006d61a8
 DIST minbif-1.0.1.tar.gz 152815 SHA256 52e632974b65dc82396013979f3c76b8546366728f9f0e4b3685434a670e7771
@@ -13,16 +13,16 @@ EBUILD minbif-1.0.1.ebuild 1722 SHA256 b7249297b80145bd23f6975208c47c59b39cf01e7
 EBUILD minbif-1.0.3.ebuild 1933 SHA256 81b1f5549898f586feabc76dd77fe201387df07ea0da8c4c4e20f71cb86c5280 SHA512 4ffa4af711de51a1accb846b51dac9614698c522ca6359c46dbf28261457dc31eadbc31ea5a2ee5486f3e0c2f79c269f84477a3f4c9ad56f501abd36501de0ab WHIRLPOOL e50674433426b4427a0ae9fe084da4a7e36572391c19d9e3689616dd6381e131d1fe07b83ad76f8cd800845b9d7174bba5ec12a3ea51d884dab35b48d7ce7853
 EBUILD minbif-1.0.4.ebuild 1934 SHA256 d570b5836c27805ee0ba5a00d517d94bf588fc1b5e57894dfdb6a51681ab65ca SHA512 c9e6349154e3e4efd6928af92043cc113ed789e7561200fa2ea7222b92f5cfb3b7a6b9451639b53b80198b12f589da2cd2cc5a621538a245d3a4acb501a6b1b3 WHIRLPOOL 603c2ce7a5c4d953cac8cb91e4add834380bbbc9c7fbad32f12337033decd4ef4104ba70932cb54caf4898793ecbb69dff72777a7d8a4253e3c6825de3dc73a3
 EBUILD minbif-1.0.5.ebuild 2020 SHA256 d9f29950c34d7396ccddf0c9755007c5f9a5a39c35d7083adb119fb3c2446785 SHA512 99ed2d1fbbe0f82c2d6bf633a361f04737f9f640a3dc13b8d572e8c861b7e534890242d2b34e8eca9434f36addbd3d513478c416bb4af0f12eb1f52ad1081aa3 WHIRLPOOL a37912176936659a988e19856a362f4a09a92baf3f001e060a38aadabea91deea23c276347291d31a4a426f600ac039ae601e758092750e1650296be975bd974
-MISC ChangeLog 1985 SHA256 4f6c88104e625bbb86c770e19afa5a6c441ab240aca88a9885235f0cda1ee3bb SHA512 fa98b5f8aef0532f8c62daebf4110858d4566e10c028d0cf17fd0dc86b25e27a65c3a68db65349b5344d2162a45c0b8d7854c15739c3ab41c9114028cf3a3459 WHIRLPOOL 789e7ee8403fec788f9a29944b7d4c5351a9e38a8c6cd08ecdc1dafa2c81ded09eb5d4d7ed25dfd7c09ab83a1a1a2c525255416ab588fef6f3c774929089488e
+MISC ChangeLog 2111 SHA256 59b751a5554fbbe877e3532a0bdb044439c8dc93331282fba7c07e66f9a5c9cb SHA512 c5908ef56b8543dce8bd9a13e0e2eb02c43dbacb11e7c66248f13757be0b9be187b9b0a0553d549fac6f191fb8f9f26d699d8986d9ef4f497ecb92afa7de5cd0 WHIRLPOOL 5e8a3e7f6d6ff5cce00081dce2cc00128a3e72a5625e1fc476012094cb381a0469faba68496639c21f1f61939f0743759d5ec17bb0f31d4efeacd24be4b26b39
 MISC metadata.xml 373 SHA256 7e922d9249c3f82b6cceef62b87871536b9de522f224aa18adea08e1b0afbcc9 SHA512 8d401b433328fa82a5bbb40170dbc697c9e835c5eea907584f0c0cbbd130ce93122fe27cc5e0527710a956a7fd3eceea16d37de2daadf8eaf7f0dd9da62527bd WHIRLPOOL b2a0fe6fc0ed05409f25701e7c44394fcd3b1f2596995bfaba62b01932194a5e00ba2b8c90e999774f15f99cb1dab4166cf25f2edccfc7ebe31684178357b9dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQM0nMAAoJEO+t9ga+3I3aH8oH/A9MemCrSod5HqMVmaAyYpqM
-9Onz7DM9wAENzjPFw1cCPROFhvv65D6IQz0PNRIZpQEfzT5k1RY1UeN+0r+o9foX
-DtNG0ZVCwu8elRSxFJKwvwxwtTDSDDbxzXcjiOhzzKqE9nTCmc3+ETcVH21AG8/d
-7CaULUWkX0mG4/P43TPKNaeFumE9zp78z7jEjRtT4Ns2t55Ej7AToVnHPRLjqe0O
-nzebzqa5hmbzrPjuNz7+Yvi0nkxJ9QwC04jwIxqGqSo/qmNAq0L+CjF+di0+0Gv2
-XNfVWnw7ThbhWXQv7W8VsW6+VW/ndpOWgQiqPXDsgc/U4azVLVofKOkNx+Qt/x0=
-=87oT
+iQEcBAEBCAAGBQJRMvdLAAoJEO04vUmVeoRjqTIIAIvDBs2/lq4NeLESaA1nQQwM
+O7JG9iQTzazPTvNd5ZUMWiOO6T8jTaxGXmbng7TZemwnh48OnHzd1DkR3antpdN4
+fv3s3YDPApxvvo6OB1v5XO3AC3VZFWIqQZ4StrcpHO3IBAdjeMxznV8/rjhcBpRY
+kzgj/1zvwOekldJ6RU3pXolJvl9oVbm/Nku6nYHE04RuJ+fuhH6FrGWhUpVOs9eQ
+d/YBG0Sp7PMtH2Ql2PwwabjgBLKzfSd+0zLwRxVf26M/KI1tf567Yzlo/6R27llh
+HHT2ogGYRJ9aPGO4XRiwkE6x4GGAeR/YwYRfPySQDCgN2KmlSrYgnFdZ1aIDHFQ=
+=Fn48
 -----END PGP SIGNATURE-----
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
index dc49878ea1e3..8566406a318f 100644
--- a/net-im/minbif/files/minbif-1.0.5-gcc47.patch
+++ b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
@@ -4,8 +4,6 @@ Date:   Tue May 8 16:46:35 2012 +0200
 
     fixes for gcc 4.7
 
-diff --git a/src/im/account.cpp b/src/im/account.cpp
-index f155334..21baa5f 100644
 --- a/src/im/account.cpp
 +++ b/src/im/account.cpp
 @@ -18,6 +18,7 @@
@@ -16,8 +14,6 @@ index f155334..21baa5f 100644
  #ifdef HAVE_IMLIB
  	#include <Imlib2.h>
  #endif /* HAVE_IMLIB */
-diff --git a/src/im/request.cpp b/src/im/request.cpp
-index e72cbc9..a247e3b 100644
 --- a/src/im/request.cpp
 +++ b/src/im/request.cpp
 @@ -18,6 +18,7 @@
@@ -28,8 +24,6 @@ index e72cbc9..a247e3b 100644
  
  #include "request.h"
  #include "buddy.h"
-diff --git a/src/irc/dcc.cpp b/src/irc/dcc.cpp
-index 6d05034..231122c 100644
 --- a/src/irc/dcc.cpp
 +++ b/src/irc/dcc.cpp
 @@ -23,6 +23,7 @@
@@ -40,8 +34,6 @@ index 6d05034..231122c 100644
  
  #include "dcc.h"
  #include "nick.h"
-diff --git a/src/irc/irc.cpp b/src/irc/irc.cpp
-index 5d28acb..116d9db 100644
 --- a/src/irc/irc.cpp
 +++ b/src/irc/irc.cpp
 @@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
@@ -62,8 +54,6 @@ index 5d28acb..116d9db 100644
  	for(it = users.begin();
  	    it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
  	    ++it)
-diff --git a/src/server_poll/inetd.cpp b/src/server_poll/inetd.cpp
-index 4f3023d..f747e74 100644
 --- a/src/server_poll/inetd.cpp
 +++ b/src/server_poll/inetd.cpp
 @@ -18,6 +18,7 @@
@@ -74,3 +64,13 @@ index 4f3023d..f747e74 100644
  
  #include "inetd.h"
  #include "irc/irc.h"
+--- a/src/sockwrap/sockwrap.cpp
++++ b/src/sockwrap/sockwrap.cpp
+@@ -22,6 +22,7 @@
+ #  include "sockwrap_tls.h"
+ #endif
+ #include "core/util.h"
++#include <unistd.h>
+ 
+ namespace sock
+ {