commit: 0f43ed98a37ffddd26f18f1c6cbe53783148d9c8 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Jul 19 11:11:51 2020 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jul 19 11:49:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f43ed98
games-engines/scummvm: Drop old 2.1.0 Package-Manager: Portage-2.3.103, Repoman-2.3.22 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-engines/scummvm/Manifest | 1 - .../files/scummvm-2.1.0-tts_pthread_link.patch | 22 ---- games-engines/scummvm/scummvm-2.1.0.ebuild | 111 --------------------- 3 files changed, 134 deletions(-) diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index dd160ccc1dd..ce4c90ad0a3 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -1,2 +1 @@ -DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218 DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2 SHA512 a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch deleted file mode 100644 index 70440be0e13..00000000000 --- a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001 -From: Christian Krause <[email protected]> -Date: Wed, 16 Oct 2019 22:41:27 +0200 -Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 0adf0bb7bad..dbfe336e6d0 100755 ---- a/configure -+++ b/configure -@@ -5504,7 +5504,7 @@ else - echo "linux" - _tts=yes - define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER' -- append_var LIBS '-lspeechd' -+ append_var LIBS '-lspeechd -lpthread' - ;; - mingw*) - echo "win32" diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild deleted file mode 100644 index 7aacd055d80..00000000000 --- a/games-engines/scummvm/scummvm-2.1.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 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 ~arm64 ~ppc ~ppc64 ~x86" -IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png speech 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] - a52? ( media-libs/a52dec ) - aac? ( media-libs/faad2 ) - alsa? ( media-libs/alsa-lib ) - flac? ( media-libs/flac ) - fluidsynth? ( media-sound/fluidsynth ) - jpeg? ( virtual/jpeg:0 ) - mp3? ( media-libs/libmad ) - mpeg2? ( media-libs/libmpeg2 ) - net? ( media-libs/sdl2-net ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0 ) - speech? ( app-accessibility/speech-dispatcher ) - truetype? ( media-libs/freetype:2 ) - theora? ( media-libs/libtheora ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - truetype? ( virtual/pkgconfig ) - x86? ( dev-lang/nasm ) -" - -S="${WORKDIR}/${P/_/}" - -PATCHES=( - "${FILESDIR}/${P}-tts_pthread_link.patch" - "${FILESDIR}/${P}-fluidsynth.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 a52) - $(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 lua) - $(use_enable mp3 mad) - $(use_enable mpeg2) - $(use_enable net sdlnet) - $(use_enable png) - $(use_enable speech tts) - $(use_enable theora theoradec) - $(use_enable truetype freetype2) - $(usex unsupported --enable-all-engines '') - $(use_enable vorbis) - $(use_enable zlib) - $(use_enable x86 nasm) - ) - echo "configure ${myconf[@]}" - # 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 -}
