gentoo resync : 05.12.2021

3 files changed, 148 insertions, 4 deletions

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 31b5342291b3..7528c4f2eebf 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,8 @@
 AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
+DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8 SHA512 7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e556666281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
 EBUILD scummvm-2.2.0-r2.ebuild 3284 BLAKE2B 56f2c163028a473699af68c5d0707d7bbf3d7f3f077008d8e73272e65e55c0d6b59d4f1dd0ad63cb040c17b3e733157f35e4b2db0e42562e6970a2f6aedaf3ee SHA512 a2170c84373dc0c2905667a31f4ab2af67a3400afd7bd0ae5c142accf1151934a939b96084e5d3962ebd1679caaa7418dbc54b71cf9aba9004911ec21ff64077
-EBUILD scummvm-9999.ebuild 3253 BLAKE2B b93f721bf4bb0c7a1022787f0d5a5dfd52163e8f3ecc92c17e9495329bdd9714a3dd23e91206f9bf6c0d059fc3c36cbee3f80d8f1ca2b0228a2a42dd96f88de9 SHA512 d1ff22ce066261a64e63f87646cd1401ba4d9d6fad1c613d0bde0780a1c7713957c7bd52249107921413f781b8635ebafe0355b62d8b16012c00715410a277ef
+EBUILD scummvm-2.5.0.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
+EBUILD scummvm-9999.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
 MISC metadata.xml 1215 BLAKE2B 87d954f59103b0bdc1300094f195638f44dee1ddfeaadc40dc515248fea7b3da553313a1a6e8478b5e7a827c8971da5a3a56756ae5fc01464af1e8295623db5c SHA512 1a5592562aabd4d78f22dbed63446593b6082b676fcae152b7f1e173c92972d89fa1d99cc759991db55e42670fc122aeb1b22b5c0e7defcb7a3bf68eaea110a7
diff --git a/games-engines/scummvm/scummvm-2.5.0.ebuild b/games-engines/scummvm/scummvm-2.5.0.ebuild
new file mode 100644
index 000000000000..9f70736f67ee
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.5.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
+HOMEPAGE="https://www.scummvm.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+else
+	SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio 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:= )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jpeg? ( virtual/jpeg:0 )
+	mp3? ( media-libs/libmad )
+	mpeg2? ( media-libs/libmpeg2 )
+	net? (
+		media-libs/sdl2-net
+		net-misc/curl
+	)
+	opengl? (
+		|| (
+			virtual/opengl
+			media-libs/mesa[gles2]
+			media-libs/mesa[gles1]
+		)
+		glew? ( media-libs/glew:0= )
+	)
+	png? ( media-libs/libpng:0 )
+	sndio? ( media-sound/sndio:= )
+	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/_/}"
+
+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
+	tc-export STRINGS
+
+	local myconf=(
+		--backend=sdl
+		--host=${CHOST}
+		--enable-verbose-build
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--opengl-mode=$(usex opengl auto none)
+		--with-sdl-prefix="${EPREFIX}/usr"
+		$(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 fribidi)
+		$(use_enable gif)
+		$(use opengl && use_enable glew)
+		$(use_enable gtk)
+		$(use_enable jpeg)
+		$(use_enable lua)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg2)
+		$(use_enable net libcurl)
+		$(use_enable net sdlnet)
+		$(use_enable png)
+		$(use_enable sndio)
+		$(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
+}
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index cf7685a08e01..9f70736f67ee 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -11,14 +11,14 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
 else
-	SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	flac? ( media-libs/flac )
 	fluidsynth? ( media-sound/fluidsynth:= )
 	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:3
@@ -102,6 +103,7 @@ src_configure() {
 		$(use_enable flac)
 		$(usex fluidsynth '' --disable-fluidsynth)
 		$(use_enable fribidi)
+		$(use_enable gif)
 		$(use opengl && use_enable glew)
 		$(use_enable gtk)
 		$(use_enable jpeg)