Add patch to build with GCC 4.7 (fixes bug #422873).

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

4 files changed, 62 insertions, 7 deletions

diff --git a/app-crypt/eid-mw/ChangeLog b/app-crypt/eid-mw/ChangeLog
index 7e3c9dbfdb48..a750097d5e9d 100644
--- a/app-crypt/eid-mw/ChangeLog
+++ b/app-crypt/eid-mw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/eid-mw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.4 2012/06/24 08:38:34 flameeyes Exp $
+
+  24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/eid-mw-4.0.2_p1188+gcc-4.7.patch, eid-mw-4.0.2_p1188.ebuild:
+  Add patch to build with GCC 4.7 (fixes bug #422873).
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> eid-mw-4.0.2_p1188.ebuild:
   inherit multilib for get_libdir
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index b432a06c7fb8..fccdc950db9e 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,14 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX eid-mw-4.0.2_p1188+gcc-4.7.patch 1091 RMD160 edb054b4ee77d83e641dd15e41b4dd6c2fad6c76 SHA1 61778ed9c4beada389535f8539ec6b67dec4fff6 SHA256 40cb2d5fc3da5fb4264a2bef56d972092b4b08e965a8aae67aca04f30eb6f94c
 DIST eid-mw-4.0.2-1188.tar.gz 10701112 RMD160 f394f5ba2da7e517f63ee922b0bb56f50402d7d0 SHA1 a659800484f993a403881ab593df655ee834da1e SHA256 8975ab424b9341f80fd40009c67b7c31da5aa1cb2eef823d97477f61a1f19c0a
-EBUILD eid-mw-4.0.2_p1188.ebuild 1724 RMD160 8c1aaab7e2068a0f283fca879e98b004fb1debb4 SHA1 3c7ef4fb81401b55f05fd3e5f4073964d9e78f76 SHA256 84c75cdf66d137ad8a39b8ef94fc20763f0f9c024b34f9e528fdc62e8d141d9d
-MISC ChangeLog 616 RMD160 57afaa795ec3d2312a99ea9a6dedeacdfd7050d8 SHA1 c83270d5d47e990887e5a242f3255fa23695884e SHA256 9408333a229a3a98f5ed0d6acbff94f095bec58b68ead2329f0248a1cf5296da
+EBUILD eid-mw-4.0.2_p1188.ebuild 1793 RMD160 1b318bc17e8e0d57331e84fdae0624bccd4cc918 SHA1 68c449706523d1a82804cd72b07a019e768e72e5 SHA256 c6999c1265f6632f566a5b65c87c0d71d635fa36f80fb28de70c49d48d72d0b9
+MISC ChangeLog 800 RMD160 4e5aa7b781e94f28913704e7a4c512012eb89e9a SHA1 addaac405e3a1d5fbd5c487530b5219437626eed SHA256 bab5a309fcaf5af343ba8aaeb37a3c1347545ff461d1cb01f1fcbaf95709ee59
 MISC metadata.xml 1237 RMD160 f53eeaab36e7de219ad4fede778a1b4d69c7558f SHA1 6d1082879632c8187433af1fb5c56d619ca694d4 SHA256 64c2789f074982b103a7c7e99960216ff30577fd6345a5c7162604b978f8632b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/G4SoACgkQ/ejvha5XGaODxwCeLl4cJSyVNzV5c1I72hPEHAgO
-trAAoLXAXfx01na3BJZtdxL8ujZP4yLL
-=krga
+iQEcBAEBAgAGBQJP5tIWAAoJEBzRPIrUMBNCfOcH/RfJBDElZiNQdfSZq6cGMJ1X
+B3TP6K8rXVIzljfefSsl42zD+DoUtAfHdhcUseS/NvaIqAQlI1EumDfUfBGQ2hdz
+m0Q2QN0K6kxsMIqOYn95iVYwuWaEvGQIrwJ0oKmP2WXyRRxjXf1BFIcfY/pnBB6D
+GF+fBNceNN1lVsfnBw1LfE+MPJ2B/7ZxU/1Mo8GvgMm+a1RA7RbM4FrbqL/xmfPy
+/lhpLE2Zjc2MAFoQFieubr0ju1+ussYGHIqAVlShYF3bg99dGjlCGPTVmPAA+RAc
+ucVbjXixis26A+pZPGFTLoLRphGNuIEQjwFUciYJl8iIM27prSZgJBzt/gXPilw=
+=CUtV
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
index 295455e39a7e..3405b91d1262 100644
--- a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.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/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.4 2012/06/24 08:38:34 flameeyes Exp $
 
 EAPI=4
 
@@ -39,6 +39,10 @@ if [[ ${PV} == "9999" ]]; then
 	src_prepare() {
 		eautoreconf
 	}
+else
+	src_prepare() {
+		epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	}
 fi
 
 src_configure() {
diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
new file mode 100644
index 000000000000..67a8d1426d76
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
@@ -0,0 +1,42 @@
+Index: eid-mw-4.0.2/common/src/socket/socket.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
++++ eid-mw-4.0.2/common/src/socket/socket.cpp
+@@ -21,6 +21,10 @@
+ #include "../eiderrors.h"
+ #include <iostream>
+ 
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ namespace eIDMW
+ {
+ 
+Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
++++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #ifndef SOCKET_ERROR
+ #define SOCKET_ERROR -1
+ #endif
+Index: eid-mw-4.0.2/common/src/util.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/util.cpp
++++ eid-mw-4.0.2/common/src/util.cpp
+@@ -27,6 +27,10 @@
+ 

+ #include <stdlib.h>

+ 

++#ifdef HAVE_UNISTD_H

++#include <unistd.h>

++#endif

++

+ #ifdef WIN32

+ #include <windows.h>

+ #endif