summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2005-04-24 19:55:58 +0000
committerDaniel Goller <morfic@gentoo.org>2005-04-24 19:55:58 +0000
commit77a498bb1306a7002b4892aeb367ce76146b80a0 (patch)
treec5a60424351205ad8f897df0542e7fb4f43c7895 /games-emulation
parentFixed vcd dependency (bug #90176), fixes doc installation, adds patch for wma... (diff)
downloadgentoo-2-77a498bb1306a7002b4892aeb367ce76146b80a0.tar.gz
gentoo-2-77a498bb1306a7002b4892aeb367ce76146b80a0.tar.bz2
gentoo-2-77a498bb1306a7002b4892aeb367ce76146b80a0.zip
amd64 fixes
(Portage version: 2.0.51.19)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/mupen64/ChangeLog5
-rw-r--r--games-emulation/mupen64/mupen64-0.4-r2.ebuild16
2 files changed, 14 insertions, 7 deletions
diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index 2684ebff22f5..b323a70485a4 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,9 @@
# 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.14 2005/04/24 00:35:19 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.15 2005/04/24 19:55:58 morfic Exp $
+
+ 24 Apr 2005; Daniel Goller <morfic@gentoo.org> mupen64-0.4-r2.ebuild:
+ amd64 fixes
23 Apr 2005; Daniel Goller <morfic@gentoo.org>
files/mupen64-gtk2-makefile.patch, files/mupen64-makefiles.patch,
diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
index 8fd48594b03c..b39fb89c69ed 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.2 2005/04/24 00:35:19 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.3 2005/04/24 19:55:58 morfic Exp $
inherit games gcc eutils libtool
@@ -35,14 +35,18 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${PN}-makefiles.patch"
- epatch "${FILESDIR}/${PN}-confdir.patch"
+ epatch "${FILESDIR}/${PN}-makefiles.patch" || die "patch failed"
+ epatch "${FILESDIR}/${PN}-confdir.patch" || die "patch failed"
# gtk2 breaks some configuration dialogs (bug 56195 #35)
- use gtk2 && epatch "${FILESDIR}/${PN}-gtk2-makefile.patch"
- use avi && epatch "${FILESDIR}/${PN}-gentoo-avi.patch"
+ if use gtk2; then
+ epatch "${FILESDIR}/${PN}-gtk2-makefile.patch" || die "patch failed"
+ fi
+ if use avi; then
+ epatch "${FILESDIR}/${PN}-gentoo-avi.patch" || die "patch failed"
+ fi
if ! use asm ; then
- epatch "${FILESDIR}/${PN}-noasm.patch"
+ epatch "${FILESDIR}/${PN}-noasm.patch" || die "patch failed"
fi
sed -i \
-e "s:CFLAGS.*=\(.*\):CFLAGS=\1 -fPIC ${CFLAGS}:" \