From: William Breathitt Gray <vilhelm.gray@gmail.com>
Date: Wed, 12 Jun 2019 23:13:06 +0000 (+0900)
Subject: games-fps/gzdoom: Always build with fluidsynth and openal support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22b70de1892785b9f2dc5d3bb2ddab234410cc92;p=gentoo.git

games-fps/gzdoom: Always build with fluidsynth and openal support

FluidSynth is a dependency of GZDoom and cannot be disabled. Similarly,
OpenAL is a dependency of GZDoom on Linux and cannot be disabled.

Closes: https://bugs.gentoo.org/687922
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12248
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index d3d5f880537b..48957b791acb 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,24 +12,21 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk gtk2 +openal openmp"
+IUSE="gtk gtk2 openmp"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
+	media-libs/libsndfile
+	media-libs/openal
+	media-sound/fluidsynth:=
+	media-sound/mpg123
 	sys-libs/zlib
 	virtual/jpeg:0
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
 	)"
-RDEPEND="
-	${DEPEND}
-	fluidsynth? ( media-sound/fluidsynth:= )
-	openal? (
-		media-libs/libsndfile
-		media-libs/openal
-		media-sound/mpg123
-	)"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
 PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
@@ -48,7 +45,7 @@ src_configure() {
 		-DDYN_SNDFILE=OFF
 		-DDYN_MPG123=OFF
 		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL="$(usex !openal)"
+		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
 	)
 	cmake-utils_src_configure
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 95f6ed619edf..cfd1b5ffe560 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
 	</use>
 	<upstream>