commit: b4683895cb37c523bd4925e205681d3014a49802
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 21:53:42 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 21:53:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4683895
games-engines/residualvm: Drop last-rited package
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/residualvm/Manifest | 1 -
.../residualvm-0.3.1-freetype_pkgconfig.patch | 145 ---------------------
games-engines/residualvm/metadata.xml | 14 --
.../residualvm/residualvm-0.3.1-r2.ebuild | 98 --------------
games-engines/residualvm/residualvm-9999.ebuild | 82 ------------
profiles/package.mask | 5 -
6 files changed, 345 deletions(-)
diff --git a/games-engines/residualvm/Manifest
b/games-engines/residualvm/Manifest
deleted file mode 100644
index fb840283578d..000000000000
--- a/games-engines/residualvm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST residualvm-0.3.1-sources.tar.bz2 6711799 BLAKE2B
93d21bc5ee2c567b1ef256a69a2634761cd52211a0b2d926edc67b65e0cc1bf23b41c91225e6d43990d61e6c3761acf19defaa9b477ad882d332ad77c71af1a6
SHA512
491a77f1775718795d93f099fa39ec5888755ac1df610089c17209334b98ae783271078ed03a61ced09835aa327446804a55522d4b83f618dd3b843c231444a0
diff --git
a/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch
b/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch
deleted file mode 100644
index 41468ebf2b13..000000000000
--- a/games-engines/residualvm/files/residualvm-0.3.1-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 34fc21424803ad193532c8423049ad07131fd7db Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomia...@gentoo.org>
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH 1/2] BUILD: 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 | 47 ++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 38 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 7e0c9300..0a00cd95 100755
---- a/configure
-+++ b/configure
-@@ -209,6 +209,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4529,17 +4530,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
-- # Look for the freetype-config script
-- find_freetypeconfig
-+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
-+ # 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
-+}
-
-- if test -z "$_freetypeconfig"; then
-+if test "$_freetype2" != "no"; then
-+ find_freetype
-+ if test $_freetype_found != true; then
- _freetype2=no
- else
-- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath"
--libs`
-- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath"
--cflags`
--
- if test "$_freetype2" = "auto"; then
- _freetype2=no
-
-@@ -4559,7 +4588,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.21.0
-
-From c42f90595efae54e661293832bf979f3029599fb Mon Sep 17 00:00:00 2001
-From: Bastien Bouclet <bastien.bouc...@gmail.com>
-Date: Mon, 30 Jul 2018 13:40:55 +0200
-Subject: [PATCH 2/2] BUILD: Check if pkg-config is available
-
----
- configure | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 0a00cd95..198c1938 100755
---- a/configure
-+++ b/configure
-@@ -3866,7 +3866,19 @@ EOF
- cc_check -lm && append_var LIBS "-lm"
-
- #
--# Check for Ogg Vorbis
-+# Check for pkg-config
-+#
-+echocheck "pkg-config"
-+_pkg_config=no
-+command -v pkg-config >/dev/null 2>&1 && _pkg_config=yes
-+echo "$_pkg_config"
-+
-+if test "$_pkg_config" = yes && test -n "$_host" && test -z
"$PKG_CONFIG_LIBDIR"; then
-+ echo "WARNING: When cross-compiling PKG_CONFIG_LIBDIR must be set to
the location of the .pc files for the target"
-+fi
-+
-+#
-+# Check for Ogg
- #
- echocheck "Ogg Vorbis"
- if test "$_vorbis" = auto ; then
-@@ -4490,7 +4502,7 @@ define_in_config_h_if_yes "$_text_console"
'USE_TEXT_CONSOLE_FOR_DEBUGGER'
- # Check for Unity if taskbar integration is enabled
- #
- echocheck "libunity"
--if test "$_unix" = no || test "$_taskbar" = no; then
-+if test "$_unix" = no || test "$_taskbar" = no || test "$_pkg_config" = no;
then
- _libunity=no
- else
- if test "$_libunity" = auto ; then
-@@ -4536,8 +4548,7 @@ find_freetype() {
- # pkg-config.
- # As of freetype-2.9.1 the freetype-config file
- # no longer gets installed by default.
--
-- if pkg-config --exists freetype2; then
-+ if test "$_pkg_config" = "yes" && 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`
---
-2.21.0
-
diff --git a/games-engines/residualvm/metadata.xml
b/games-engines/residualvm/metadata.xml
deleted file mode 100644
index 65b4f9322632..000000000000
--- a/games-engines/residualvm/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>ga...@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <use>
- <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">residualvm</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
b/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
deleted file mode 100644
index 327b61a26d51..000000000000
--- a/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs xdg
-
-DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts'
LUA-based 3D adventures"
-HOMEPAGE="https://www.residualvm.org/";
-if [[ "${PV}" = 9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/residualvm/residualvm.git";
-else
-
SRC_URI="https://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2";
- KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="alsa debug jpeg mpeg2 mp3 opengl png truetype vorbis zlib"
-
-# TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl[alsa]
-RDEPEND="
- media-libs/glew:0=
- media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
- virtual/glu
- alsa? ( media-libs/alsa-lib )
- jpeg? ( virtual/jpeg:0 )
- mp3? ( media-libs/libmad )
- mpeg2? ( media-libs/libmpeg2 )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- truetype? ( media-libs/freetype:2 )
- vorbis? ( media-libs/libvorbis )
- zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-src_configure() {
- # not an autotools script
- # some configure options currently do nothing, verify on version bump
!!!
- # disable explicitly, otherwise we get unneeded linkage (some
copy-paste build system)
- local myconf=(
- --backend=sdl
- --disable-faad
- --disable-flac
- --disable-fluidsynth
- --disable-libunity
- --disable-sparkle
- --disable-tremor
- --docdir="/usr/share/doc/${PF}"
- --enable-all-engines
- --enable-verbose-build
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --host="${CHOST}"
- --prefix="${EPREFIX}/usr"
- $(use_enable alsa)
- $(use_enable debug)
- $(use_enable !debug release-mode)
- $(use_enable jpeg)
- $(use_enable mp3 mad)
- $(use_enable mpeg2)
- $(use_enable opengl)
- $(use_enable opengl opengl-shaders)
- $(use_enable png)
- $(use_enable truetype freetype2)
- $(use_enable vorbis)
- $(use_enable zlib)
- )
- ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
-}
-
-src_compile() {
- emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
- default
- doicon -s 256 icons/${PN}.png
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/games-engines/residualvm/residualvm-9999.ebuild
b/games-engines/residualvm/residualvm-9999.ebuild
deleted file mode 100644
index 704091853c9a..000000000000
--- a/games-engines/residualvm/residualvm-9999.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs xdg
-
-DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts'
LUA-based 3D adventures"
-HOMEPAGE="https://www.residualvm.org/";
-if [[ "${PV}" = 9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/residualvm/residualvm.git";
-else
-
SRC_URI="https://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2";
- KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="alsa debug jpeg mpeg2 mp3 opengl png truetype vorbis zlib"
-
-# TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl2[alsa]
-RDEPEND="
- media-libs/glew:0=
- media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
- virtual/glu
- alsa? ( media-libs/alsa-lib )
- jpeg? ( virtual/jpeg:0 )
- mp3? ( media-libs/libmad )
- mpeg2? ( media-libs/libmpeg2 )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- truetype? ( media-libs/freetype:2 )
- vorbis? ( media-libs/libvorbis )
- zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_configure() {
- # not an autotools script
- # some configure options currently do nothing, verify on version bump
!!!
- # disable explicitly, otherwise we get unneeded linkage (some
copy-paste build system)
- local myconf=(
- --backend=sdl
- --disable-faad
- --disable-flac
- --disable-fluidsynth
- --disable-libunity
- --disable-sparkle
- --disable-tremor
- --docdir="/usr/share/doc/${PF}"
- --enable-all-engines
- --enable-verbose-build
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --host="${CHOST}"
- --prefix="${EPREFIX}/usr"
- $(use_enable alsa)
- $(use_enable debug)
- $(use_enable !debug release-mode)
- $(use_enable jpeg)
- $(use_enable mp3 mad)
- $(use_enable mpeg2)
- $(use_enable opengl)
- $(use_enable opengl opengl-shaders)
- $(use_enable png)
- $(use_enable truetype freetype2)
- $(use_enable vorbis)
- $(use_enable zlib)
- )
- ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
-}
-
-src_compile() {
- emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
- default
- doicon -s 256 icons/${PN}.png
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 311aaaa86e6c..3bd19cf573ea 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -880,11 +880,6 @@ net-print/kyocera-mita-ppds
# Removal on 2023-01-14. Bug #884881
net-print/apsfilter
-# James Le Cuirot <ch...@gentoo.org> (2022-12-14)
-# Merged into games-engines/scummvm a while back. No longer maintained
upstream.
-# Removal in 30 days.
-games-engines/residualvm
-
# Jaco Kroon <j...@uls.co.za> (2022-12-14)
# Multiple open bugs (bug #870910, bug #877731, bug #884815), only one of which
# is trivial to solve.
