summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-01-22 05:46:19 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-01-22 05:46:19 +0000
commit344d535aaeabf619228910edff13ebe0bed260fd (patch)
treed211c3077fbd97928ebf7fa1680f779ff4c9771b /games-engines
parentwhitespace (diff)
downloadgentoo-2-344d535aaeabf619228910edff13ebe0bed260fd.tar.gz
gentoo-2-344d535aaeabf619228910edff13ebe0bed260fd.tar.bz2
gentoo-2-344d535aaeabf619228910edff13ebe0bed260fd.zip
EAPI=2; add workaround mentioned by Rafał Mużyło in bug #239373
(Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/exult/ChangeLog7
-rw-r--r--games-engines/exult/exult-1.2.ebuild17
2 files changed, 14 insertions, 10 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index 911ac633e272..21740e562824 100644
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-engines/exult
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.21 2008/08/15 04:40:00 mr_bones_ Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.22 2009/01/22 05:46:19 mr_bones_ Exp $
+
+ 22 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild:
+ EAPI=2; add workaround mentioned by Rafał Mużyło in bug #239373
15 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild:
add digital sound install as well (bug #224655 with patch from Tomáš
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 1e71a174d478..5e619ff10216 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,7 +1,8 @@
-# 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-engines/exult/exult-1.2.ebuild,v 1.15 2008/08/17 01:18:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.16 2009/01/22 05:46:19 mr_bones_ Exp $
+EAPI=2
inherit eutils autotools games
DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems"
@@ -18,7 +19,7 @@ KEYWORDS="~amd64 ppc ~sparc x86"
IUSE="timidity zlib"
RDEPEND="media-libs/libsdl
- media-libs/sdl-mixer
+ media-libs/sdl-mixer[vorbis]
media-libs/smpeg
media-libs/libogg
media-libs/libvorbis
@@ -40,8 +41,9 @@ src_unpack() {
mkdir flx/
cd flx/
unpack jmsfx{,si}.zip
+}
- cd "${S}"
+src_prepare() {
epatch \
"${FILESDIR}"/${P}-gcc41.patch \
"${FILESDIR}"/${P}-64bits.patch \
@@ -59,17 +61,16 @@ src_unpack() {
eautoreconf
}
-src_compile() {
+src_configure() {
egamesconf \
+ --x-libraries="/usr/$(get_libdir)" \
--disable-dependency-tracking \
--disable-tools \
--disable-opengl \
--disable-3dnow \
--disable-mmx \
$(use_enable timidity) \
- $(use_enable zlib zip-support) \
- || die
- emake || die "emake failed"
+ $(use_enable zlib zip-support)
}
src_install() {