Fix implicit declarations and linking on amd64, bug #206375

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 146 insertions, 3 deletions

diff --git a/games-emulation/nestra/ChangeLog b/games-emulation/nestra/ChangeLog
index 27e7ac6cefe0..bd235243b314 100644
--- a/games-emulation/nestra/ChangeLog
+++ b/games-emulation/nestra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/nestra
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.13 2006/12/01 21:31:46 wolf31o2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.14 2008/09/01 23:01:09 nyhm Exp $
+
+*nestra-0.66-r2 (01 Sep 2008)
+
+  01 Sep 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/nestra-0.66-include.patch, +nestra-0.66-r2.ebuild:
+  Fix implicit declarations and linking on amd64, bug #206375
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> nestra-0.66-r1.ebuild:
   Removing old virtual/x11 dependency.
diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
index 69a50bb4b641..58f789306782 100644
--- a/games-emulation/nestra/Manifest
+++ b/games-emulation/nestra/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nestra-0.66-exec-stack.patch 235 RMD160 956b2e474a10ba8c8fadef42bffc3db12dff7123 SHA1 0fec0cbb44a04de624afb541a4794ac8f38c3419 SHA256 66d0d08ff4c311dedbbe3ffce3dd07f911e269e1d667b705ac41bfb0e9e6eb52
+AUX nestra-0.66-include.patch 1269 RMD160 bd19723a5aebc03c69ceba1813a1308773d71ade SHA1 8d0fdc59085a9cd3662a81af03ee78cda1f65042 SHA256 62df64671ac9273228c8142326f4936bf89dc7223c246f8ef8d6c5ab52ab475f
 DIST nestra-0.66.tar.gz 49757 RMD160 e798b5642cd8875bf5e5ed74b196a8631448371b SHA1 6f8cd46d452f6e3ac34b567875ab24953ac29d28 SHA256 6be7743cef85cf3de2da4e7489bfd2329f7f21aa01be9f58801f6dbd9f8e96d6
+DIST nestra_0.66-10.diff.gz 2414 RMD160 4aa9eea411ef4d78a4b632b01a8c3fbd3984a95b SHA1 d632e6a6fa3f970bf8e333e4cf7cadb2e6dd995e SHA256 5933509a4641afee22275b4c07e8e0f0d136056a7e0e3a4609a1e6c9674e32ea
 DIST nestra_0.66-7.diff.gz 2294 RMD160 11a873b2435d27863892559275220b8af16e94c2 SHA1 ea1d261bb91bc0121ed48812b0da7bc323f3836c SHA256 dc5a68093e6eee90857a100e40d56b2cf7189bd9752f1ecf9df319165f537538
 EBUILD nestra-0.66-r1.ebuild 1251 RMD160 c1d6c7ff5ebf50446d1d06d2dce9fd4257e2bdf9 SHA1 10ad91ca68a44cb361344f26a6271c3ec8a2c69a SHA256 d15141cce58e4145b77fec0d75863dbe326e0b6fb31c54f6b18b33ee7927934e
-MISC ChangeLog 1764 RMD160 7d22f6b28104f0fec789b3083bb8e62448997ddd SHA1 56247479b15052886ad454291c29a95054ebb90d SHA256 4a3507bc195929ff8320b043dac39917e95de1421340d53a04d68d118373c6bc
+EBUILD nestra-0.66-r2.ebuild 1275 RMD160 21391fa949b3919bec4624db7c696c8538bc33ca SHA1 761426845c3b0f65f7387729ebb4396129f7e80c SHA256 43b417b955e8fa63637cf08e9be89431e5f1edccd8d4de52dc3579895d3196eb
+MISC ChangeLog 1962 RMD160 239509a481019a6ae79db1e7059ef281b3283a68 SHA1 f8f09d7ed1e64e631cf89888bea30b62218b5837 SHA256 cf2a8476a08e8818363e207a15ee311754a272444db5450dcff81b3cd6e9cb91
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki8dDsACgkQdz7hIScOURF88wCg9PKYH90L8wFJtteGqcBnju5K
+AAMAnRqnmhsnWS5+bRHD7WoouwFB/RK8
+=DT/O
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
new file mode 100644
index 000000000000..b4733b172bba
--- /dev/null
+++ b/games-emulation/nestra/files/nestra-0.66-include.patch
@@ -0,0 +1,73 @@
+--- comptbl.c
++++ comptbl.c
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #define ALLOC_SIZE 0x400000 /* 4MB */
+ #define TBL_BASE ((unsigned char *)0x10000000)
+--- d6502.c
++++ d6502.c
+@@ -1,6 +1,7 @@
+ /* 6502 disassembler */
+ /* Public Domain */
+ 
++#include <stdio.h>
+ #include "globals.h"
+ 
+ char Opcodes_6502[256][4]={
+--- emu.c
++++ emu.c
+@@ -12,6 +12,7 @@
+ #include <sys/mman.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "mapper.h"
+ #include "io.h"
+--- fb.c
++++ fb.c
+@@ -2,6 +2,8 @@
+ /* Framebuffer/pixmap rendering */
+ /* Public Domain */
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #include "mapper.h"
+ #include "globals.h"
+--- io.c
++++ io.c
+@@ -5,6 +5,7 @@
+    to do I/O operations. */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "mapper.h"
+ #include "io.h"
+ #include "globals.h"
+--- mapper.c
++++ mapper.c
+@@ -1,6 +1,7 @@
+ /* Nestra mapper.c */
+ /* Public Domain */
+ 
++#include <string.h>
+ #include "mapper.h"
+ #include "consts.h"
+ 
+--- x11.c
++++ x11.c
+@@ -1,6 +1,9 @@
+ /* Nestra x11.c */
+ /* Public Domain */
+ 
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
+ #include <X11/Xutil.h>
diff --git a/games-emulation/nestra/nestra-0.66-r2.ebuild b/games-emulation/nestra/nestra-0.66-r2.ebuild
new file mode 100644
index 000000000000..2f731885292d
--- /dev/null
+++ b/games-emulation/nestra/nestra-0.66-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/nestra-0.66-r2.ebuild,v 1.1 2008/09/01 23:01:09 nyhm Exp $
+
+inherit eutils toolchain-funcs flag-o-matic multilib games
+
+PATCH="${P/-/_}-10.diff"
+DESCRIPTION="NES emulation for Linux/x86"
+HOMEPAGE="http://nestra.linuxgames.com/"
+SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
+	mirror://debian/pool/contrib/n/nestra/${PATCH}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="amd64? ( app-emulation/emul-linux-x86-xlibs )
+	x11-libs/libX11"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${WORKDIR}"/${PATCH} \
+		"${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-include.patch
+	append-ldflags -Wl,-z,noexecstack
+	use amd64 && multilib_toolchain_setup x86
+	sed -i \
+		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
+		-e 's:-O2 ::' \
+		-e "s:gcc:$(tc-getCC) ${CFLAGS}:" \
+		-e "s:ld:$(tc-getLD) -m elf_i386 $(raw-ldflags):" \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	use amd64 && multilib_toolchain_setup x86
+	games_src_compile
+}
+
+src_install() {
+	dogamesbin nestra || die "dogamesbin failed"
+	dodoc BUGS CHANGES README
+	doman nestra.6
+	prepgamesdirs
+}