Fix building with recent glibc wrt #335137 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc69/cvs/Linux x86_64

4 files changed, 37 insertions, 18 deletions

diff --git a/games-strategy/netherearth/ChangeLog b/games-strategy/netherearth/ChangeLog
index c0ffa44801e9..12a71824b21f 100644
--- a/games-strategy/netherearth/ChangeLog
+++ b/games-strategy/netherearth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/netherearth
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.5 2009/11/21 17:46:52 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.6 2010/08/31 15:47:48 ssuominen Exp $
+
+  31 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  netherearth-0.52.ebuild, +files/netherearth-0.52-glibc-212.patch:
+  Fix building with recent glibc wrt #335137 by Diego E. Pettenò.
 
   21 Nov 2009; Markus Meier <maekke@gentoo.org> netherearth-0.52.ebuild:
   x86 stable, bug #288811
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index 5e591959ab18..dab65781419e 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile 1003 RMD160 ef32ff40017278bd3ec72397fec294890064c670 SHA1 bead9ede2d198f81ca8d8afef12f9a8e701e6576 SHA256 436792a5c1763fff48f7ec33175b323da36c3ceed89fcb3b4d30692a216ebbce
 AUX netherearth-0.52-freeglut.patch 367 RMD160 2bc91ec5643945940f67554570e5017995681555 SHA1 a0da0404801572a3bc81667bf1b1a8c5c3357f2b SHA256 6a2a6bd3f11b326f8e5c5d4729fe72fb51d04f6cbd75136b4fe5178de5aa027e
 AUX netherearth-0.52-gentoo-paths.patch 4356 RMD160 c9a5d588e509d2709623ae269269c9d1b461ff48 SHA1 4f3bf07b9a8d294d8a0da84be016697f47bfcbef SHA256 62a2243f3244f0d238383d61909cbd4ebc6c3f6a24e6093bac05657c48913a36
+AUX netherearth-0.52-glibc-212.patch 410 RMD160 9f8a2c4e8764265a0b620faaac81e2aadad37d54 SHA1 44d0623f036967605dcdfe163a1d54be2a41350d SHA256 450ecd26efa7fe0157b48d46b46ff7edf5ff00a2577934a0861498fc3164565e
 AUX netherearth-0.52-linux.patch 1255 RMD160 c8b679407421d1eb1af37ed59357624bf6cd74f0 SHA1 1fed7d7c2bf10565bed73f6ac33be4e8e8c9883b SHA256 3761a82cfb8aa70781a83a9af5d7a2eca5dd0dac98adb14aa232785cdf37a315
 DIST netherearth052.zip 872397 RMD160 124ca449b3bf02336f765e673e9307dea693f349 SHA1 6a968dfc4e1c7622c243c5123c29e2b5b02bc890 SHA256 79d533a56b4939a402edd7665f234e7f462e68b00ea36d9ae110f02a36357caf
 DIST sources.zip 75918 RMD160 ba75e3356ea4cae49b548ee9aaa46b70f677903f SHA1 04fe9d3b4428b2f57b160b6eb125865f594faa62 SHA256 0d4f80f5d3f73e957ccb7c292dcc830b88cb5624aa086ea3416522a8a66b766f
-EBUILD netherearth-0.52.ebuild 2068 RMD160 e330866b4c39c44c55e666a7c8e2d3adf4d84e10 SHA1 c7a2ea1401ef37b9cbc075d8bae002d8a648071c SHA256 8b3308fb18325c9bde32b0618421937c6c3fd029edd92c81bc3e5d9de46d63dd
-MISC ChangeLog 1091 RMD160 a474fcb7a9ded65bc11d5b5351c1b70298854a05 SHA1 daf668470a0a55fc35f560347f7b745918f86e51 SHA256 de11a274d2dde0b552d5e5c0a3999e28727069e164ebe3cd180d3a53686b3612
+EBUILD netherearth-0.52.ebuild 2110 RMD160 2c401cfa0b36cf89457d76cf85e6e9b05d2a8941 SHA1 1d55792cbf2a1943d5ca82e933bc8733156da841 SHA256 12c669b522ae746aff9a700a852af8f4f1832fb4ba144e8ecb4e34a9c5f13b1a
+MISC ChangeLog 1284 RMD160 f58eb03c5e08784098db7d0625ddb53343f1ff38 SHA1 f0d93fffaece4ccd27963a5fdb7887ca9bd6144e SHA256 188441d15902bdcb8db697a057d14ec7cef2cbf7c5206a21424198a4205f1499
 MISC metadata.xml 436 RMD160 94ce82a0b7fb6414f91d1c1e33ce7538c183040a SHA1 84c7e3e8c3a49146124ad734248506c576bca1dc SHA256 95624e4ca82861963e6a1414a75493eb67db3f504e00be22a9376c941c63c7cf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksIJ5sACgkQkKaRLQcq0GLHMwCfVSpYQPpMoym6YX7qQxNT2C5t
-BPAAnR1qrcyvFsHN1cyUIs2PJFmzdpKx
-=J93D
------END PGP SIGNATURE-----
diff --git a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
new file mode 100644
index 000000000000..813f963db4c8
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/335137
+
+--- sources/mainmenu.cpp
++++ sources/mainmenu.cpp
+@@ -3,6 +3,7 @@
+ #else

+ #include <stddef.h>

+ #include <sys/types.h>

++#include <sys/stat.h>

+ #include <dirent.h>

+ #endif

+ 

+--- sources/nethersave.cpp
++++ sources/nethersave.cpp
+@@ -1,5 +1,8 @@
+ #ifdef _WIN32

+ #include "windows.h"

++#else

++#include <sys/types.h>

++#include <sys/stat.h>

+ #endif

+ 

+ #include "string.h"

diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52.ebuild
index d6cc92e86852..30ca022edf0f 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.5 2009/11/21 17:46:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.6 2010/08/31 15:47:48 ssuominen Exp $
 
 inherit eutils games
 
@@ -35,9 +35,10 @@ src_unpack() {
 	cp "${FILESDIR}/Makefile" . || die "Makefile copying failed"
 
 	# Fix compilation errors/warnings
-	epatch "${FILESDIR}/${P}-linux.patch"
+	epatch "${FILESDIR}"/${P}-linux.patch
 
-	epatch "${FILESDIR}/${P}-freeglut.patch"
+	epatch "${FILESDIR}"/${P}-freeglut.patch \
+		"${FILESDIR}"/${P}-glibc-212.patch
 
 	# Modify dirs and some fopen() permissions
 	epatch "${FILESDIR}/${P}-gentoo-paths.patch"