GZDoom 4.2.0 and 9999 based on Gentoo repo's ebuild

make brightmaps.pk3 compatible with parallel install of zandronum

Signed-off-by: haarp <main.haarp@gmail.com>

11 files changed, 236 insertions, 347 deletions

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 97642eb..7a3f332 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,12 +1,6 @@
-DIST gzdoom-g3.4.1.zip 11499076 BLAKE2B f7e9b1f303752ea2442b67347c106bec054e7cda318b52085c061617b00021d1e550b06001f6f74f6c8b91d15972829e2aafa5033b11b03353aa55e5d73ce522 SHA512 512b2e51b01b6b74cd7373e31643f196f962b71bdae19621fd4fa7f7bf54f863088e26818354b840947b48abe9f6644e05eb80601ded13fb6d18af93d43dc728
-DIST gzdoom-src-3-6-0-legacy.zip 11659461 BLAKE2B dc314fd3052a79199a5c06e1a29bf4bc61d531ffc675eed9c0ce089e0bba3dba1eabe911c27a405748a7f49bcc564ba36dbba72bf775097c4eafdd93712a5791 SHA512 d100f9206ea63a84bb350db81ea25c003072088fe71acc2d08e76f52d080ec4cdac869b0047dc9cb6cd34f01263d15822f0f648baf39bdbb69cc8e48fd0fdf3d
-DIST gzdoom-src-g3.5.1.zip 11592915 BLAKE2B c5cde9590cd95916c330ab4adb967c3baba39bfdefc74f5f2566978c1cc9a752bea05dac7d311f87fb9934c7c679abe69e904252f907a21c70252040d254cf9d SHA512 b166c092c87833b58ee9a28d53d99143c39e35813515e190d66861611bd5847b18cddbb43e6856f91b13927762178f2b6881b5f533cb41a97821097a8c8c5343
-DIST gzdoom-src-g3.5.1_legacy.zip 11667150 BLAKE2B 06fdbfd5a74ed0761dc60786cf0daed6b76f8fb2e9d54e066436fdf3b55545c280a0314e2befbde224aa64cf80e9f0af9db9e59e3d3dd7d83eb5249e389ed752 SHA512 5f2a340324b3c160c2a3f6402cb838c1a839d64d4e773f24efc08d5fab09a560b6583d92b318fe969afd65bf884edff27e00e3fe28bb240e0f06aba2fae5fb54
-DIST gzdoom-src-g3.6.0.zip 11659461 BLAKE2B dc314fd3052a79199a5c06e1a29bf4bc61d531ffc675eed9c0ce089e0bba3dba1eabe911c27a405748a7f49bcc564ba36dbba72bf775097c4eafdd93712a5791 SHA512 d100f9206ea63a84bb350db81ea25c003072088fe71acc2d08e76f52d080ec4cdac869b0047dc9cb6cd34f01263d15822f0f648baf39bdbb69cc8e48fd0fdf3d
-DIST gzdoom-src-g4.0.0.zip 14867010 BLAKE2B b6ba0eb29ef293e33ece7fe2ffea0199af6a7836798027568795359624b0d89e0ad60df0d7131ccb982f305a824e4cd4ae97c0a85bb752d9079f5f3ea5fbf7ca SHA512 dd139d1ba40641cd3a78ab996ed7ba79a6cc1a60d1f57a8e7f26f978b8b2303912ad44c9794a180a958a5a08f819e064c296f93dbad585b553e12b58fa892d3b
-EBUILD gzdoom-3.4.1-r1.ebuild 2181 BLAKE2B fde9d4b2a8b9a26bcf67e14d89a3960db12f27f018369801ba85e3b28da7b2cbd0dc4448187b1c106f05e923a828ab759547d7f8d854f24c904511596b309ecf SHA512 f06567fc85560175366a7e997da0bbc0a10336e67785462c372cc4e161a792685d2cf6b27235153a97b7d1cd04977cd5b23130983719953dab34c5ea552dfd5a
-EBUILD gzdoom-3.5.1.ebuild 2215 BLAKE2B c2b0fa80a57dc5917e6a723b7744627ce02d11ac2625c2c2dcfa4be4336678babce7c417ff60dce11c39c6049583fcc6c4b07dc93846789c148903482e644826 SHA512 74c5efa23debb09bc58da9b0a96bcc6a219e86f841e8b773470cb58980f5573298f639ee780dd55c7b1045dc2763aceabd540780cef89b6c1486ae1732dc8dbe
-EBUILD gzdoom-3.6.0.ebuild 2208 BLAKE2B 24e58005ac91cccd7ec46c53e8f7ccfc4499b9316c8263a7f365e0185de3b92c6dbbb0c96c3c23cadfb34263329a969a00b81fd1577df38cf60f50608041d809 SHA512 20174389ad047b869fa93d7049e4b9a7b40eb66b9eefea48e38d7dd13ec3e69100ba45db552364b1448d3a9e97ca86afb06a4ec0bdddc140eab898d0a7b32c4d
-EBUILD gzdoom-4.0.0.ebuild 2294 BLAKE2B b7394bcfa27adb674b2be15589f30c7dd4319c430a4433701a9bf1fae8b0c34cc4083c33b4fa10287bc85c02b288f471a46902bf16960ddc74aee971b92b36c1 SHA512 d32f7a799451400ca1d224763f1daa9cef3c0fec8014424fe398d1daf648e6f58557e84ed284681aa1dbc02127aa0caac1f4f8d1fa3965328e05d01aad144a53
-EBUILD gzdoom-9999-r1.ebuild 2181 BLAKE2B fde9d4b2a8b9a26bcf67e14d89a3960db12f27f018369801ba85e3b28da7b2cbd0dc4448187b1c106f05e923a828ab759547d7f8d854f24c904511596b309ecf SHA512 f06567fc85560175366a7e997da0bbc0a10336e67785462c372cc4e161a792685d2cf6b27235153a97b7d1cd04977cd5b23130983719953dab34c5ea552dfd5a
-MISC metadata.xml 313 BLAKE2B 71630a90c0ad19f32abafcb65b182f3d731de7372423cea0ec0aab49fcc3cffd57c86316e31ae01b7d0d6e94ebc4ffeccaacc99609af87bcb15af2e626bf5645 SHA512 3682ec2b82243507a1ddf1cdb4045820003d61faf1506f93066682b9046ea02abed19ef3ca52dfa8df2d4d973d14431fcba8419012238f525a61fd1a61e22a56
+AUX fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
+AUX install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
+DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
+EBUILD gzdoom-4.2.0-r1.ebuild 2366 BLAKE2B 6d4a046bf5033d5873a4c4ebcd5fac17b1d708b3ce5478caf75e623a857806017075ab18e5a403ca46c30335c7371d23a775a75e24361568d73b82eb93b608bd SHA512 75f72cdc6a088ff9e306ce82d9e851c8d4dd1c6d8a9640b1c3ae081d72b1411a2c9c10c3e43d6ca64872a216d4bca370c95034217128ba98b5c2a60648c95ed0
+EBUILD gzdoom-9999-r2.ebuild 2323 BLAKE2B ec0d4e83bc8fc14ca4ea8739dd7a7b1ad5ac17830a27babff647038eedf2512014313aa9b7271e74d2b199fe0ef3122eae17224eabec88512e3199b35cca6170 SHA512 b2c7bdaca60bc5838e7af79d736ce8617913ace82db984e63c722b6021600055b56f7ada2f1780c9488135cafe7e66303863c7f85a5742428cee396435fbbff2
+MISC metadata.xml 531 BLAKE2B a2e188eea5034e23871593861e3513ec34572fa204689aabbdff702e14e326265b38b068452e51810e635d629bec613df9365c63ed5fdcd67c869ccc33c05e98 SHA512 90a34550942005159c5f566e3267feab59a928ce125d748bd68972db8a182c0cebea23f5ed099a9df077f9aff718ba90d7dfd3b555a9e2e7875f295f8d9a9ac3
diff --git a/games-fps/gzdoom/files/fluidsynth2.patch b/games-fps/gzdoom/files/fluidsynth2.patch
new file mode 100644
index 0000000..1ae12a8
--- /dev/null
+++ b/games-fps/gzdoom/files/fluidsynth2.patch
@@ -0,0 +1,28 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2018-10-16 14:29:56.900427855 +0200
+
+Make the build work with fluidsynth 2.x.
+
+---
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+===================================================================
+--- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp
++++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD
+ #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f
+ #define FLUID_CHORUS_DEFAULT_SPEED 0.3f
+ #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f
+-#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
+ 
+ #endif
+ 
++#ifndef FLUID_CHORUS_DEFAULT_TYPE
++#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE
++#endif
++
+ // TYPES -------------------------------------------------------------------
+ 
+ // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
diff --git a/games-fps/gzdoom/files/install_soundfonts.patch b/games-fps/gzdoom/files/install_soundfonts.patch
new file mode 100644
index 0000000..1fe0b99
--- /dev/null
+++ b/games-fps/gzdoom/files/install_soundfonts.patch
@@ -0,0 +1,34 @@
+From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Thu, 13 Jun 2019 18:01:08 +0900
+Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
+
+The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
+installation directory.
+---
+ src/CMakeLists.txt | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0bb16f39e..4ff15062d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
+ 	${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
+ )
+ 
++if( WIN32 )
++	set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
++else()
++	set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
++endif()
++install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
++		DESTINATION ${INSTALL_SOUNDFONT_PATH}
++		COMPONENT "Soundfont resources")
++
+ if( CMAKE_COMPILER_IS_GNUCXX )
+ 	# GCC misoptimizes this file
+ 	set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
+-- 
+2.21.0
+
diff --git a/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild b/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild
deleted file mode 120000
index 3f3fad3..0000000
--- a/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-gzdoom-9999-r1.ebuild
\ No newline at end of file
diff --git a/games-fps/gzdoom/gzdoom-3.5.1.ebuild b/games-fps/gzdoom/gzdoom-3.5.1.ebuild
deleted file mode 100644
index d0e99a5..0000000
--- a/games-fps/gzdoom/gzdoom-3.5.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://zdoom.org"
-
-SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-src-g${PV}.zip https://zdoom.org/files/gzdoom/src/${PN}-src-g${PV}_legacy.zip"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gtk3 legacy-opengl"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	media-libs/libsdl2
-	virtual/glu
-	virtual/jpeg:62
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	|| ( dev-lang/nasm dev-lang/yasm )"
-
-src_unpack(){
-	if use legacy-opengl; then
-		S="${WORKDIR}/${PN}-g${PV}_legacy"
-	else
-		S="${WORKDIR}/${PN}-g${PV}"
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Use default data path
-	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
-	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
-		src/gameconfigfile.cpp
-	sed -i -e '/SetValueForKey("Path", "\/usr\/share\/games\/doom\/soundfonts", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data/soundfonts", true);' \
-		src/gameconfigfile.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DNO_GTK="$(usex gtk3 no yes)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.txt
-	dohtml docs/console*.{css,html}
-
-	newicon "src/posix/zdoom.xpm" "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame;"
-
-	cd "${BUILD_DIR}"
-
-	insinto "/usr/share/doom-data"
-	doins *.pk3
-	insinto "/usr/share/doom-data/soundfonts"
-	doins soundfonts/*.sf2
-
-	dobin "${PN}"
-}
-
-pkg_postinst() {
-	elog "Copy or link wad files into /usr/share/doom-data/"
-	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
-	elog
-	elog "Starting from GZDoom 3.3.0, TiMidity++ is now an internal MIDI player."
-	elog "Unfortunately, it does not support system soundfonts directly."
-	elog "To make them selectable, turn '/usr/share/timidity/foo' into a zip archive and put it"
-	elog 'into /usr/share/doom-data/soundfonts/ or $HOME/.config/gzdoom/soundfonts/'
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-}
diff --git a/games-fps/gzdoom/gzdoom-3.6.0.ebuild b/games-fps/gzdoom/gzdoom-3.6.0.ebuild
deleted file mode 100644
index 051d147..0000000
--- a/games-fps/gzdoom/gzdoom-3.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://zdoom.org"
-
-SRC_URI="!legacy-opengl? ( https://zdoom.org/files/gzdoom/src/${PN}-src-g${PV}.zip )
-	legacy-opengl? ( https://zdoom.org/files/gzdoom/src/${PN}-src-${PV//./-}-legacy.zip )"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gtk3 legacy-opengl"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	media-libs/libsdl2
-	virtual/glu
-	virtual/jpeg:62
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	|| ( dev-lang/nasm dev-lang/yasm )"
-
-src_unpack() {
-	S="${WORKDIR}/${PN}-g${PV}"
-	default
-}
-
-src_prepare() {
-	# Use default data path
-	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
-	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
-		src/gameconfigfile.cpp
-	sed -i -e '/SetValueForKey("Path", "\/usr\/share\/games\/doom\/soundfonts", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data/soundfonts", true);' \
-		src/gameconfigfile.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DNO_GTK="$(usex gtk3 no yes)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.txt
-	dohtml docs/console*.{css,html}
-
-	newicon "src/posix/zdoom.xpm" "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame;"
-
-	cd "${BUILD_DIR}"
-
-	insinto "/usr/share/doom-data"
-	doins *.pk3
-	insinto "/usr/share/doom-data/soundfonts"
-	doins soundfonts/*.sf2
-
-	dobin "${PN}"
-}
-
-pkg_postinst() {
-	elog 'Copy or link wad files into /usr/share/doom-data/ or $HOME/.config/gzdoom/'
-	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
-	elog
-	elog "Starting from GZDoom 3.3.0, TiMidity++ is now an internal MIDI player."
-	elog "Unfortunately, it does not support system soundfonts directly."
-	elog "To make them selectable, turn '/usr/share/timidity/foo' into a zip archive and put it"
-	elog 'into /usr/share/doom-data/soundfonts/ or $HOME/.config/gzdoom/soundfonts/'
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-}
diff --git a/games-fps/gzdoom/gzdoom-4.0.0.ebuild b/games-fps/gzdoom/gzdoom-4.0.0.ebuild
deleted file mode 100644
index 67ef43d..0000000
--- a/games-fps/gzdoom/gzdoom-4.0.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://zdoom.org"
-
-SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-src-g${PV}.zip"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="fluidsynth +gtk3 vulkan"
-
-RDEPEND="fluidsynth? ( media-sound/fluidsynth )
-	gtk3? ( x11-libs/gtk+:3 )
-	vulkan? ( media-libs/vulkan-loader )
-	media-libs/libsdl2
-	virtual/glu
-	virtual/jpeg:62
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	|| ( dev-lang/nasm dev-lang/yasm )"
-
-src_unpack() {
-	S="${WORKDIR}/${PN}-g${PV}"
-	default
-}
-
-src_prepare() {
-	# Use default data path
-	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
-	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
-		src/gameconfigfile.cpp
-	sed -i -e '/SetValueForKey("Path", "\/usr\/share\/games\/doom\/soundfonts", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data/soundfonts", true);' \
-		src/gameconfigfile.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# fluidsynth is detected dynamically
-	# vulkan always appears to be compiled in on amd64 (see CMakeLists.txt)
-	mycmakeargs=(
-		-DNO_GTK="$(usex gtk3 no yes)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.txt
-	dohtml docs/console*.{css,html}
-
-	newicon "src/posix/zdoom.xpm" "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame;"
-
-	cd "${BUILD_DIR}"
-
-	insinto "/usr/share/doom-data"
-	doins *.pk3
-	insinto "/usr/share/doom-data/soundfonts"
-	doins soundfonts/*.sf2
-
-	dobin "${PN}"
-}
-
-pkg_postinst() {
-	elog 'Copy or link wad files into /usr/share/doom-data/ or $HOME/.config/gzdoom/'
-	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
-	elog
-	elog "Starting from GZDoom 3.3.0, TiMidity++ is now an internal MIDI player."
-	elog "Unfortunately, it does not support system soundfonts directly."
-	elog "To make them selectable, turn '/usr/share/timidity/foo' into a zip archive and put it"
-	elog 'into /usr/share/doom-data/soundfonts/ or $HOME/.config/gzdoom/soundfonts/'
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-}
diff --git a/games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild b/games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild
new file mode 100644
index 0000000..f8c264d
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.2.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+PATCHES=(
+	"${FILESDIR}/fluidsynth2.patch"
+	"${FILESDIR}/install_soundfonts.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_FLUIDSYNTH=OFF
+		-DDYN_OPENAL=OFF
+		-DDYN_SNDFILE=OFF
+		-DDYN_MPG123=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake-utils_src_install
+
+	# don't install this now
+	rm "${D}/usr/share/doom/brightmaps.pk3"
+}
+
+pkg_postinst() {
+	# install here to avoid collisions with games-fps/zandronum
+	# hacky, i know. should've listened to juippis :) please don't hit me.
+	cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" || die
+
+	ewarn "For parity with the Gentoo ebuild, the data path has been changed yet again!"
+	ewarn "It is ${EPREFIX}/usr/share/doom - copy/link wad files there or in \$HOME/.config/gzdoom"
+	ewarn "If after an upgrade the game complains about not finding gzdoom.pk3,"
+	ewarn "edit the [*Search.Directories] sections in \$HOME/.config/gzdoom/gzdoom.ini."
+	elog
+	elog "Starting with GZDoom 3.3.0, TiMidity++ is an internal MIDI player."
+	elog "Unfortunately, it does not support system soundfonts directly."
+	elog "To make them selectable, add /usr/share/timidity/<foo>/* to a zip archive and"
+	elog "place it into ${EPREFIX}/usr/share/doom/ or \$HOME/.config/gzdoom/soundfonts/"
+}
diff --git a/games-fps/gzdoom/gzdoom-9999-r1.ebuild b/games-fps/gzdoom/gzdoom-9999-r1.ebuild
deleted file mode 100644
index b29c79c..0000000
--- a/games-fps/gzdoom/gzdoom-9999-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://zdoom.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-g${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gtk3"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	media-libs/libsdl2
-	virtual/glu
-	virtual/jpeg:62
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	|| ( dev-lang/nasm dev-lang/yasm )"
-
-src_prepare() {
-	# Use default data path
-	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
-	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
-		src/gameconfigfile.cpp
-	sed -i -e '/SetValueForKey("Path", "\/usr\/share\/games\/doom\/soundfonts", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data/soundfonts", true);' \
-		src/gameconfigfile.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DNO_GTK="$(usex gtk3 no yes)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.txt
-	dohtml docs/console*.{css,html}
-
-	newicon "src/posix/zdoom.xpm" "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame;"
-
-	cd "${BUILD_DIR}"
-
-	insinto "/usr/share/doom-data"
-	doins *.pk3
-	insinto "/usr/share/doom-data/soundfonts"
-	doins soundfonts/*.sf2
-
-	dobin "${PN}"
-}
-
-pkg_postinst() {
-	elog 'Copy or link wad files into /usr/share/doom-data/ or $HOME/.config/gzdoom/'
-	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
-	elog
-	elog "Starting from GZDoom 3.3.0, TiMidity++ is now an internal MIDI player."
-	elog "Unfortunately, it does not support system soundfonts directly."
-	elog "To make them selectable, turn '/usr/share/timidity/foo' into a zip archive and put it"
-	elog 'into /usr/share/doom-data/soundfonts/ or $HOME/.config/gzdoom/soundfonts/'
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-}
diff --git a/games-fps/gzdoom/gzdoom-9999-r2.ebuild b/games-fps/gzdoom/gzdoom-9999-r2.ebuild
new file mode 100644
index 0000000..78fbae5
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-9999-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop git-r3 xdg
+
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
+HOMEPAGE="https://zdoom.org"
+EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
+
+LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS=""
+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}"
+
+PATCHES=(
+	"${FILESDIR}/fluidsynth2.patch"
+	"${FILESDIR}/install_soundfonts.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_FLUIDSYNTH=OFF
+		-DDYN_OPENAL=OFF
+		-DDYN_SNDFILE=OFF
+		-DDYN_MPG123=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake-utils_src_install
+	# don't install this now
+	rm "${D}/usr/share/doom/brightmaps.pk3"
+}
+
+pkg_postinst() {
+	# install here to avoid collisions with games-fps/zandronum
+	# hacky, i know. should've listened to juippis :) please don't hit me.
+	cp -n "${BUILD_DIR}/brightmaps.pk3" "${EPREFIX}/usr/share/doom/" || die
+
+	ewarn "For parity with the Gentoo ebuild, the data path has been changed yet again!"
+	ewarn "It is ${EPREFIX}/usr/share/doom - copy/link wad files there or in \$HOME/.config/gzdoom"
+	ewarn "If after an upgrade the game complains about not finding gzdoom.pk3,"
+	ewarn "edit the [*Search.Directories] sections in \$HOME/.config/gzdoom/gzdoom.ini."
+	elog
+	elog "Starting with GZDoom 3.3.0, TiMidity++ is an internal MIDI player."
+	elog "Unfortunately, it does not support system soundfonts directly."
+	elog "To make them selectable, add /usr/share/timidity/<foo>/* to a zip archive and"
+	elog "place it into ${EPREFIX}/usr/share/doom/soundfonts or \$HOME/.config/gzdoom/soundfonts/"
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index c864252..7e65c72 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<longdescription lang="en">
+		GZDoom is a modder-friendly OpenGL source port based on the DOOM engine
+	</longdescription>
 	<use>
-		<flag name="gtk3">Build graphical IWAD picker</flag>
-		<flag name="legacy-opengl">Build "vintage" version for better performance on OpenGL 2 hardware</flag>
+		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
 	</use>
+	<upstream>
+		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
+		<doc lang="en">https://zdoom.org</doc>
+		<remote-id type="github">coelckers/gzdoom</remote-id>
+	</upstream>
 </pkgmetadata>