version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 95 insertions, 2 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 04d9041e431e..b64dc2a162be 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.88 2010/04/05 16:04:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.89 2010/05/03 21:10:07 mr_bones_ Exp $
+
+*scummvm-1.1.1 (03 May 2010)
+
+  03 May 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +scummvm-1.1.1.ebuild:
+  version bump
 
 *scummvm-1.1.0 (05 Apr 2010)
 
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c9d0db112d1d..c49914327d27 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,8 @@
 DIST scummvm-1.0.0.tar.bz2 7955357 RMD160 b01c45e18cff0a640fd75245947b813d687232da SHA1 31e3f02d322cf9f51b89122dc56a0d947d92c25f SHA256 920932b9d0cfca019f35c2451d93d94ca3b9f981f0b82c418bfbc864fb8c00ec
 DIST scummvm-1.1.0.tar.bz2 8642000 RMD160 1b38e244a6f027e1b9d266caf1d91b4abfb6c349 SHA1 f657bc85d650839ded5c3a22216b837ffe98f674 SHA256 53c0517a2aa1ab944d4b365330690d0cf874e984323079d948c5ac285162b839
+DIST scummvm-1.1.1.tar.bz2 8668735 RMD160 f581a5cae6821bae9b700ff1cb36a665ebefab61 SHA1 5f3dee411088987625f6351c721586a0ce6c3d42 SHA256 9cc865c5690bfc1df4970d35984455031467381180a71d84b08dcc9f51e39d4a
 EBUILD scummvm-1.0.0.ebuild 2313 RMD160 c8b3ddeff46afe1096dc4567fae82c60530dcc20 SHA1 ff8e5ea2775a49ef8be36e1f65f8cf809a2395e0 SHA256 fbed1d7af24f7ba39b2b92fb9b959894cbe7b237a773b219971dc2edabd83f16
 EBUILD scummvm-1.1.0.ebuild 2353 RMD160 9455547b475e524ad385f0954cecbff02b3c3454 SHA1 fdcf526aa9594b527c725b156d0ee1e7e8190054 SHA256 d9226be6477c86b413c8179df954d5e3c15cad5fde2c2ad67231ac7c82701e5b
-MISC ChangeLog 13367 RMD160 e19ef4708f3c5dcc1f67bad6b6aa27cfe3c9abf7 SHA1 72d45cf4cb23b173b1a3657fb67e569b03909911 SHA256 db02ffbba3ca0bf0577ff46a7b8521623428f5b640d354f6e95d99d90cc349a5
+EBUILD scummvm-1.1.1.ebuild 2353 RMD160 6162528269c9bbf5d5c2ae3bfbdc6adf9fa6118a SHA1 0090613437fa89e333e7dd6fd837fee448a74852 SHA256 818be0e3423a39a1048f31534635abe171b1f0af75a02a7f5204005d4de6e5ca
+MISC ChangeLog 13493 RMD160 45aa87b029040c49c68e42de2f1dcaa8c03b9466 SHA1 aa00b66ea91c21f332eaf373625f0cf61462dc8c SHA256 cbcfdae0994ef181868e2234bbbc01bb6cb10b14d5cbbf08c9eb93bc42410291
 MISC metadata.xml 248 RMD160 ef65397fe4528a5ae0332b01a77e8f2a9e4c4e91 SHA1 a1c019c07494e52a3167dc8945533c2fd3ea1fc5 SHA256 d07430a4c6da117a018a33c479a43b812752dc8658311ae2559ef1d9f3654385
diff --git a/games-engines/scummvm/scummvm-1.1.1.ebuild b/games-engines/scummvm/scummvm-1.1.1.ebuild
new file mode 100644
index 000000000000..c43690e617c5
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.1.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.1.1.ebuild,v 1.1 2010/05/03 21:10:07 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug flac fluidsynth mp3 ogg vorbis"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl-1.2.2[audio,joystick,video]
+	>media-libs/libmpeg2-0.3.1
+	sys-libs/zlib
+	ogg? ( media-libs/libogg media-libs/libvorbis )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	alsa? ( media-libs/alsa-lib )
+	mp3? ( media-libs/libmad )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+	# -g isn't needed for nasm here
+	sed -i \
+		-e '/NASMFLAGS/ s/-g//' \
+		Makefile.common \
+		|| die "sed failed"
+	sed -i \
+		-e '/INSTALL.*doc\//d' \
+		-e '/INSTALL.*\/pixmaps/d' \
+		-e 's/-s //' \
+		ports.mk \
+		|| die "sed failed"
+}
+
+src_configure() {
+	local myconf="--backend=sdl" # x11 backend no worky (bug #83502)
+
+	# let the engine find its data files in the right place (bug #178116)
+	myconf="${myconf} --datadir=${GAMES_DATADIR}"
+
+	if use vorbis || use ogg ; then
+		myconf="${myconf} --enable-vorbis"
+	else
+		myconf="${myconf} --disable-vorbis"
+	fi
+
+	# bug #137547
+	use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+
+	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+	# mpeg2 support needs vorbis (bug #79149) so turn it off if -oggvorbis
+	./configure \
+		--enable-verbose-build \
+		--prefix=/usr \
+		--bindir="${GAMES_BINDIR}" \
+		--datadir="${GAMES_DATADIR}" \
+		--libdir="${GAMES_LIBDIR}" \
+		--enable-zlib \
+		$(use_enable debug) \
+		$(use_enable alsa) \
+		$(use_enable mp3 mad) \
+		$(use_enable flac) \
+		$(use_enable x86 nasm) \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README TODO
+	doicon icons/scummvm.svg
+	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
+	prepgamesdirs
+}