[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/

[James Le Cuirot]

commit:     70c58a213ee7a2205cb7f6e7790063b97876ae60
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 22:37:52 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 22:38:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c58a21

games-engines/scummvm: Drop old 2.0.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-engines/scummvm/Manifest                     |  1 -
 .../files/scummvm-2.0.0-freetype_pkgconfig.patch   | 99 ----------------------
 games-engines/scummvm/scummvm-2.0.0-r1.ebuild      | 98 ---------------------
 3 files changed, 198 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index eafca9329bc..75b986c1944 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218

diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e89271..00000000000
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@g.o>
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH] Prefer pkg-config over freetype-config if possible
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- configure | 56 ++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/configure b/configure
-index 8e2a387acc..210951e343 100755
---- a/configure
-+++ b/configure
-@@ -204,6 +204,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4668,28 +4669,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
--	# Look for the freetype-config script
--	find_freetypeconfig
--
--	if test -z "$_freetypeconfig"; then
--		_freetype2=no
-+find_freetype() {
-+        # Wrapper function which tries to find freetype
-+        # either by callimg freetype-config or by using
-+        # pkg-config.
-+        # As of freetype-2.9.1 the freetype-config file
-+        # no longer gets installed by default.
-+
-+	if pkg-config --exists freetype2; then
-+		FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
-+		_freetype_found="true"
- 	else
--		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
--		# This means we can't pass it a --prefix that includes $SYSROOT.
--		freetypeprefix="$_freetypepath"
--		if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
--			teststring=VeryImplausibleSysrootX1Y2Z3
--			if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
--				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
--				freetypeprefix="${freetypeprefix##$SYSROOT}"
-+		# Look for the freetype-config script
-+		find_freetypeconfig
-+		if test -n "$_freetypeconfig"; then
-+			# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
-+			# This means we can't pass it a --prefix that includes $SYSROOT.
-+			freetypeprefix="$_freetypepath"
-+			if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
-+				teststring=VeryImplausibleSysrootX1Y2Z3
-+				if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
-+					echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
-+					freetypeprefix="${freetypeprefix##$SYSROOT}"
-+				fi
- 			fi
-+			FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
-+			FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
-+			FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null`
-+			_freetype_found="true"
- 		fi
-+	fi
-+}
- 
--		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
--		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
--
-+if test "$_freetype2" != "no"; then
-+	find_freetype
-+	if test $_freetype_found != true; then
-+		_freetype2=no
-+	else
- 		if test "$_freetype2" = "auto"; then
- 			_freetype2=no
- 
-@@ -4709,7 +4727,7 @@ EOF
- 			# required flags for static linking. We abuse this to detect
- 			# FreeType2 builds which are static themselves.
- 			if test "$_freetype2" != "yes"; then
--				FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
-+				FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS"
- 				cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
- 			fi
- 			cc_check_clean
--- 
-2.17.0
-

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
deleted file mode 100644
index ec9d93fc808..00000000000
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-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"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-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}"
-BDEPEND="
-	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() {
-	xdg_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() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	local myconf=(
-		--backend=sdl
-		--host=${CHOST}
-		--enable-verbose-build
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/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)
-	)
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}