gentoo resync : 14.12.2020

6 files changed, 189 insertions, 1 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index da6cb1dc4fb8..998a7b3812d8 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e860095242e1..050768d4b0f0 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -4,4 +4,5 @@ DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
 EBUILD scummvm-2.1.2.ebuild 2789 BLAKE2B 5b7cb6a8ae1f1fc3bc29d68ea541b4257ea4d22f2467b2e9a3054e463742dc089d0e8d4d0d721c56387ba8963edcb43dedf098d99ce7fa81491d1d61a0f5f7bc SHA512 cd0d059b6fed3c9cca2583f825a2c9bdc60fb96e00e82763e017a1d642558b3d30cdeb3a03f2bb1d27103fae09c57edaae4ebb38c40a012da4612012a463d32e
 EBUILD scummvm-2.2.0.ebuild 3012 BLAKE2B 35bc1755871d55348a3195ad998ad0c9dbcd1bac4fe8b0b52c940dbb7dbb15a8b576911f7e3780e411e42cc1dd5e4391868e223cd63f971771772c90f9e34963 SHA512 e1356c00c95363345c7254709a62cc891fcc94db7939af9e58d2655d384e41d492a392f2bd2a8d5af81ac438d0cf330814ecdc92badc2f94bf17bfa28f762bdc
-MISC metadata.xml 894 BLAKE2B f3331593c51c1863c697f45bf0cfd176e5b5db9596df56f75c09710a10ee09fd6bcf9b63b5577688fb536236bc7462f9ecd21c58faf7f135e79a54015e376c9b SHA512 52f617e20c0fb06697490d9f085dabeac806831e001e51a58bcfd9d805092edc8bf98b81f9e385fe428ed5a4e0bce7faa96e4e6adaf05023316dcc0e63237c97
+EBUILD scummvm-9999.ebuild 2995 BLAKE2B 1a484a278b024fe7a2ac4210f3a18b4a860c5c66ef313c2855b2dfce328c74dd507278042998e0503830851045ea86664d1d106175dfedb0422acd5c66a3feef SHA512 7417b5169f5b3b2e818749940b55bea092888bd216e960bbe76e33f1cb9c4a6278fbb8f431f1b1caefb1b60e0faf7c997bcf63edd5743049a231c413aa351d1d
+MISC metadata.xml 1119 BLAKE2B 69d76e676244d618d769418d210acc4a705ef155215ced601bd1cb7075faf99789f9d771d8333d13a7e62f54846a31f14c4b4f00860a0927f2593ae2786e7cfd SHA512 41dc677a597ced02d76ea1610ad1e7a68cfba4c9622d2e9144eea61574752fbd7958ea7452c3213685c34ea89d24631adc96a93991bd27f32bf29677be31787d
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index 0254caa74016..dd278d4911d0 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -5,9 +5,14 @@
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <use>
     <flag name="fluidsynth">compile with support for fluidsynth</flag>
     <flag name="fribidi">Support for right-to-left languages via <pkg>dev-libs/fribidi</pkg></flag>
+    <flag name="glew">enable support for OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
     <flag name="net">enable cloud support via <pkg>media-libs/sdl2-net</pkg></flag>
     <flag name="speech">enable text-to-speech support through <pkg>app-accessibility/speech-dispatcher</pkg></flag>
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
new file mode 100644
index 000000000000..22e410bbb259
--- /dev/null
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic git-r3 toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
+HOMEPAGE="https://www.scummvm.org/"
+EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS=""
+IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk 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 )
+	fribidi? ( dev-libs/fribidi )
+	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 )
+	opengl? (
+		|| (
+			virtual/opengl
+			media-libs/mesa[gles2]
+			media-libs/mesa[gles1]
+		)
+		glew? ( media-libs/glew:0= )
+	)
+	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/_/}"
+
+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)
+		--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 opengl && use_enable glew)
+		$(use_enable gtk)
+		$(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)" \
+		STRINGS="$(tc-getSTRINGS)"
+}
+
+src_install() {
+	default
+	doicon -s scalable icons/scummvm.svg
+}
diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest
index bd245b4988c4..bc00ec9b7cdd 100644
--- a/games-engines/solarus/Manifest
+++ b/games-engines/solarus/Manifest
@@ -1,3 +1,4 @@
 DIST solarus-1.3.1-src.tar.gz 2450599 BLAKE2B e8aefa36d48753b1362283c8818b6efdc82c2d6ed7612c15d5e45b035a131ec6fd5792f85e4b956afa3e1d51e0dc311d7d6fabb5750b7b8781c69169b61fe1d9 SHA512 f52a46add1432a98931db8d26496371b5ff843151c8ac0fdaf1e774be37399d9be6c401f263a65aa08b96f3eebda367b4ccb07ef6cb9740b3112b01e4763556b
 EBUILD solarus-1.3.1-r1.ebuild 1076 BLAKE2B 2859414875bbba299b01c2becde2e24bccc88b6235f077c964723b9d18157f2c3d34aeac4f52cad6a756c65551728f711c32d3c8bae11a00ec2af27c8c2a39d9 SHA512 45b0cfcab36c51aa8fb86a53c3b8472006526a29f1a990adfda71ddbd410c71f93ba87d179b23429fbf8d70fe61a0cf1d39b0a4134b2141dfea843e5a405f4d0
+EBUILD solarus-1.3.1-r100.ebuild 1092 BLAKE2B 98a582f19d24874d61346b5b4fba4265fe32f1b4eba03412f44a8a8e3a762580d2fd7681a214f950967a09944400fbacfbc5acfa3b52df85b4c5f627e3eebd63 SHA512 51f7b846920143d093609db771d20597b0532310086181d88f8cc7a8bbbc14c5b1feb9b1da2221cb3d078ebeb6be557892a651d231cdb501e87218e041c9276f
 MISC metadata.xml 418 BLAKE2B 5bf684de11834b52dc4093d84a72b6c0707707fa8e31dfdd66a58942dc94f08e8db5b39d6aa1698587af11610eca08b80fc348a023c93d09d39cd115b6c81a34 SHA512 349717aa1b9c57fc9141beb4f16b377bd3ba31002a85023fad25a8a2332b9092180c58f37ba91aef05abb46405a56580202e0b67373ea049fc0d7bc029b3d2c5
diff --git a/games-engines/solarus/solarus-1.3.1-r100.ebuild b/games-engines/solarus/solarus-1.3.1-r100.ebuild
new file mode 100644
index 000000000000..7d865fec4101
--- /dev/null
+++ b/games-engines/solarus/solarus-1.3.1-r100.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake lua-single
+
+DESCRIPTION="An open-source Zelda-like 2D game engine"
+HOMEPAGE="https://www.solarus-games.org/"
+SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	dev-games/physfs
+	media-libs/libmodplug
+	>=media-libs/libsdl2-2.0.1[X,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png]
+	>=media-libs/sdl2-ttf-2.0.12"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSOLARUS_INSTALL_DESTINATION="/usr/bin"
+		-DSOLARUS_USE_LUAJIT="$(usex lua_single_target_luajit)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc ; then
+		cd doc || die
+		doxygen || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	doman solarus.6
+	use doc && dodoc -r doc/${PV%.*}/html/*
+}