old

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

4 files changed, 6 insertions, 144 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/Manifest b/games-engines/scummvm/Manifest
index 26458ea747fd..ebd0724a25d7 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,27 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX scummvm-1.5.0-EE.patch 832 SHA256 b746130cd871e9fe9388fff8d68912abb3f98dbe1b660654975dc1d257a6eb7c SHA512 326bc5bce6c6d9ecb917063057a48ed2c4f031687fb0f69affeed0adc817e30d65de14aac3bddca6f81133dcbf9fe377e840ced65619dc0412a2b57869dcfb3d WHIRLPOOL 05b1adccbc0df70a3934eaf0962f478b8a643effc9a01d525c6e2b6ffb398577048b56e3dd453e4d18b3a04b1b20d94a18ec111fd8052de4860c01e009ca49f8
-DIST scummvm-1.5.0.tar.bz2 17455085 SHA256 81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e SHA512 a4ae0965fec7e065a46ee1a8a49897eb2fecaf7851590b5696d866a5f224d0491937f63e9e2e8ba797c7d9b8d7ff45fbaf12b4f17c3ddec0f9973a6a915ee1c5 WHIRLPOOL dd8842edc41de693043db5c5005670b37583cdd97a9124575b4f725e5c6a3cf16f4670624e32578936085829c8627caa07a49902d643103386ca633fe23d2c14
 DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e WHIRLPOOL 077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
-EBUILD scummvm-1.5.0.ebuild 2258 SHA256 4fc338b90bd81f5b1b62c9ef2449432ac2e085fb74e1fdf42919ea67d845c151 SHA512 e19b4812b725eee255835f991541b25c968db0e1c49f8c3167cb01d334189991ce3eee82319a810a0f5e2af7cae3a5dc3fc20c0afc6686b13c09c51f65b42bc0 WHIRLPOOL 8b83419c8365310b8700224c158e9b06c4ce6b430ad222168e2c5578b0bcae5960b11c3286905b327a3be15b15b9041ac8ade2556b7564874600ebe3d498f4a4
 EBUILD scummvm-1.7.0.ebuild 2737 SHA256 cd9772ef4848f68d9cf134826553e2d3e12ae1cc9faca4df360520c60454f163 SHA512 0abadc1b7d20ea0ee8e775c0347eaf1cb432d183ea1e29f376b46f8d7dd622f07a84ad1197492474cb35b57b287d56929fb2876165ea97a90df2aaafda4a01ac WHIRLPOOL 15c5977b979a15ced04968504f3ac8a6525e95478fcd643e1cb2059be57f4390366d6899de22ecbcd43886f27ec45a57164d104989f2e29446b389927c846ebd
-MISC ChangeLog 19226 SHA256 632290f73fdbbab575c6622cec76cd5da370cc14512bdd30d1a7ee9d8d18b1af SHA512 fc2feb36dec872f01194cb20f69fdb34c4fc1495d0aa5b5d6d1ea70dce6575670bc2bf15e6b568fcd43b9bd86ab401f65f79ebe64880ba3c6f6faa66291edc48 WHIRLPOOL 6c9e68b94bd87f3810075d33c800e460083a4d95a858ac32b77f4b9146a92b0505d53b30d3dd48f43e53577cf41c8c51efe7ff3ba1f2fa2dc0efee7c7272f385
+MISC ChangeLog 19350 SHA256 70c74866a1c72249d6eaf094e4646f1a8a269143c8a82efe006894d659dd728b SHA512 9793437269b2b63f20beb7a155c723526136955c37c3a6388c2f60d28b084e94d5440f49aedb0347efc42ac56faae2e5542dde2b8755501924f1e700d232e593 WHIRLPOOL 8e4f28020a044499b763cd8265693c49b3039ee24795073453366d1eaa06f802e498dd61bb84cf84e4433d16a8672626919725d8f828002bd91ae2f59e0a0f14
 MISC metadata.xml 311 SHA256 ba7555854c859720c5582c00c3b4b58059e839d2abfcd32c2d1a25015b39be47 SHA512 b208bb3e4fc8a84dac59a9878b01757c6f5e7eeaa22a517f07f99b3fa85f10985443fa30d206f2b7a00093d99330a91a3db3f6386df1b4dd8e537b807dafa12b WHIRLPOOL 947cd7ac8057e1524c5aa41429d19edebf6e3b30a31e6326b52aa5237fc79bffe7c620480866940e1a734485d7bee8570e4a4ec5f7b147fc8ceb8b7e9720e496
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUTm0lAAoJELp701BxlEWfgRMQALJUfGI5Y8vuI7870rfVOEVS
-WLerf6XVO0AU3alLklGw4uMXmD4stfs9Kkra1jaPmfUYL125VgTNdE0AOk/PhMvY
-vqBJ3WBqh3pESFDlxH7WrAUXfXbWt9R3atuAjkIrMTBV0XahbMMzeCUkCf1Mx5D0
-Hz4JaXrbOEH4Tz6CkJeYpGPyjr7TSiNd9So2Q4D6QBsN5xxv4Vtn6FwCbmrfZFD0
-jB3ndBnYqkG0BI5uzLJdGsiYKHAr2v/fpfpNhB/Nsxka9zAmUzptxKNH5g29/JE3
-SqEvDxEzk92uSmZuWr86q3otyRyVQoOXDKDVrQtCJLVbRQVpTLgI/fZAyjDPtwX2
-qLbrCmFqj9x3VZfPsybGYv2yyXp9eL3pJ4BvKDwFvLzhm35TnPqcgLrssEDA4g8m
-J5wZgF2OvFTBETbh8zgYlniIV/E3uHFbHRy9Dt7FU3SoKuuha+2tXOAzqCO1a7iX
-YumMzk55kJdkqgRS+dkuX0OXEm+aki22oeSKC0lwSsxF0fVMd9rlLJBhUJXMcQ24
-6i4FUd4wt9g3mN0hQmt5RoK5ln5/JkcI4aZM2b7JOuPFjdQjjgFwcjhIQIQi1YuR
-sK+159M0LrGLKCrcuqzIG9plsn8UCPHlhEJGdhw2xtDPs+dxWB7vwibyAw3wKvm2
-Y6UMMJ343eii1xIIr7zY
-=ljMP
------END PGP SIGNATURE-----
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
-}