--- d1x-20040118.ebuild		2005-09-25 09:35:36.000000000 +0200
+++ d1x-20040118-r1.ebuild	2006-01-18 00:50:39.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-action/d1x/d1x-20040118.ebuild,v 1.5 2005/09/25 07:13:41 mr_bones_ Exp $
 
-inherit eutils games
+inherit eutils games multilib
 
 DESCRIPTION="Descent 1 Source Project"
 HOMEPAGE="http://d1x.warpcore.org"
@@ -10,7 +10,7 @@
 
 LICENSE="Descent1 D1X"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="opengl"
 
 RDEPEND="media-libs/libsdl
@@ -57,6 +57,8 @@
 	cp defines.in defines.mak || die
 	epatch "${FILESDIR}/d1x-makefile-linux.patch" || die
 
+	epatch "${FILESDIR}/d1x-gcc4.patch"
+	epatch "${FILESDIR}/d1x-cflags.patch"
 	if use opengl; then
 		sed -i -e 's/^#\(SDLGL_IO = 1\)/\1/' defines.mak || die
 	else
@@ -86,8 +88,13 @@
 }
 
 src_compile() {
-	emake dep || die
-	emake -j1 || die
+	if use amd64; then
+		export ABI="x86"
+	fi
+	multilib_env
+	CFLAGS="${CFLAGS} $(get_abi_CFLAGS)"
+	emake MYCFLAGS="${CFLAGS}" dep || die
+	emake MYCFLAGS="${CFLAGS}" -j1 || die
 }
 
 src_install() {