gentoo resync : 28.04.2019

4 files changed, 4 insertions, 123 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9a2f5c4dfbba..d07ee96ca7d3 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 23a78401199c..4f6bbc209db8 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,5 +1,4 @@
 AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
-EBUILD scummvm-2.0.0-r1.ebuild 2593 BLAKE2B 33241fd8d519d764fe159ba8878eb54b6c82133e86c56b546e7154322640c2d52b9603986235937eb0717faa75650e3982abd4ba9a8d77a7a163cb13882a6125 SHA512 6ede107638bb458fc88ce58ca2e258fdef8afbdf6658a5ad77b174788979acf58e0a000ebd6bb92a54ab6b0dd9e0366cd69f4ea4cec455b7a34a28c16473e8c3
-EBUILD scummvm-2.0.0.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7
+EBUILD scummvm-2.0.0-r1.ebuild 2487 BLAKE2B bf8f92a9d6b73e50b93d8e566adc25558a3fa9a70c7330b34eb84fb4db6d0f2f74faffcc7da3b1edeb08a1f73c71f381e6e8e8c65beece5b1b61262752575ce1 SHA512 f71e3c93a20aa2a351afe434a76c87cd86238fcca29b70b17c68544571f8aacd525b69eb36fbacb692af422596c9ad83869bffee0d4dc335758bd503f03d2368
 MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 858b3bcc36b5..80cf8306ba46 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 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"
+HOMEPAGE="https://www.scummvm.org/"
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
@@ -43,7 +43,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# -g isn't needed for nasm here
 	sed -i \
@@ -96,15 +96,3 @@ src_install() {
 	default
 	doicon -s scalable icons/scummvm.svg
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
deleted file mode 100644
index b4df47b76af2..000000000000
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/"
-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/libsdl2-2.0.0[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
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
-
-src_prepare() {
-	default
-
-	# -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() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure \
-		--backend=sdl \
-		--host=${CHOST} \
-		--enable-verbose-build \
-		--prefix=/usr \
-		--libdir="/usr/$(get_libdir)" \
-		--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 mp3 mad) \
-		$(use_enable mpeg2) \
-		$(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) \
-		${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}