adding amd64

(Portage version: 2.0.51.19)

6 files changed, 48 insertions, 36 deletions

diff --git a/games-emulation/mupen64-glN64/ChangeLog b/games-emulation/mupen64-glN64/ChangeLog
index c3899e7bd1bb..72d01a776cc6 100644
--- a/games-emulation/mupen64-glN64/ChangeLog
+++ b/games-emulation/mupen64-glN64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64-glN64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.7 2005/04/17 17:10:26 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.8 2005/04/24 00:34:33 morfic Exp $
+
+  23 Apr 2005; Daniel Goller <morfic@gentoo.org>
+  mupen64-glN64-0.4.1_rc2-r1.ebuild:
+  adding amd64
 
   17 Apr 2005; Daniel Goller <morfic@gentoo.org>
   +files/mupen64-glN64-ucode.patch, mupen64-glN64-0.4.1_rc2-r1.ebuild:
diff --git a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
index 0bcb956e7017..3703e901123d 100644
--- a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
+++ b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.3 2005/04/17 17:10:26 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.4 2005/04/24 00:34:33 morfic Exp $
 
 inherit eutils games
 
@@ -10,27 +10,33 @@ DESCRIPTION="An OpenGL graphics plugin for the mupen64 N64 emulator"
 SRC_URI="mirror://gentoo/glN64-0.4.1-rc2.tar.bz2"
 HOMEPAGE="http://deltaanime.ath.cx/~blight/n64/"
 
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 LICENSE="as-is"
 SLOT="0"
-IUSE="asm"
+IUSE="asm gtk2"
 
-RDEPEND="media-libs/libsdl"
+RDEPEND="media-libs/libsdl
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( =x11-libs/gtk+-2* )"
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
 
 src_compile () {
-	epatch ${FILESDIR}/${PN}-compile.patch || die "icompile patch failed"
-	epatch ${FILESDIR}/${PN}-gtk2.patch || die "gtk2 patch failed"
+	epatch ${FILESDIR}/${PN}-compile.patch || die "compile patch failed"
+
+	if use gtk2; then
+		epatch ${FILESDIR}/${PN}-gtk2.patch || die "gtk2 patch failed"
+	fi
+
 	epatch ${FILESDIR}/${PN}-ucode.patch || die "ucode patch failed"
-	if use x86; then
-		if use asm; then
-			einfo "using x86 asm where available"
-		else
-			epatch ${FILESDIR}/${PN}-noasm.patch
-		fi
+
+	if ! use asm; then
+		epatch ${FILESDIR}/${PN}-noasm.patch
 	fi
 
-	sed -i -e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" Makefile ||  \
-		die "couldn't apply cflags"
+	sed -i -e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \
+		Makefile || die "couldn't apply cflags"
+
 	make || die
 }
 
diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index f7f906db1a62..2684ebff22f5 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/mupen64
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.13 2005/04/18 05:52:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.14 2005/04/24 00:35:19 morfic Exp $
+
+  23 Apr 2005; Daniel Goller <morfic@gentoo.org>
+  files/mupen64-gtk2-makefile.patch, files/mupen64-makefiles.patch,
+  mupen64-0.4-r2.ebuild:
+  adding amd64
 
   18 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -mupen64-0.4-r1.ebuild:
diff --git a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
index 3e11e0a8f993..f79c4c01ef39 100644
--- a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
+++ b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch
@@ -83,11 +83,11 @@ diff -ru work/hack_azi_rsp_hle/Makefile work.new/hack_azi_rsp_hle/Makefile
 +++ hack_azi_rsp_hle/Makefile	2005-03-21 19:28:01.000000000 +0100
 @@ -1,7 +1,7 @@
  CC = gcc
--CFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
-+CFLAGS = -DUSE_GTK `pkg-config gtk+-2.0 --cflags` -fPIC
+-CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
++CFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags`
  CXX = g++
--CXXFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
-+CXXFLAGS = -DUSE_GTK `pkg-config gtk+-2.0 --cflags` -fPIC
+-CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
++CXXFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags`
  LD = g++
  LDFLAGS =
  
@@ -117,8 +117,8 @@ diff -ru work/mupen64_sound/Makefile work.new/mupen64_sound/Makefile
 +++ mupen64_sound/Makefile	2005-03-21 19:28:58.000000000 +0100
 @@ -1,7 +1,7 @@
  CC = gcc
--CFLAGS = `gtk-config --cflags` -DUSE_GTK
-+CFLAGS = `pkg-config gtk+-2.0 --cflags` -DUSE_GTK
+-CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK
++CFLAGS = -fPIC `pkg-config gtk+-2.0 --cflags` -DUSE_GTK
  LD = gcc
 -LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread
 +LDFLAGS = -shared -Wl,-Bsymbolic `pkg-config gtk+-2.0 --libs` -lpthread
diff --git a/games-emulation/mupen64/files/mupen64-makefiles.patch b/games-emulation/mupen64/files/mupen64-makefiles.patch
index a2a4e7f8f8f7..5da004d2e85e 100644
--- a/games-emulation/mupen64/files/mupen64-makefiles.patch
+++ b/games-emulation/mupen64/files/mupen64-makefiles.patch
@@ -27,7 +27,7 @@
 -#CC		=gcc -O3 -I/usr/X11R6/include -fPIC -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=pentium -pipe
 -#CC		=gcc -O3 -mpentium -Wall -g -pg
 -CC 		=gcc -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -DUSE_GTK `gtk-config --cflags` -I/usr/X11R6/include -pipe
-+CC		=gcc
++CC		=gcc -fPIC
  
  OBJ		=main.o
  
@@ -38,10 +38,10 @@
 -CFLAGS = -DUSE_GTK `gtk-config --cflags` -O3 -mcpu=athlon \
 -         -ffast-math -funroll-loops -fomit-frame-pointer
 -#CFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC
-+CFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
++CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
  CXX = g++
 -CXXFLAGS = $(CFLAGS)
-+CXXFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
++CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags`
  LD = g++
  LDFLAGS =
  
@@ -50,7 +50,7 @@
 @@ -1,5 +1,5 @@
  CC = gcc
 -CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall
-+CFLAGS = `gtk-config --cflags` -DUSE_GTK
++CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK
  LD = gcc
  LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread
    
diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
index 2ac8f9bf65e9..8fd48594b03c 100644
--- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild
+++ b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.1 2005/03/25 05:42:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.2 2005/04/24 00:35:19 morfic Exp $
 
 inherit games gcc eutils libtool
 
@@ -13,7 +13,7 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="avi gtk2 asm"
 
 RDEPEND="sys-libs/zlib
@@ -41,16 +41,13 @@ src_unpack() {
 	use gtk2 && epatch "${FILESDIR}/${PN}-gtk2-makefile.patch"
 	use avi && epatch "${FILESDIR}/${PN}-gentoo-avi.patch"
 
-	if use x86 ; then
-		if ! use asm ; then
-			epatch "${FILESDIR}/${PN}-noasm.patch"
-		fi
+	if ! use asm ; then
+		epatch "${FILESDIR}/${PN}-noasm.patch"
 	fi
 	sed -i \
-		-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
-		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \
-		*/Makefile \
-		|| die "sed failed"
+		-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 -fPIC ${CFLAGS}:" \
+		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \
+		*/Makefile || die "sed failed"
 }
 
 src_compile() {