version bump (bug #395549)

(Portage version: 2.1.10.41/cvs/Linux i686)

3 files changed, 9 insertions, 86 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/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"