stable for x86; also install new modern theme - patch submission from Michael Vogt (bug #138121)

(Portage version: 2.1.1_pre3-r5)
 (Unsigned Manifest commit)

4 files changed, 8 insertions, 103 deletions

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index a75b1fa4d31c..aa55f9f15dbe 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX scummvm-0.8.0-configure.patch 184 RMD160 711b1aef1af232f58bcaea5f2e0118b17cacd4ff SHA1 298c8ac608364d9e06f09ff2faec4f6762633005 SHA256 9a06b3198ee491bdadd32b1fe7cb97818a0b355490e37c06851550f75d8090d1
-MD5 960f5d0a4e84df65775164313f55ef59 files/scummvm-0.8.0-configure.patch 184
-RMD160 711b1aef1af232f58bcaea5f2e0118b17cacd4ff files/scummvm-0.8.0-configure.patch 184
-SHA256 9a06b3198ee491bdadd32b1fe7cb97818a0b355490e37c06851550f75d8090d1 files/scummvm-0.8.0-configure.patch 184
 AUX scummvm-0.8.1-configure.patch 184 RMD160 711b1aef1af232f58bcaea5f2e0118b17cacd4ff SHA1 298c8ac608364d9e06f09ff2faec4f6762633005 SHA256 9a06b3198ee491bdadd32b1fe7cb97818a0b355490e37c06851550f75d8090d1
 MD5 960f5d0a4e84df65775164313f55ef59 files/scummvm-0.8.1-configure.patch 184
 RMD160 711b1aef1af232f58bcaea5f2e0118b17cacd4ff files/scummvm-0.8.1-configure.patch 184
@@ -13,14 +6,9 @@ AUX scummvm-0.8.2-configure.patch 184 RMD160 711b1aef1af232f58bcaea5f2e0118b17ca
 MD5 960f5d0a4e84df65775164313f55ef59 files/scummvm-0.8.2-configure.patch 184
 RMD160 711b1aef1af232f58bcaea5f2e0118b17cacd4ff files/scummvm-0.8.2-configure.patch 184
 SHA256 9a06b3198ee491bdadd32b1fe7cb97818a0b355490e37c06851550f75d8090d1 files/scummvm-0.8.2-configure.patch 184
-DIST scummvm-0.8.0.tar.bz2 2654730 RMD160 af3113a25adb30332176e6839dd30b21e09f292e SHA256 ba1607691f0859974543b3d3759edf21860415f2c9d2bc4bdf1639a28f88a1a2
 DIST scummvm-0.8.1.tar.bz2 2713782 RMD160 2a1fd79850162b1d280861b70cb17a127b32c014 SHA256 ef5c3dc2b5b14b158f8d276bdab37b45865009890082223fd34467764f302d00
 DIST scummvm-0.8.2.tar.bz2 2698022 RMD160 dfc40778bee6156c816435086e5c5d42eef3e5de SHA1 c17605d761ea37c8fa49db1a4797b4b137629c56 SHA256 3877a7a4f9376c3ce4c014972c58f129bb8285c8241d193b0aec37b52a81d517
 DIST scummvm-0.9.0.tar.bz2 4305972 RMD160 3537c2c0c5ed92db50dea47836b1dca83b21e1f0 SHA1 add7b5de06734326e9adacdd4d33264b1e563567 SHA256 5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e
-EBUILD scummvm-0.8.0.ebuild 1744 RMD160 1a53e013e285e034ee9862a1b4f34dad8e7fc34e SHA1 0c2e3ac5462a1a47f084f305d3042f466ddd232f SHA256 c1c6af83316ac58c6bed84b66fdc824c17d53ccf8ed1ba1840bd0545b0ffb933
-MD5 0e8df7593839cc383bdcbf7034cae1f4 scummvm-0.8.0.ebuild 1744
-RMD160 1a53e013e285e034ee9862a1b4f34dad8e7fc34e scummvm-0.8.0.ebuild 1744
-SHA256 c1c6af83316ac58c6bed84b66fdc824c17d53ccf8ed1ba1840bd0545b0ffb933 scummvm-0.8.0.ebuild 1744
 EBUILD scummvm-0.8.1.ebuild 1967 RMD160 839fced0db3c139ff8cadf7d73abf52070486260 SHA1 89004e7f1ef9d3586a557afe26132f112d3288d3 SHA256 f8ad5ee2b3adeabb5019e62689085130b9acd7499958aaee640ff4399aa11752
 MD5 0132ed86efded778235e1aaee66bd121 scummvm-0.8.1.ebuild 1967
 RMD160 839fced0db3c139ff8cadf7d73abf52070486260 scummvm-0.8.1.ebuild 1967
@@ -29,21 +17,18 @@ EBUILD scummvm-0.8.2.ebuild 2099 RMD160 4478a8aa346a3899b671578042e1ee806007658f
 MD5 fa366c255ef308b03e09c8fe7b7bf5e8 scummvm-0.8.2.ebuild 2099
 RMD160 4478a8aa346a3899b671578042e1ee806007658f scummvm-0.8.2.ebuild 2099
 SHA256 60c61588cd10bb264d8e1fabaf922855143ce8ad8ae880330d3ad3991cdc391a scummvm-0.8.2.ebuild 2099
-EBUILD scummvm-0.9.0.ebuild 2090 RMD160 312da7bce92599ba2add1bc64736e73925097fc5 SHA1 a496fcfc4d72d160d3a4ef9b3c57d259bc4654be SHA256 43933632b9fbf739779733c0bca608a663056f6ed1b6cdb4dcb78ac88b990567
-MD5 7378567bdd03bb7c2126d479d272fe3f scummvm-0.9.0.ebuild 2090
-RMD160 312da7bce92599ba2add1bc64736e73925097fc5 scummvm-0.9.0.ebuild 2090
-SHA256 43933632b9fbf739779733c0bca608a663056f6ed1b6cdb4dcb78ac88b990567 scummvm-0.9.0.ebuild 2090
-MISC ChangeLog 6626 RMD160 3fd68b2f6b6412e4cb82a34c7a9637106a922504 SHA1 c2fd070d4b816162bb22b9b39b1da40abf6df7d9 SHA256 80882906f3f03b3786995c23281e547f02442889de7d4964ab01ea7ad7352a24
-MD5 77831b935cec8587025239254bd1047d ChangeLog 6626
-RMD160 3fd68b2f6b6412e4cb82a34c7a9637106a922504 ChangeLog 6626
-SHA256 80882906f3f03b3786995c23281e547f02442889de7d4964ab01ea7ad7352a24 ChangeLog 6626
+EBUILD scummvm-0.9.0.ebuild 2441 RMD160 90c33dfbf15c01edd17e0cab43019e23dc3e2c0a SHA1 1e2f5eaa40aa8768f10ce904f518fcf39652619c SHA256 86d2756314ec4293ba978115e4aa6d7e632f5a99d52b79a2a8c488f86d67f940
+MD5 5b67dc7fa1235f2ccce08103cdfae877 scummvm-0.9.0.ebuild 2441
+RMD160 90c33dfbf15c01edd17e0cab43019e23dc3e2c0a scummvm-0.9.0.ebuild 2441
+SHA256 86d2756314ec4293ba978115e4aa6d7e632f5a99d52b79a2a8c488f86d67f940 scummvm-0.9.0.ebuild 2441
+MISC ChangeLog 6870 RMD160 e4da2c1bc5c27484b3adc7242835a368baa2fe8f SHA1 79d89f9391c4a63f267b8c72947c2b280933c1b9 SHA256 91e1ce2de971ff6a24578e37a7d97d75033f13b766c4a80e7cb963ff768b805e
+MD5 c218bd6db0cdddb63c6f4e3cc21353ff ChangeLog 6870
+RMD160 e4da2c1bc5c27484b3adc7242835a368baa2fe8f ChangeLog 6870
+SHA256 91e1ce2de971ff6a24578e37a7d97d75033f13b766c4a80e7cb963ff768b805e ChangeLog 6870
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 2ec5c6afce7080c04a19c5ce37af6c70 files/digest-scummvm-0.8.0 247
-RMD160 ac58069a2987151d663467dfd4eaeb488339e33c files/digest-scummvm-0.8.0 247
-SHA256 2a368f3ba857b52011dd5ea3122d556e61b22499b6deb3f66cf9061859d416a2 files/digest-scummvm-0.8.0 247
 MD5 014539cc53abe4aa9d2c820655c715f5 files/digest-scummvm-0.8.1 247
 RMD160 d8303f4f0315ddacf374da9efaa590acc3d5a60c files/digest-scummvm-0.8.1 247
 SHA256 e7a3ba5b7bd551d72ce49ec3f1070aebe89411bbe9e9d1b35842ef34d14b6a6f files/digest-scummvm-0.8.1 247
@@ -53,10 +38,3 @@ SHA256 c021e7c05f04f4d66df82c25ca77c3bde7b83ad3399486a6881c8867cbb9004b files/di
 MD5 8faf365a880d3ea2bde0a2ef2b99952d files/digest-scummvm-0.9.0 247
 RMD160 db92c1791808068d14f9c74ac0cb4a00c02632fb files/digest-scummvm-0.9.0 247
 SHA256 4d2662fd1b10ffb2ae1cb8dda19d95da625c6401180b656d383ce247e2e07aac files/digest-scummvm-0.9.0 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEn3Up9AbAhSK0CiwRAjt3AJ9U4Sp9rcqArJaQLGuSdrUxLXu8GgCaAmrv
-sWqA23gEUYJpLlPUuWERk68=
-=QLVd
------END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/files/digest-scummvm-0.8.0 b/games-engines/scummvm/files/digest-scummvm-0.8.0
deleted file mode 100644
index 986105871753..000000000000
--- a/games-engines/scummvm/files/digest-scummvm-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56bfbcfbe5adde42a2a9e3d6dc3d9068 scummvm-0.8.0.tar.bz2 2654730
-RMD160 af3113a25adb30332176e6839dd30b21e09f292e scummvm-0.8.0.tar.bz2 2654730
-SHA256 ba1607691f0859974543b3d3759edf21860415f2c9d2bc4bdf1639a28f88a1a2 scummvm-0.8.0.tar.bz2 2654730
diff --git a/games-engines/scummvm/files/scummvm-0.8.0-configure.patch b/games-engines/scummvm/files/scummvm-0.8.0-configure.patch
deleted file mode 100644
index 0b955c2b6ab2..000000000000
--- a/games-engines/scummvm/files/scummvm-0.8.0-configure.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure
-+++ configure
-@@ -433,4 +433,5 @@
-         _backend=`echo $ac_option | cut -d '=' -f 2`
-         ;;
-+      --enable-debug);;
-       --disable-debug)
-         DEBFLAGS=""
diff --git a/games-engines/scummvm/scummvm-0.8.0.ebuild b/games-engines/scummvm/scummvm-0.8.0.ebuild
deleted file mode 100644
index f0140d264069..000000000000
--- a/games-engines/scummvm/scummvm-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.8.0.ebuild,v 1.1 2005/10/31 01:25:52 vapier Exp $
-
-inherit eutils 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 sparc x86"
-IUSE="alsa debug flac mp3 ogg vorbis sdl zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2
-	>media-libs/libmpeg2-0.3.1
-	ogg? ( media-libs/libogg media-libs/libvorbis )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	mp3? ( media-libs/libmad )
-	flac? ( media-libs/flac )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-}
-
-src_compile() {
-	local myconf="--backend=sdl" # x11 backend no worky (bug #83502)
-
-	(use vorbis || use ogg) \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-mpeg2"
-
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	# mpeg2 support needs vorbis (bug #79149) so turn it off if -oggvorbis
-	./configure \
-		$(use_enable debug) \
-		$(use_enable alsa) \
-		$(use_enable mp3 mad) \
-		$(use_enable flac) \
-		$(use_enable zlib) \
-		$(use_enable x86 nasm) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin scummvm || die "dobin failed"
-	doman scummvm.6
-	dodoc NEWS README TODO
-	doicon scummvm.xpm
-	make_desktop_entry scummvm ScummVM
-	prepgamesdirs
-}