summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-11-20 10:51:02 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-11-20 10:51:02 +0000
commit3bccaa87be60ea7eadadcebadf188c818e64d133 (patch)
treebeabb6ea8c223a583440ec7f744a42dde4645194 /games-emulation/fceux
parentrevert language breakage (diff)
downloadgentoo-2-3bccaa87be60ea7eadadcebadf188c818e64d133.tar.gz
gentoo-2-3bccaa87be60ea7eadadcebadf188c818e64d133.tar.bz2
gentoo-2-3bccaa87be60ea7eadadcebadf188c818e64d133.zip
use scons-utils
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-emulation/fceux')
-rw-r--r--games-emulation/fceux/ChangeLog5
-rw-r--r--games-emulation/fceux/fceux-2.1.4a.ebuild17
2 files changed, 10 insertions, 12 deletions
diff --git a/games-emulation/fceux/ChangeLog b/games-emulation/fceux/ChangeLog
index 0757e78eb454..0aaf527e974d 100644
--- a/games-emulation/fceux/ChangeLog
+++ b/games-emulation/fceux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/fceux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.8 2010/09/22 18:19:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.9 2010/11/20 10:51:02 mr_bones_ Exp $
+
+ 20 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> fceux-2.1.4a.ebuild:
+ use scons-utils
22 Sep 2010; Markos Chandras <hwoarang@gentoo.org> fceux-2.1.4a.ebuild:
Stable on amd64 wrt bug #335836
diff --git a/games-emulation/fceux/fceux-2.1.4a.ebuild b/games-emulation/fceux/fceux-2.1.4a.ebuild
index 733a76bda255..0abe0ce12bd9 100644
--- a/games-emulation/fceux/fceux-2.1.4a.ebuild
+++ b/games-emulation/fceux/fceux-2.1.4a.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.1.4a.ebuild,v 1.4 2010/09/22 18:19:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.1.4a.ebuild,v 1.5 2010/11/20 10:51:02 mr_bones_ Exp $
EAPI=2
-inherit games
+inherit scons-utils games
DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
HOMEPAGE="http://fceux.com/"
@@ -18,10 +18,7 @@ RDEPEND="lua? ( dev-lang/lua )
media-libs/libsdl[opengl?,video]
opengl? ( virtual/opengl )
x11-libs/gtk+:2
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- dev-util/scons"
-RDEPEND="${RDEPEND}
+ sys-libs/zlib
gnome-extra/zenity"
# Note: zenity is "almost" optional. It is possible to compile and run fceux
# without zenity, but file dialogs will not work.
@@ -36,12 +33,10 @@ src_prepare() {
}
src_compile() {
- local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
- scons \
- ${sconsopts} \
+ escons \
CREATE_AVI=1 \
- OPENGL=$(use opengl && echo 1 || echo 0) \
- LUA=$(use lua && echo 1 || echo 0) \
+ $(use_scons opengl OPENGL) \
+ $(use_scons lua LUA) \
|| die "scons failed"
}