old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 120 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 53e696855254..9305250ee10f 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.137 2014/10/27 16:04:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.138 2014/10/29 20:35:26 mr_bones_ Exp $
+
+  29 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/scummvm-1.5.0-EE.patch, -scummvm-1.5.0.ebuild:
+  old
 
   27 Oct 2014; Agostino Sarubbo <ago@gentoo.org> scummvm-1.7.0.ebuild:
   Stable for ppc64, wrt bug #520876
diff --git a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch b/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
deleted file mode 100644
index 376fb0994abb..000000000000
--- a/games-engines/scummvm/files/scummvm-1.5.0-EE.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b65365e0d314bff91f5fb3c4fbdd3da7944ea7a2 Mon Sep 17 00:00:00 2001
-From: hasufell <julian.ospald@googlemail.com>
-Date: Fri, 1 Feb 2013 19:31:15 +0100
-Subject: [PATCH] CONFIGURE: Fix build under et_EE locale
-
-Freetype-config reports a broken include dir
-when et_EE locale is used. We set LC_ALL
-and LANGUAGE to "C" explicitly like autoconf
-does to force consistent behavior.
----
- configure |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure b/configure
-index 91364eb..3b8b845 100755
---- a/configure
-+++ b/configure
-@@ -21,6 +21,12 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- 
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
- # Save the current environment variables for next runs
- SAVED_CONFIGFLAGS=$@
- SAVED_LDFLAGS=$LDFLAGS
--- 
-1.7.10
-
diff --git a/games-engines/scummvm/scummvm-1.5.0.ebuild b/games-engines/scummvm/scummvm-1.5.0.ebuild
deleted file mode 100644
index 0f0587a8ee97..000000000000
--- a/games-engines/scummvm/scummvm-1.5.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.5.0.ebuild,v 1.12 2014/05/15 16:43:34 ulm Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs 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 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth mp3 opengl truetype vorbis"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
-	sys-libs/zlib
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	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
-	epatch "${FILESDIR}"/${P}-EE.patch
-}
-
-src_configure() {
-	local myconf
-
-	# bug #137547
-	use fluidsynth || myconf="${myconf} --disable-fluidsynth"
-
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	./configure \
-		--backend=sdl \
-		--host=$CHOST \
-		--enable-verbose-build \
-		--prefix=/usr \
-		--bindir="${GAMES_BINDIR}" \
-		--datadir="${GAMES_DATADIR}"/${PN} \
-		--libdir="${GAMES_LIBDIR}" \
-		--enable-zlib \
-		$(use_enable debug) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable mp3 mad) \
-		$(use_enable flac) \
-		$(use_enable opengl) \
-		$(use_enable vorbis) \
-		$(use_enable truetype freetype2) \
-		$(use_enable x86 nasm) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-	doicon icons/scummvm.svg
-	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
-	prepgamesdirs
-}