summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-03-31 07:26:58 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-03-31 07:26:58 +0000
commit93db3de4c6368f00bc14ed2d7b21cc5c899c311d (patch)
tree82e6c15971f772921dd04f509303c323678f5eb7 /games-emulation
parentdon't rdepend on nasm (Manifest recommit) (diff)
downloadgentoo-2-93db3de4c6368f00bc14ed2d7b21cc5c899c311d.tar.gz
gentoo-2-93db3de4c6368f00bc14ed2d7b21cc5c899c311d.tar.bz2
gentoo-2-93db3de4c6368f00bc14ed2d7b21cc5c899c311d.zip
don't rdepend on nasm; "use arch" instead of "ARCH == "
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/generator/ChangeLog5
-rw-r--r--games-emulation/generator/generator-0.35.ebuild14
2 files changed, 12 insertions, 7 deletions
diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index b0df39097cb1..f8a4e198c241 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/generator
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.5 2004/03/20 11:43:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.6 2004/03/31 07:26:58 mr_bones_ Exp $
+
+ 30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> generator-0.35.ebuild:
+ don't rdepend on nasm; "use arch" instead of "ARCH == "
20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> generator-0.35.ebuild,
files/logging.patch, files/netbsd-gcc-3.3.patch:
diff --git a/games-emulation/generator/generator-0.35.ebuild b/games-emulation/generator/generator-0.35.ebuild
index 7e0184966aab..cb647d53d263 100644
--- a/games-emulation/generator/generator-0.35.ebuild
+++ b/games-emulation/generator/generator-0.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.6 2004/03/20 11:43:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.7 2004/03/31 07:26:58 mr_bones_ Exp $
inherit eutils gcc games
@@ -13,13 +13,15 @@ SLOT="0"
KEYWORDS="x86 ppc"
IUSE="svga gtk"
-DEPEND="virtual/glibc
+RDEPEND="virtual/glibc
gtk? (
=x11-libs/gtk+-1*
media-libs/libsdl
)
svga? ( media-libs/svgalib )
- jpeg? ( media-libs/jpeg )
+ jpeg? ( media-libs/jpeg )"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
x86? ( dev-lang/nasm )"
src_unpack() {
@@ -27,7 +29,7 @@ src_unpack() {
cd ${S}
mkdir my-bins
- if [ "${ARCH}" == "ppc" ]; then
+ if use ppc ; then
sed -i \
-e 's/-minline-all-stringops//g' configure \
|| die "sed configure failed"
@@ -45,12 +47,12 @@ src_unpack() {
src_compile() {
local myconf="--with-gcc=$(gcc-major-version)"
+ local mygui=
- [ "${ARCH}" == "x86" ] \
+ use x86 \
&& myconf="${myconf} --with-raze" \
|| myconf="${myconf} --with-cmz80"
- local mygui
for mygui in `use gtk` `use svga` ; do
[ "${mygui}" == "svga" ] && mygui=svgalib