version bump

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

3 files changed, 91 insertions, 12 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index ddacb00f186e..16208fe7d38a 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.97 2010/11/30 21:19:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.98 2010/12/20 01:16:49 mr_bones_ Exp $
+
+*scummvm-1.2.1 (20 Dec 2010)
+
+  20 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +scummvm-1.2.1.ebuild:
+  version bump
 
   30 Nov 2010; Markus Meier <maekke@gentoo.org> scummvm-1.2.0-r1.ebuild:
   amd64/x86 stable, bug #347119
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 636399da3b16..07dfc24a0251 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST scummvm-1.1.1.tar.bz2 8668735 RMD160 f581a5cae6821bae9b700ff1cb36a665ebefab61 SHA1 5f3dee411088987625f6351c721586a0ce6c3d42 SHA256 9cc865c5690bfc1df4970d35984455031467381180a71d84b08dcc9f51e39d4a
 DIST scummvm-1.2.0.tar.bz2 9514141 RMD160 c0c3f982c955fc9d39102fefa936b0d86b115157 SHA1 5443c3720179a9e75d46eb0282ec787637a76d36 SHA256 3ffc594d7ce3c14ad9bbbfaec70479f83a8bdbda81cf1eacf2988127f1d4dac0
+DIST scummvm-1.2.1.tar.bz2 9541548 RMD160 3e78eaf5657f395cbf097898b965735e0520da2a SHA1 f3dc6aae5a108c1fe4f9442a40c22c89ab2227b3 SHA256 488e0fc0fb48509f8d2dcc8f87a77d03655e8ae0e9f4333963aaa07ff75f2a09
 EBUILD scummvm-1.1.1.ebuild 2345 RMD160 09e0ceb431f69802cd60cab739c93b5f526058d5 SHA1 8b0652cf1ff14c6412e85278b8dbab4e12c431f7 SHA256 c39fcfba3958f8a692ff969af411a08e452e7576d2b96eb0ec7be847265c4af0
 EBUILD scummvm-1.2.0-r1.ebuild 2233 RMD160 50111f27b4b374e498668e241df788dd44c84146 SHA1 778c86e2e4224e565a73dc7d68c9c8b070af348e SHA256 1a1ce2619368e954d98b2eff6881d8a15a13ce278a2c6b0118ba135cfdd1c41a
-MISC ChangeLog 14374 RMD160 7b2e209e668bb73caa54d64a075e43e649d4f6b2 SHA1 c169aaf41d89cb4dfe9f1424a9f4efa9365f1357 SHA256 4dad343345d1560fa814510b71d2c9cbbe27b52c908c7140311aaea9dab9492f
+EBUILD scummvm-1.2.1.ebuild 2235 RMD160 d0bc101ebef65e170e65cb49048c815d258a30f4 SHA1 0187363282dfea00dbc719e866cd110d88e6d74c SHA256 9ef093146b1e35b0e58fffcd4217209aff522b3ef8b8f8722a4dadad124413e3
+MISC ChangeLog 14503 RMD160 4c2ca9376624a04c2f69e69477ada9f7d5acbeef SHA1 b12a4feab2683a60f9941d570560f1c1ce8e1f7e SHA256 bf1ab8a4971187560a6239b4ca2d395a633c9df505387a0d1cea018d91f3676f
 MISC metadata.xml 248 RMD160 ef65397fe4528a5ae0332b01a77e8f2a9e4c4e91 SHA1 a1c019c07494e52a3167dc8945533c2fd3ea1fc5 SHA256 d07430a4c6da117a018a33c479a43b812752dc8658311ae2559ef1d9f3654385
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz1ajIACgkQkKaRLQcq0GKSpACeKk25iGulU+5mBy/JB7puJRFY
-8oEAn3rfnKYSxJh/td5rQFhtEZuMtli4
-=xJvf
------END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/scummvm-1.2.1.ebuild b/games-engines/scummvm/scummvm-1.2.1.ebuild
new file mode 100644
index 000000000000..5fe676f30482
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.2.1.ebuild
@@ -0,0 +1,81 @@
+# 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.2.1.ebuild,v 1.1 2010/12/20 01:16:49 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils flag-o-matic 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//' \
+		configure || die
+	sed -i \
+		-e '/INSTALL.*doc/d' \
+		-e '/INSTALL.*\/pixmaps/d' \
+		-e 's/-s //' \
+		ports.mk || die
+}
+
+src_configure() {
+	local myconf="--backend=sdl" # x11 backend no worky (bug #83502)
+
+	if use vorbis || use ogg ; then
+		myconf="${myconf} --enable-vorbis"
+	else
+		myconf="${myconf} --disable-vorbis"
+	fi
+
+	# bug #137547
+	use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+
+	use x86 && append-ldflags -Wl,-z,noexecstack
+
+	# 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}"/${PN} \
+		--libdir="${GAMES_LIBDIR}" \
+		--enable-zlib \
+		$(use_enable debug) \
+		$(use_enable alsa) \
+		$(use_enable mp3 mad) \
+		$(use_enable flac) \
+		$(use_enable x86 nasm) \
+		${myconf} || die
+}
+
+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
+}