Fix build with GCC 4.7 (bug #421607).

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

4 files changed, 51 insertions, 6 deletions

diff --git a/dev-libs/libevocosm/ChangeLog b/dev-libs/libevocosm/ChangeLog
index 600913a7a6f4..e4494fc0b908 100644
--- a/dev-libs/libevocosm/ChangeLog
+++ b/dev-libs/libevocosm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libevocosm
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/ChangeLog,v 1.12 2009/04/25 22:25:49 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/ChangeLog,v 1.13 2013/02/19 17:05:43 dirtyepic Exp $
+
+  19 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> libevocosm-3.3.1.ebuild,
+  +files/libevocosm-3.3.1-gcc47.patch:
+  Fix build with GCC 4.7 (bug #421607).
 
 *libevocosm-3.3.1 (25 Apr 2009)
 
diff --git a/dev-libs/libevocosm/Manifest b/dev-libs/libevocosm/Manifest
index b1e8c3ca2d92..c565aad09852 100644
--- a/dev-libs/libevocosm/Manifest
+++ b/dev-libs/libevocosm/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.3.0-gcc-4.3.patch 393 SHA256 0b5713335f60dc7bb502ec22166a0cd65815415adec72fe225ab8510f2c8cd15 SHA512 93b5cf7c5ca9a41036262b545d1007b893ca6c24bbf4b49f23220bf6ec03a52643f8433449faae914fba3ec8743f7a7667c667768b6e340cfc041c824e56f186 WHIRLPOOL 817a75b7678919724d0500821e2aa58063c5341198b1eadaf79950f16f3f8e3149d1e6994f4694ec5651a32ac6caec381f3f755cd36b9a1ca07e6566aeafedf8
+AUX libevocosm-3.3.1-gcc47.patch 402 SHA256 ff3b899d95a9154919a4f02ebd49dab1d364b230763bd0378169eb62e59a78ef SHA512 2d4b2f615e17fdbcd8dd481384172755bfc26d98f6b3807d866e33a96f676292c70487b1c3c35b67d7425eec8e86733baad62da51be696c457ee2100fc180bf8 WHIRLPOOL 79c9dd293405efa03f8338763dfc2b42516c1e4823439b6f55bb42713fb8a7446d17a8e05771676e99323c82cdec3eec2353e88af6fe0d685c54bae2292dd718
 DIST libevocosm-2.5.2.tar.gz 328537 SHA256 a27282af189396cad96774cd65167eae98642bc81fd6be781058ca429940ab70 SHA512 c531679f372b851ddb1439734b0df2b6dd999cefb4ee09d18c1bbde2cffb3b1d1667d3a58cdd37cc5a24e725facedbf00d88c78768b1142cdb777e3b422dcde8 WHIRLPOOL 9bac3fe3be6150a14b68956239396ff2deb0eb235ed9c15047367a503e847d35f0cd0f94ad588608c1858b7e93b01f23363c2e0217ca03d32621932b9342f31b
 DIST libevocosm-3.1.0.tar.gz 357858 SHA256 8ed8781e25afa9c0baabdc5e661e5a55b74ef0de207c1f093e311815afab3751 SHA512 a3f00d1ade920ddcaf945a795b00799a07110bf9c7f83731d0b51ea63a74942af2198e33d646c9467daa5bb0acb6500a909773ccada489a13b0701968489932e WHIRLPOOL f0ce0b5341c36e3cf4c8d7c8b571714c6f8a5f6f165878b090f80ba0ac0f29eb55a683ff7a35cf82e30f7ad8d02ad0ea5712207f83be5bc481d719b1f286570a
 DIST libevocosm-3.3.0.tar.gz 823295 SHA256 e1ab7c7061aeb9f0a0fe30d4399041c4c93a056cd603778c6724b8f22fa8d136 SHA512 d55f53e6be16935e10c2fd37cad5c40653750ad06ecfc2562c20224a2ed71c6260436d6e52fe4c338820a57d1c4d0af7ef6aab00d526e16e1f19648deba28406 WHIRLPOOL 2c79cf5b184b2c905fca93d080a566a18b958e0f25421cbb189739bd0c86447f1fb623ffed4347f4dbb8a2f0f95ae0cc149cba3d360d28f9f2df68be7bbe008b
@@ -6,6 +10,17 @@ DIST libevocosm-3.3.1.tar.gz 414392 SHA256 a1c7380e627b688540c3dc9652dc38b132bee
 EBUILD libevocosm-2.5.2.ebuild 566 SHA256 79b38403f3b40d44a2bffb1ad1034285edbe8962a2feb1198f79e14252e4d9a0 SHA512 bfca54090c19a8b4f2b0d54fea79acad0916dc22af775aeb6f8bdd44a2121795dfec93cc2a49986eb83306cb011ac47047137f4da489be24beb90576d5f9b9fc WHIRLPOOL 4091096601ce5c25ac20a10b71e2c3cbfa0b82f5794972690a03820afca70f73a0ffe3f4ab34e20ebff9ffdbf60b1012b7c1bd4b0323d38c6b93ecd90d8f1329
 EBUILD libevocosm-3.1.0.ebuild 568 SHA256 ba362c3bf2dd42ea18ff2471a74b24d1d31bc2ce5e4804d6a36bc80230c9bd73 SHA512 5e16fd4fe1151fe72ce2d8e5d2c375c22e10887568264227a06aaf321db7441ebe3abd9c9b39dfa5ecc773854264ef07f3eec39af6cd75d3096a78168704690c WHIRLPOOL 60b316dc878beb24115b021902174631e641fe6235028b9118ef7d9d44c1024bc3892c993e9cc0570df4527ad007c14fc21a9b7daa6b5a6e3d90e36affd2e598
 EBUILD libevocosm-3.3.0.ebuild 997 SHA256 37924912c74bad69f562e428a66b07aa3066f78380aefc228d6c2028fa8c8ec2 SHA512 a329779b48e898adddcb13f189b3cab7a0daf882db654266559fb5dfa2234cde28e964c70563c228b81f7b812cedcfcb91fc2382971ecef56edb2c87d624d91e WHIRLPOOL c12ed0d32717e1f083c26051c220bfe9bf5f2a1947ff31eb9b0899a9a03f1101aebef049414ff72c8785632f904e6c5d31bfcb2419c80fd29cb0b4bf5a23a04c
-EBUILD libevocosm-3.3.1.ebuild 917 SHA256 e164877089628f30a710bcf2ef89d5baaa45c454f57043df3356936910238095 SHA512 f496072122ed9f6923121736b17013bb1109c9393c2d24a3fc5e7c70d2cfac0e174b109dd0aa157a14cbc4a4763f29e2c0d43eac21c3fcb8e25897795581b9e1 WHIRLPOOL 800bb7908ba4c4ed18ab0f30a11e3af14cd71a39bd85270aab7b869dcfaeebf667b379cd86fd5e9ef45b10eab5bb94c648781188fb4b2e305c277881aa444ecb
-MISC ChangeLog 1601 SHA256 a5ea866c48d4e94ab5117bbfb11d5d1ab27eee21bbccaaa7e5509e8fdfbc54f9 SHA512 b16ea02ff76a584c2d8db87874ccfba8886dc9a09cc8f969835acd90b00d8cd01594550834800c9a9487120a7e49cd63c0f0a76b53ab520caea60b6e849814a5 WHIRLPOOL 53f424c909e9d306d88ad59a30f77522c850fe950feaff559a496dbae315fa92707544a6826aa6c457e52077cf77a1549e4250210d9884ae69f267b046002602
+EBUILD libevocosm-3.3.1.ebuild 1000 SHA256 c1341f03500e01e20d868245d4e9308a26d30b34a2387b7378cb18f3ab2ad30e SHA512 68504d7fbca53b4fa7d8c0c745c4efbbeee8b12c009b51f7dd91dab4ad8a637c4d1c7307fd689494a7ae6b1705d4e633b622447a0a297ed82e33c86b4aaf9851 WHIRLPOOL f9442e9c6291e3bc48eca314320f36296ef9ae7a0fe7da6b1f0f7f5956772b080f2650a2a45a12b9e319923c3bf5dead3568556b375bff1230484e69c9af6c42
+MISC ChangeLog 1756 SHA256 95a9895451dde2ad5c99c315f234060f5bbf1b663b8a63549eb2ccb61cea0fc8 SHA512 0e56cd498deed180feff092c53209060a29517f08f51c8ecf5f1369150c341719c06cbbeac8a0c8e01556289f5c1235cbd64ed16da9ef460b4ca801e4a8c0a59 WHIRLPOOL 5a888f04546cedbf789a5a73010153257b8e2afeea2ff0ca12a79f5184844f822036559476b475386283ee833e60d9a167e15b0afa01b91931b94c4925c881e3
 MISC metadata.xml 156 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f SHA512 e91dd7187a03a5b11f6d23d0d620c7a0326c8b3631599d616c9bd4aaf5f7901fdf8405a86bae896ecbad57afcbc9f3515a067f78817d06de4a426d5a07e7cf75 WHIRLPOOL e7838d8e96cb2762d53f85ddc28d8034cd19c2ec76c5d5356d21e2508539b7dca9e8e2ed636731eb578aa9f914a6710f165e321aa3a321a4f622cf2624e38808
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRI7N0AAoJEO04vUmVeoRjMrsH/jG4pwRHwnAyplxT+pJYtTFY
+Evqf77CD9G7TRhzQRA3VMjLzGXUiqH8LNXk5Thwr8unzQPlxOpm3rJPl8FERqRkI
+vzWJNdQx4QhGSwe/r53OFEOS44sr+2Hd8TwMQ/8RbzAVWPRn5f2RQk2TFSUjXyI7
+CJ/PCYYcDRFQNtlRE2ekd/b7qdiC4gCHDdBkwJ2fC2slgWzmNSBRxmdnAnvpEjUx
+8Wa0GJ0sd6/aEkmIbO3CcePs4MfnlmRpawdz9XJcOMjETCLRcVyewgm/e2lPKq4i
+yGyuqtgBA9NJt3Je/+NKbYx2W96D6tOdncYvpb4BdCeMVtQ2JBXWj4rBR3afQN0=
+=Nmai
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libevocosm/files/libevocosm-3.3.1-gcc47.patch b/dev-libs/libevocosm/files/libevocosm-3.3.1-gcc47.patch
new file mode 100644
index 000000000000..1e286a0215e6
--- /dev/null
+++ b/dev-libs/libevocosm/files/libevocosm-3.3.1-gcc47.patch
@@ -0,0 +1,20 @@
+ https://bugs.gentoo.org/421607
+
+ evocommon.h:468:29: error: 'usleep' was not declared in this scope
+ 
+ libevocosm/evocommon.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/libevocosm/evocommon.h
++++ b/libevocosm/evocommon.h
+@@ -54,6 +54,10 @@
+ #undef min
+ #endif
+ 
++#if !defined(_MSC_VER)
++#include "unistd.h"
++#endif
++
+ namespace libevocosm
+ {
+     //! The random number generator used by Evocosm
diff --git a/dev-libs/libevocosm/libevocosm-3.3.1.ebuild b/dev-libs/libevocosm/libevocosm-3.3.1.ebuild
index 585e10afbaa0..86740b0bebce 100644
--- a/dev-libs/libevocosm/libevocosm-3.3.1.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.1.ebuild,v 1.1 2009/04/25 22:25:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevocosm/libevocosm-3.3.1.ebuild,v 1.2 2013/02/19 17:05:43 dirtyepic Exp $
 
 inherit eutils
 
@@ -17,6 +17,12 @@ RDEPEND="dev-libs/libcoyotl
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
 src_compile() {
 	ac_cv_prog_HAVE_DOXYGEN="false" econf || die "econf failed"
 	emake || die "emake failed"