summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-01-17 18:21:17 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-01-17 18:21:17 +0000
commit80a92da4beb4b900158ce45a6f0dc0ac4d509725 (patch)
tree6406b6e5a815efeeb49c045cdbf31b236f317478 /games-emulation
parentAdd fix from Debian for struct packing (i.e. arm) #255096 by Raúl Porcel. (diff)
downloadgentoo-2-80a92da4beb4b900158ce45a6f0dc0ac4d509725.tar.gz
gentoo-2-80a92da4beb4b900158ce45a6f0dc0ac4d509725.tar.bz2
gentoo-2-80a92da4beb4b900158ce45a6f0dc0ac4d509725.zip
Doesn't work with latest nasm so disable that for now (bug #249834)
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/gngeo/ChangeLog7
-rw-r--r--games-emulation/gngeo/gngeo-0.7.ebuild10
2 files changed, 9 insertions, 8 deletions
diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index 9f6e3a24cb0b..466cc6b25890 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/gngeo
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.20 2008/06/14 15:34:07 coldwind Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.21 2009/01/17 18:21:17 mr_bones_ Exp $
+
+ 17 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> gngeo-0.7.ebuild:
+ Doesn't work with latest nasm so disable that for now (bug #249834)
14 Jun 2008; Santiago M. Mola <coldwind@gentoo.org> gngeo-0.7.ebuild:
Ensure we do not use i386 asm on amd64, fixes #222149.
diff --git a/games-emulation/gngeo/gngeo-0.7.ebuild b/games-emulation/gngeo/gngeo-0.7.ebuild
index 81f7ff38d428..17b6fafa6cc3 100644
--- a/games-emulation/gngeo/gngeo-0.7.ebuild
+++ b/games-emulation/gngeo/gngeo-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.5 2008/06/14 15:34:07 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.6 2009/01/17 18:21:17 mr_bones_ Exp $
inherit eutils autotools games
@@ -13,11 +13,9 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE=""
-RDEPEND="virtual/opengl
+DEPEND="virtual/opengl
media-libs/sdl-image
media-libs/libsdl"
-DEPEND="${RDEPEND}
- x86? ( >=dev-lang/nasm-0.98 )"
src_unpack() {
unpack ${A}
@@ -30,7 +28,7 @@ src_unpack() {
}
src_compile() {
- egamesconf $(use_enable x86 i386asm) || die "egamesconf failed"
+ egamesconf --disable-i386asm || die "egamesconf failed"
emake || die "emake failed"
}