4 files changed, 12 insertions, 101 deletions
diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 187ad9449c05..8c0ed11686c8 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.107 2011/08/22 14:10:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.108 2011/12/21 22:50:07 mr_bones_ Exp $
+
+*scummvm-1.4.0 (21 Dec 2011)
+
+  21 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> -scummvm-1.2.1.ebuild,
+  -scummvm-1.3.0.ebuild, +scummvm-1.4.0.ebuild:
+  version bump (bug #395549)
 
   22 Aug 2011; Tony Vroon <chainsaw@gentoo.org> scummvm-1.3.1.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 3554224b6c4d..23f107178f38 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST scummvm-1.2.1.tar.bz2 9541548 RMD160 3e78eaf5657f395cbf097898b965735e0520da2a SHA1 f3dc6aae5a108c1fe4f9442a40c22c89ab2227b3 SHA256 488e0fc0fb48509f8d2dcc8f87a77d03655e8ae0e9f4333963aaa07ff75f2a09
-DIST scummvm-1.3.0.tar.bz2 10315113 RMD160 4da7b500616c79a63281d0945717cbbe21d6287c SHA1 ff89c68da74bbf7a89c5d54a27baac3acecd5025 SHA256 694a65a16a72c1d676e09c9af11f1ba1393d2ed731b941d82a79c50e335b58af
 DIST scummvm-1.3.1.tar.bz2 10479934 RMD160 181838d1a89028a5b66ed4d2ed8c65a4444623c4 SHA1 5f92d22f934448b1ca731fd694422c263134bf62 SHA256 b25dc7f7e26ed6df3d901043efb2337a525df4dd3cd1589e772733cfa90037f6
-EBUILD scummvm-1.2.1.ebuild 2242 RMD160 fe624842551d155a8f88a2184757704279373f0a SHA1 ee6d6a4dca311122a669a3d318ac0cfb48d9aedd SHA256 17d6385f6ef44706a89bb65e0adcd43e57bf2b9b3384ccc905e77f9e185e8fac
-EBUILD scummvm-1.3.0.ebuild 2221 RMD160 320af13f7c8ae50321b318c1ee1f788a513bc2c1 SHA1 7e306ce59ea84c570d5f2706fc66dcbbe8389e45 SHA256 86ec8eff2f99df03a30f3742fda680feb995ee5276cf18690e309954688b6b81
+DIST scummvm-1.4.0.tar.bz2 15580242 RMD160 ad4e43f46ec10dc7c3becb52b172ac501fd38941 SHA1 92196b062771407d13617caef5efd4895c4e4b5d SHA256 494b12e90749aaa76304aa066c90eede8a5b4a8417900be9702a3e6ab484743d
 EBUILD scummvm-1.3.1.ebuild 2218 RMD160 08eed068b96f5c34c12f6cae01b591f1f1ab82b9 SHA1 71079ce349c0d2707f3e01d07e1665427195631b SHA256 2a6ad82eb20b6c6ecd9d09b7cb0a50f99a4f63d88cc0c7c6392355a48d789cd4
-MISC ChangeLog 15610 RMD160 24dc0d6573f4c80244c5abbffef6f01e3587252e SHA1 5632cf9ab4453b7134711c3366361885a3d07e15 SHA256 bd262746ed36b0403ef8a6a0dca182d58eca2dc203b7beab3da0a81c3e9261d8
+EBUILD scummvm-1.4.0.ebuild 2126 RMD160 c314350108e58a8c9f941584c78dd9c094607248 SHA1 46d3826ea0ec60bb0c4f2f530b88f05d4377cbde SHA256 0e480493bbbc1a8e0c4f7dbd02d183f78744d0788ba6fff2f53cebe82492e414
+MISC ChangeLog 15797 RMD160 3151b99d46a871d97c25490a83c8dd0af4d5fbea SHA1 db2b890658d45eb9450eb74d731641b0e27e6946 SHA256 40a1db0c0957a14ccd82b7c6af08d77f55cfe919a80378ba8d086cbf740ef272
 MISC metadata.xml 248 RMD160 ef65397fe4528a5ae0332b01a77e8f2a9e4c4e91 SHA1 a1c019c07494e52a3167dc8945533c2fd3ea1fc5 SHA256 d07430a4c6da117a018a33c479a43b812752dc8658311ae2559ef1d9f3654385
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5SY04ACgkQp5vW4rUFj5oVyACeOH7eSgMmrwGGHvwCfLMWxFZv
-xHUAoL/p7l5fv+O7uqdAqAKbdHZwtxAr
-=Qo0j
------END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/scummvm-1.2.1.ebuild b/games-engines/scummvm/scummvm-1.2.1.ebuild
deleted file mode 100644
index 20c95f1f17fd..000000000000
--- a/games-engines/scummvm/scummvm-1.2.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 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.5 2011/02/13 12:30:01 armin76 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 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 \
-		--host=$CHOST \
-		--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
-}
diff --git a/games-engines/scummvm/scummvm-1.3.0.ebuild b/games-engines/scummvm/scummvm-1.4.0.ebuild
index c14cb01e9b42..9a05ed246bc1 100644
--- a/games-engines/scummvm/scummvm-1.3.0.ebuild
+++ b/games-engines/scummvm/scummvm-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.3.0.ebuild,v 1.1 2011/05/31 17:47:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.4.0.ebuild,v 1.1 2011/12/21 22:50:07 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -56,7 +56,6 @@ src_configure() {
 	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 \
 		--backend=sdl \
 		--host=$CHOST \
@@ -75,7 +74,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS README TODO
 	doicon icons/scummvm.svg
 	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"