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
commitbf1cbf6d567d64ce85b671a55aa4dcda026d046a (patch)
treedddfb121f4835f253a6caa3492cc033550cbf494 /games-engines/exult
parentwhitespace (diff)
downloadhistorical-bf1cbf6d567d64ce85b671a55aa4dcda026d046a.tar.gz
historical-bf1cbf6d567d64ce85b671a55aa4dcda026d046a.tar.bz2
historical-bf1cbf6d567d64ce85b671a55aa4dcda026d046a.zip
EAPI=2; add workaround mentioned by Rafał Mużyło in bug #239373
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686
Diffstat (limited to 'games-engines/exult')
-rw-r--r--games-engines/exult/ChangeLog7
-rw-r--r--games-engines/exult/Manifest4
-rw-r--r--games-engines/exult/exult-1.2.ebuild17
3 files changed, 16 insertions, 12 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/Manifest b/games-engines/exult/Manifest
index 1f94e45b9343..ed4ea276783e 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -7,6 +7,6 @@ DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b4
DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a
DIST jmsfx.zip 4778572 RMD160 6998abd6cf42e2011c71bb4c39f651b3ccd103c4 SHA1 933678416679b8fd42240f8fe38fa3474dd65267 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2
DIST jmsfxsi.zip 6194646 RMD160 3d1badcda304c12d738f49bc9f559465620248eb SHA1 a8d546b44c81c49f0560f97a2e43d55c6444fd6b SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42
-EBUILD exult-1.2.ebuild 2727 RMD160 bcb66a69b793a229de8a5a5f8ab159afd5b528b2 SHA1 ed408f3bce8d09abc76e6a5efe1504e93879429b SHA256 8837567cd41b3a01ec9046dba41e62ba23df6d12af49dc1092c4d579c7ab0b13
-MISC ChangeLog 2765 RMD160 47b7f49c27f67466f5e35f12bbf52ba523a6d457 SHA1 59f78c9a1ce97af3c16d5bb7724051673db7ccb4 SHA256 f3375def61f78a5747d955f66149ed623218efe50bfd100c475db661378f3102
+EBUILD exult-1.2.ebuild 2750 RMD160 f19704b0810079c6b8dceb9ce33d36029c24e1dd SHA1 d32c77a1fc8510ab0d7e5d62c9dbb6571117e35f SHA256 3eed404d30719abbbe1fedb15156d76e94254e86af65a8e999a63e29cc92b82d
+MISC ChangeLog 2908 RMD160 a205bb76278acdaef778cbf60dc386dc32aefab4 SHA1 f5768cff54450b2aca7bc2facd8ddfdbbc840eec SHA256 4a93d016ca21a32e3fbd2c366dd035be04d2b90b34a14c5b58b9c8aa34814fa2
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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() {