gentoo resync : 20.12.2017

6 files changed, 34 insertions, 147 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 563a9a752151..2a749b1d317f 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 5dce35d87b94..8bc74dfaa767 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,5 +1,6 @@
 AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
 DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb SHA512 eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
+DIST scummvm-tools-2.0.0.tar.xz 866668 BLAKE2B 51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff SHA512 a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
 EBUILD scummvm-tools-1.8.0-r1.ebuild 1304 BLAKE2B 4b785438ab857a6f5e91cafc38321d6da9564c4158cf836dff9de4f48532cb107a66e6cd0e510e8635ee889c5c5f57589bcfe44ed7014360f03c5a0d6802f1c1 SHA512 42ff6659c2505d40df6b107958e138d3e346402b1bbed325a10a30bb5041091096a07e78114fdb8ac597b76aa5a9fda3f01b76350d1416565185738bc18c4cf1
-EBUILD scummvm-tools-1.8.0.ebuild 1401 BLAKE2B b3c3264a723bea83b2bd6cf7310bfd548825679b278d108c932059e10448f63a755cc99360559c18277765487ddc440df06572cba618108fcbd415ffb3cfa2aa SHA512 a94a1b251504a38243b83b23ce16b856b09927377a9409a07014ed894a91e77fb7edc97d8969c272f886db4d6ef1ffceaa1cece085dd623733e96edd77d4708a
+EBUILD scummvm-tools-2.0.0.ebuild 1311 BLAKE2B 83be112619d4c37adee8d27d06b9d54731440bc9c543fcc8fd0e49e48d29d7ad9b7dea477870c38079ce553267dd3502bd1fb749c763788b041126e5f42ae5d4 SHA512 8a7cc89365d797f4c5b7ad46fded9df81fd07834c1d3bbe17a31e7068a8b13485fc8ff7100fdb53b5b83ac864abef9612b7260346a0c338f8779cc1e0811e13a
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
index 3ce3b2b19242..c673ff3f6e8a 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic games
+inherit wxwidgets eutils flag-o-matic
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/"
@@ -15,34 +15,36 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
-RDEPEND="png? ( media-libs/libpng:0 )
-	mad? ( media-libs/libmad )
+RDEPEND=">=dev-libs/boost-1.32
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}
 	flac? ( media-libs/flac )
-	vorbis? ( media-libs/libvorbis )
 	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	sys-libs/zlib
-	>=dev-libs/boost-1.32
-	x11-libs/wxGTK:${WX_GTK_VER}"
+	mad? ( media-libs/libmad )
+	png? ( media-libs/libpng:0 )
+	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+)
+
 src_prepare() {
+	default
+
 	need-wxwidgets unicode
-	rm -rf *.bat dists/win32
+	rm -rf *.bat dists/win32 || die
 	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-	epatch "${FILESDIR}/${P}-binprefix.patch"
 }
 
 src_configure() {
 	# Not an autoconf script
 	./configure \
+		--disable-tremor \
 		--enable-verbose-build \
 		--mandir=/usr/share/man \
-		--prefix="${GAMES_PREFIX}" \
-		--libdir="${GAMES_PREFIX}/lib" \
-		--datadir="${GAMES_DATADIR}" \
-		--disable-tremor \
 		$(use_enable flac) \
 		$(use_enable iconv) \
 		$(use_enable iconv freetype) \
@@ -53,5 +55,4 @@ src_configure() {
 
 src_install() {
 	EXEPREFIX="${PN}-" default
-	prepgamesdirs
 }
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 1e4941f61a92..9ba251b0f11e 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,7 +1,5 @@
-DIST scummvm-1.8.0.tar.xz 17385064 BLAKE2B 02298f525f38d07f89ed829585498ca3cf807b6f1aa9f7601e5f1759a3d908cd99cd19c3a21169b7df9db52eb5b38e2b56d4eac6bdca3ba01c972e5a5054827b SHA512 2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
-DIST scummvm-1.8.1.tar.xz 17807468 BLAKE2B c5ba8c54b96467d4362b7a41afafd5686ae817b619a2bcbc5c82f10fbc0f89af78720ec187503dd3e4ed2ffff577932cf31f84c666cdabbddf579c0f79bfeb1a SHA512 e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773 SHA512 c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
-EBUILD scummvm-1.8.0.ebuild 2705 BLAKE2B 5b2eea47fe6116ec25a3fb446eb34e38f29e7c5e2aff866f5d9b428c3bf60eed6cdf47416c113ed270e481a5f0e57a95041ceafa4f073d85316a8c4336db92bc SHA512 f1291988d4a468508f5792d96fb0d161c45b3de1f199d51201c313f040cbe7f0f250c6f2fd2826aa7ea59518680209a466dea433faa26ff057182fb03b7818c7
-EBUILD scummvm-1.8.1-r1.ebuild 2617 BLAKE2B 7184df5aa8e47dc5e4b13c4ca5cc99eb9abf31eaefa0c53def38f0148d33fa58d42d4bcabaa97beb00a9dbedc493399958187adb2175ae581605597ecd2b1f07 SHA512 952a6ca57c7d5dceae1c72253373700cb6695efa3295edc902cfce8cadcdcad3823eb811d131be6e0998f8f2a2410b5593df2374ca08815830981349d9cd9948
+DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 EBUILD scummvm-1.9.0.ebuild 2572 BLAKE2B 31a15a603f5b6fa33ad38da05a439e0285e4af3cf9212c8e9e403775184045a60ccff0910733ad258772420325d2395f52a54a75582f177b87bd3ad628324f0d SHA512 6d6d2bbddd94c21be730b1903f6c315a2fffe0d4ac95b41ab5cc41e08c67871a74936faaacdd49b3c2a0118caef8c7a5703ff850bc938449e233a7acfa08b606
+EBUILD scummvm-2.0.0.ebuild 2575 BLAKE2B 7965ddcff62fd65ec4c12c0baadb7a448e0502f60c9a34a336924fced0b65c7850408cde3433dffc6bc380776bb419a055aef2602f4052aa4279a6c50ab96e0b SHA512 56eac37da16d842732e436607093d7c9564dedc9c7557259de23211670ed7e215f1731aef3ba445ffce2215c158a2208a2d5d449578f37a4d86d445a750d86d3
 MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
diff --git a/games-engines/scummvm/scummvm-1.8.0.ebuild b/games-engines/scummvm/scummvm-1.8.0.ebuild
deleted file mode 100644
index 4edb099d8009..000000000000
--- a/games-engines/scummvm/scummvm-1.8.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
-	zlib? ( sys-libs/zlib )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	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 !debug release-mode) \
-		$(use_enable zlib) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg2) \
-		$(use_enable flac) \
-		$(use_enable opengl) \
-		$(use_enable vorbis) \
-		$(use_enable theora theoradec) \
-		$(use_enable truetype freetype2) \
-		$(use_enable x86 nasm) \
-		$(use unsupported && echo --enable-all-engines) \
-		${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	default
-	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
-}
diff --git a/games-engines/scummvm/scummvm-1.8.1-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
index 48d2513b1557..4f775bc1705d 100644
--- a/games-engines/scummvm/scummvm-1.8.1-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
 HOMEPAGE="http://scummvm.sourceforge.net/"
@@ -49,38 +49,33 @@ src_prepare() {
 }
 
 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
 	SDL_CONFIG="sdl2-config" \
 	./configure \
 		--backend=sdl \
-		--host=$CHOST \
+		--host=${CHOST} \
 		--enable-verbose-build \
 		--prefix=/usr \
 		--libdir="/usr/$(get_libdir)" \
-		--enable-zlib \
-		$(use_enable debug) \
-		$(use_enable !debug release-mode) \
-		$(use_enable zlib) \
+		--opengl-mode=$(usex opengl auto none) \
 		$(use_enable aac faad) \
 		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable !debug release-mode) \
+		$(use_enable flac) \
+		$(usex fluidsynth '' --disable-fluidsynth) \
 		$(use_enable jpeg) \
-		$(use_enable png) \
 		$(use_enable mp3 mad) \
 		$(use_enable mpeg2) \
-		$(use_enable flac) \
-		$(use_enable opengl) \
-		$(use_enable vorbis) \
+		$(use_enable png) \
 		$(use_enable theora theoradec) \
 		$(use_enable truetype freetype2) \
+		$(usex unsupported --enable-all-engines '') \
+		$(use_enable vorbis) \
+		$(use_enable zlib) \
 		$(use_enable x86 nasm) \
-		$(use unsupported && echo --enable-all-engines) \
 		${myconf} ${EXTRA_ECONF} || die
 }
 
@@ -91,7 +86,6 @@ src_compile() {
 src_install() {
 	default
 	doicon -s scalable icons/scummvm.svg
-	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
 }
 
 pkg_preinst() {
@@ -100,8 +94,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }