old

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

3 files changed, 5 insertions, 105 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index 1bc8a5eb5f68..422b51707434 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.132 2014/07/24 18:39:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.133 2014/08/25 20:57:44 mr_bones_ Exp $
+
+  25 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -scummvm-1.6.0.ebuild:
+  old
 
   24 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> scummvm-1.7.0.ebuild:
   add back the fluidsynth workaround (bug #518004)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index b27d4a67bfd1..4476ac62051c 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,9 +1,7 @@
 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.6.0.tar.bz2 18516277 SHA256 396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4 SHA512 2241c13dee6ed06274744c86da7e73be411849515f755f7109d7cbbd2d4d6bc251f90a3e6fc469c0191df89a2cf8aec165d3af7d0310361d6e5f457c4ad47c44 WHIRLPOOL 632359f05bb4cb5cdb97f3d35b22874aacef2ae5fbbcd9e116cec7279c2db4b8a4e5d553982428f8c3f633909fdc5c5739a9194e579e3e44f4ab2041a7588134
 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.6.0.ebuild 2502 SHA256 df73be7beaa3203a41f6ee478ca6fd3b29842b2b282b6209f9aa6e76428c3b78 SHA512 a13f31dfcd8d8b8e2e2038a482dd37f1cd414e33d010cb15f852983e0cc5112629206110f77e6e49a2c66ca6700f16652e0066ff310efc460cdb7d0fbb226edd WHIRLPOOL f7489449066f4361dfbf029ea465995bb0245de6bd96dbe4c9cd44dd5935038ed6b6f76e4bc1ac717305eb1813873bda85e1982a997e5138c0a72b4989e03a51
 EBUILD scummvm-1.7.0.ebuild 2747 SHA256 5294e6471bee953ce61810caa68cbea2aacf2ad080899c9ef702a9403cd6410e SHA512 a57862f31ebb7f7fb1071a9e045bf6d91c36825bd083fcfe6428c5f402feef6489328c545a6a01bfc323d56d5d035aa349eeb20b29f5e19e23bd1c013ad484da WHIRLPOOL 41be122741f9cf48e686b492c38f0607c6f68fae9231f1f572517addb24ea95eea774aaf67a390818ad02f67e8f7854b236fdaa041ea63b24f84fec37466ec08
-MISC ChangeLog 18719 SHA256 cd861c10cb4a4a034695c679ccd6307e9a5f023bdc83b554bfd1dd8fd75881b9 SHA512 cb09c3e46e8ecef5a05ecc4a0bef712749c6e7d4ac28cfe93a0eb3ce79ba86f5c5f4fe43a71028d0cab93abb03c0ccc4a5d8705453667e94a6db54232057cfd4 WHIRLPOOL 8a00b6824b144790e00042d66c04628b36691d4c24f65fbc64e3f11d8960871aaa9f0d65b61d29f7e8847cbace2112698715437c479f04902f366d409af4bcc7
+MISC ChangeLog 18804 SHA256 5f3ebbd29af8d4eeb931d17386f297612c080242c048e60a363828a59c791680 SHA512 6c360912bfd41f6f67107d374bdcd0c5f8db14e37b57c5e619a2e7c8071713ccb1dcc98ebf8698764c5cc042d0a442a616d2fa1d4ef6a44e75d7a6e049316779 WHIRLPOOL 02c076a07287b388f79d780b584270978362d03d4be58b4f7f8d29f1ce2a8089b73baa6bf6002d534666d147472c3dd4b01f01d2d6926cc1dcd764c2d029b585
 MISC metadata.xml 311 SHA256 ba7555854c859720c5582c00c3b4b58059e839d2abfcd32c2d1a25015b39be47 SHA512 b208bb3e4fc8a84dac59a9878b01757c6f5e7eeaa22a517f07f99b3fa85f10985443fa30d206f2b7a00093d99330a91a3db3f6386df1b4dd8e537b807dafa12b WHIRLPOOL 947cd7ac8057e1524c5aa41429d19edebf6e3b30a31e6326b52aa5237fc79bffe7c620480866940e1a734485d7bee8570e4a4ec5f7b147fc8ceb8b7e9720e496
diff --git a/games-engines/scummvm/scummvm-1.6.0.ebuild b/games-engines/scummvm/scummvm-1.6.0.ebuild
deleted file mode 100644
index d33f9f02d296..000000000000
--- a/games-engines/scummvm/scummvm-1.6.0.ebuild
+++ /dev/null
@@ -1,101 +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.6.0.ebuild,v 1.3 2014/06/17 06:36:03 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils 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 theora 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 )
-	theora? ( media-libs/libtheora )
-	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
-}
-
-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 theora theoradec) \
-		$(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 -s scalable icons/scummvm.svg
-	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}