Fix compilation with gcc-4.7, bug #422763. Thanks to Rion.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 13 insertions, 30 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index cc011fd1ddb0..da3a2ada39d6 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.231 2013/03/02 22:53:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.232 2013/03/05 19:59:54 maksbotan Exp $
+
+  05 Mar 2013; Maxim Koltsov <maksbotan@gentoo.org> psi-0.14-r4.ebuild:
+  Fix compilation with gcc-4.7, bug #422763. Thanks to Rion.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> psi-0.14-r4.ebuild,
   psi-9999.ebuild:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 68e6fffda94d..1a9b86c4e76b 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,34 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX psi-0.14-drop-debug-cflags.patch 1098 SHA256 ca7878131af3697275fe7b83ffdbd89886ba6cea27a38aff495b0eb60c5ca5e6 SHA512 56f7dc088b8a6f8d06638932c1c5f2bd08461fd87764e1690fdeea9e28f266b7a8d7860b048db56ed6f98411a9f70738e1babd54248d2a0b5f055e6efc53e6dd WHIRLPOOL 47096000792e25ec80addddccb9d104ded35296d195ebf99b72ec2dc61d391657467d8d231262e7e3f60c66079bf199540faba3671b61f6c802e75d40724b9ad
 AUX psi-0.14-input-validation.patch 7440 SHA256 4f8f52b6846b238586d8584d8ca5a62b56bd5bfad328765eb157dc95c83bf017 SHA512 e6f1676c57c71c5b43f1e913299cdd2ba5323dd39f2d255d8aee7ca63a429023f6ef477382894e4d358c08ae1b64d4ebe369aaa0c3b237fd7f6f72c508deb329 WHIRLPOOL 08bd4fd7ef168b474b5bcefb4d0bc43c85d7f9361661c445cd7203502beda4343ab45cc4f0477a00dd15d40bdf1d8c434736bb2f2fd803ed11ee3c15d60ddd14
 AUX psi-0.14-minizip-detection.patch 6587 SHA256 7aba10692d2bd371f0c009abc8e99d2267f47a1ac15765294e232bd0ecd15f31 SHA512 02d62baa6a65c99ca631deccc71beeb5cb521a457535c01e71b04e6f6eb1f58ea54d43b27b9d331731d49123d8d4681a4788c89aacb5afb84faf9a78896d2474 WHIRLPOOL b8dcd6eece7a022eb9cdd7cfd696fcf65f8672689141fec6881f7d21fa2ca016bec494c7d1672a38343827c11d82ef3fe4b07517df3969caa6d51d638429c261
 AUX psi-0.14-qt-compat.patch 1492 SHA256 1af6ebbe01094519fcdbbe442a3c5798d499da134a08787648e71783e7b0ba60 SHA512 8b9d0d01e74db9d833b81b0efe5bba266ccf0031086e6b24dad47782293d3d710c38abd36a562dba48ce7491a45461cb6b765fd6e923316c2997b298d7b12f1f WHIRLPOOL 0b31040fa09944bc442403d256ca0fab55d6f3dbc4a5bebc03ef779192592536a956691a95db08bfc486a6d44c6e93da22b1b39f64eefef7d5460abda8e50c91
-DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
-DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2
-DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c
-DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
-EBUILD psi-0.14-r4.ebuild 4827 SHA256 a5a7d3402dbcb4253688cb1858e60478b2248ccf314da80813201aa0efe7d7b4 SHA512 4a19c808460208e5b54646341b2d749983e0efe9689165b4dc2713d3b3cc8bc45cc13aefdd97ce45dfa2761b162b7af34ffe6279e98dff9e10c2e82a91eca7f8 WHIRLPOOL 790212739257fa7af19b0776aecf5aa1a8d27ba42155501bf28fcd78be3e0aa7b63036c04efe18cbbfe6cdc33210df2e63a7afd1ed82aa9784af315253876744
+DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d WHIRLPOOL 95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da
+DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9 WHIRLPOOL 79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a
+DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
+DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
+EBUILD psi-0.14-r4.ebuild 4951 SHA256 46b6ef6204fba0498ce875634eec176aad2c945bf08a71bc26326a8405a5c252 SHA512 dc450cee01b709f1d66ef1895c60a8f4f85f942b9ab460a33f48de7fa350248bc5459f4c8c7b0029408451167119d8777e5213b85aa237890a05551bb598dbbb WHIRLPOOL 6d0fbea341c8e45f7406930955b29414deaa737d54c491de7f3d9450c80558fb3ab76dd1ea8fd10a2bfcc08fa74cfe2ed86bfe225b9d2312e577c9bdbe70aec5
 EBUILD psi-9999.ebuild 6318 SHA256 7620ec81c40c8610042298ad96b7f08b8a2b0421f6f0cae46716d2e9d3d97736 SHA512 7c5697a71d72447b848338823a3702aacad6aadaded2f1ace70a3b372f8cbe9ee5d4a91c283e8e79c3fa9ec3c336505ac8f422395f00610559b817a420a8ac3a WHIRLPOOL 2d62929f8e85390c919e6f083556a469da89c7ce18a590dce4abae20cad06c75008a9e1cbc0ab22f2dc47ae1d17ef2b57b70dbe4c79a7ac7e50730f6cac6b9d0
-MISC ChangeLog 34087 SHA256 1504fcd05c64a6365e2463c3d8796131867e6cda4a708bff527a63f77eeb46f1 SHA512 7a1df9ffa7a5d4c23d1bd1fa8e5f386acc35f8e9f2c499b5fd6c87067c9e9da228fdb2d0b577bbce79f80c4decac7d66e561716082670bceee65ade643df4480 WHIRLPOOL 5bbba4733d01b94fbf913ffca849d6d884a5ee2fe0e4d3e472a2f91cdfd16f5fe036c16db7f71f53f2739b9382ebc5709a2eaacd8b9d4517a60b8d96015289f0
+MISC ChangeLog 34222 SHA256 25ae8957619d5ab646b1a58285c62af317cc7540316757eafc6aef84bf1cb8a2 SHA512 57f3db866f633a5a917bee4947b295bf1ecf2bda1e98f37f51ce5a83a76f62a9e58096a68493b44b3902b56d58bae692a249d41714f51257badce655e989fe40 WHIRLPOOL bcfc94a53fe12544b1371bd1538b5fcbc3c0ab088872e7a4c50b7afdaeeac942c0d2d8c0cadb9a37a483ebde7047042664056f1bb75a8c30f056de8031d5552a
 MISC metadata.xml 986 SHA256 71fce663523d5e5d267c8386e591051369615feb73c041b2e9a9c9781e84c90e SHA512 1ff173229530ad365d6282b1446a46770b394acefeb2154165fea09c51c1f193be9a37bb4d8a1b2a108c88d57acc56cd63c38ef44f8b18ee1fbefe2838a89f62 WHIRLPOOL 896a6805d77262032de95fd8ab62ca8925aa29970858fb31040828a577a5e591483b59cf4caa445a536cbdf4017fff5ab426ac4251d8f145a67dfa9d7e7a5ae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQJ8BAEBCABmBQJRMoLOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887IwQAIgnNNXqnvY3gYTIIeFex2Wm
-bkbvWjxv4XwXqQbpBmQVNBPSr47THGr2Uh0yYOyoJE6gSmoFaYE4qlqdqPR361SF
-4Lkmaz37YIErN62bhvi/X0tKYQwiWinAvWxEcuvP+iKHoCYRlhHTruma59SlYO82
-ivS5txHns+Dv5oALeWweyRcKCODfAj7vSggbn651yDkydDvmBpqvDGQwjXpDZRiV
-sNdjHG3Kkmhq7DF15qOMKnida+5o1vTdzy0LgA+A0WvnYBgH8WqfBpgG/fr/dhMf
-6ZeYoVD4wuKf07eTVApRk/ypHSnEwzpCcAEEedzxA44HhuT70qfG1wN3W7X2nnRl
-jQjhhpPNzcruA1IPzA/E0kOc8HyIYawmSMfNSLzDy1FwW6qufrCsjVw28OViWpsS
-6zCbcqxstYVPUSZwpgwzfYDUMx5/OMJZ+1PZHV27qYWNia8i7cqrc0nm2YRU1MD8
-QoXO0A3496sVTZdlaR69RDOEp6NfHiWJBDAqK0AqVP5SjI0doSPoUv/Q8yCwIHLA
-yMymS/YVo6keDsPSWVGjMqY6vL8CsbEjcT2dDdLgzPl/z2kgfjglO2+tQJJRPYQ4
-NpcJWJNqBsbtWksw1emcMkWClOM4yfrdfW/+BAkUcX0n6UHU2MnxBjojOFbdN30H
-CCTYH00uHA65buggQN2K
-=4XnG
------END PGP SIGNATURE-----
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index d11f49bc4caf..9f2ea1bbd8dd 100644
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.12 2013/03/02 22:53:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.13 2013/03/05 19:59:54 maksbotan Exp $
 
 EAPI=4
 
@@ -55,6 +55,8 @@ src_prepare() {
 	epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
 	epatch "${FILESDIR}/psi-0.14-input-validation.patch"
 	epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch"
+	sed -i '/#include <errno.h>/a #include <unistd.h>' \
+		iris/src/irisnet/corelib/netinterface_unix.cpp || die 'sed failed'
 
 	if use extras; then
 		# some patches from psi+ project http://code.google.com/p/psi-dev