gentoo resync : 15.01.2020

3 files changed, 27 insertions, 20 deletions

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 99955eb9fb01..6eccd699962a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,5 @@
 AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1066 BLAKE2B 9c47664abd809215d3691edcf434e6b1bb22e52ffa08aeea00c7f057719f909b6ce94833fe7e71ed582f1cc3490bbe7a843d911d1b24bef2c53c9f5f808edb3b SHA512 fc3ccd4ccd9994e0544e8e56255ad9d065ef11a004be8fc0a41ee39309d2a05f38b7381193c1c0de8da6bba69bc6212dc1e7c73a93435f781625fe29464e8611
 AUX gzdoom-4.2.1-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f SHA512 555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a
-EBUILD gzdoom-4.2.4.ebuild 2026 BLAKE2B ede308bda476e6ae1e7dca328b616fc1d306e5e7a3013689e5d1c6a55b0f56675053050727795d043ff2c76d14abdf6eff76bc786098f9bb87748eda4803c96a SHA512 0ab8d7be4370c16eaf7411cec7a4b4e099e3c227cdeea0347050946236b42462e9afde966920172372312a4578412a399a43a42f96bbf3d04fb61baec8aef53c
-MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30
+DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32 SHA512 6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
+EBUILD gzdoom-4.3.1.ebuild 2342 BLAKE2B 5144a68cf0e6bc01f4e8153b87d858df53a360117331eae2c55f6c0202db45bdd82dab6eef12213e1f6373b836a6ccbcaf9db99fe111dc8dd469471a88ad0c20 SHA512 ad3451f9539dfbfd4af50ea97b2082e98e98ac05fe85155c0642c524d7e285537b98710ad9eee00a6d9ae545208a263a6420c6063b6de8ae457f0295642c59d0
+MISC metadata.xml 1138 BLAKE2B 7ce7919829951fab600fa57bc9da7bbd78bbef548b2a967fd76a65748aeb02864022778516bac6a2d0bdb1a5bd4c8877c612167aee08293c161969f9f465734e SHA512 d771f3700ff95f65eba89ebda0ea15bb2126e93bce79b10000262ff6e7489f9f8ae2ccfb8be59cf993f3ff126e19ff9b2172269860754829a12611f4e3109636
diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
index da843dc71ad1..1ba984d753b4 100644
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
 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
-	nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
+IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
 	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
 	sys-libs/zlib
 	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
-	)"
+	)
+	mpg123? ( media-sound/mpg123 )
+	sndfile? ( media-libs/libsndfile )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
@@ -38,11 +39,11 @@ PATCHES=(
 
 src_prepare() {
 	rm -rf docs/licenses || die
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		rm -rf wadsrc_bm wadsrc_extra || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -57,24 +58,28 @@ src_configure() {
 		-DNO_GTK="$(usex !gtk)"
 		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex nonfree)"
+		-DBUILD_NONFREE="$(usex non-free)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	newicon src/posix/zdoom.xpm "${PN}.xpm"
 	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		ewarn
-		ewarn "GZDoom installed without nonfree components."
-		ewarn "Note: The nonfree game_support.pk3 file is needed to play"
+		ewarn "GZDoom installed without non-free components."
+		ewarn "Note: The non-free game_support.pk3 file is needed to play"
 		ewarn "      games natively supported by GZDoom."
 		ewarn "A list of games natively supported by GZDoom is available"
 		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 5b213dc39913..5e66764ba70e 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,8 +17,10 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
-		<flag name="nonfree">Enable non-free components</flag>
+		<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
+		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>