gentoo resync : 16.09.2020

12 files changed, 165 insertions, 18 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 9d5751898706..58efd526f6d3 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index f916d8f569a3..6870e3782c80 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,3 +1,3 @@
 DIST gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh 31969896 BLAKE2B 7e93515f8aedaedf6f0dc90faf5e7fef165c000414ae9dc62bad77c78568ecdec1f16b72befe1c80c7c9c8c4bd7fb11f2fd3c36f53aa9ef9d787f8b7215228f3 SHA512 d06f20bc1334172b80e4a75bd3321c3835cd95ac823836899fda8d5f8667ac83471b04a5863646aa953a39fd1cb64eb1818ee668340ede62d0a356ebdcb4065c
-EBUILD duke3d-data-1.0-r4.ebuild 1768 BLAKE2B 86a29a253791f283d7092863d553843639a39a71e0f2d637013492af42d8d49743534c502a463bb14cb316746f2c92ee1486c65b40fea48c325932d5cec794b2 SHA512 00aa75fb4197e82ede5096ed97d7f80c043ef9cd2ca2d9a1a2bf23a58ccc6f2130a91479c57fa101403d4fa8d5f1cdb7572f8ff66d4762a55ed6a165171324a9
+EBUILD duke3d-data-1.0-r4.ebuild 1775 BLAKE2B cc1291fa2c00ecac68c924a571060e44d3c86988a0a944efbd919560bfa959e6c544aadf61052da29d42eded802077d4aecf474b6df39df4885c29ad9622908c SHA512 5fcf67946a0e8d979d9c6050c9c1bb28b8887b57e1178e4fce3df265c4918b91a6ed2662f31d2bc7720bb6f4847e978606a8465618f7ec01b7c7ba5d63643159
 MISC metadata.xml 339 BLAKE2B afb442a147713d5f9000bb54afb2b62841086063b530f74a1da843ed7d08c3ffa995d98964f5e59b344c54eea7ea27ccc3eb563ea94e31452b352c80dc3848d3 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
index a367bad4e4be..a466c316ad86 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/duke3d-demodata/Manifest b/games-fps/duke3d-demodata/Manifest
index 436c818213d0..e8875b3f6328 100644
--- a/games-fps/duke3d-demodata/Manifest
+++ b/games-fps/duke3d-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
-EBUILD duke3d-demodata-1.3.ebuild 1137 BLAKE2B 620a1ca5368e7f5f91f44991a0369fcda0750edc2e9ac90329a3b61ecac9e43dc3ae2995fd68c84422663c88f989e26bcc6694594095c5ebda352d41d95b1d65 SHA512 7d70c70b78d43b8b850a6a73a48ca008f0d13f121d25eba0d61b6617359602731850cdd45c531863d273dae87d5f51acc515e5a7f59f6765b582763d8ed9096d
+EBUILD duke3d-demodata-1.3.ebuild 1144 BLAKE2B ce67a72411176e04f1f0965e2b2165033370f80c1cb3a362db8c5919ea7d1954b0a5b21cca572e2ead479ec2eb7b60e261051806e8f76eef18297231393437fa SHA512 090109e0c30828d99745ca968a58f18953e4a9dab6756461dee523a2bf1c5aee966ba8a8fbfeda1d92199856f78869d7532d613365ede170c1ae380c8d28e24b
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
index 125222e3bd04..14a4c8aba39c 100644
--- a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
+++ b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dnr.duke4.net/dl/024fbc5/3dduke13.zip"
 
 LICENSE="DUKE3D"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 03538c48a932..bac14ee9e407 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200824-9249-175ae4cd5.tar.xz 19787088 BLAKE2B d9d6cacc6fd44187fede81803dc4a98f2c199b3439278b523d924456371e289ea24ccea61cc5de8687f83c65e53fe66f8bddb6c104aec696b39176ddae146d57 SHA512 b963a885f89e33c09af4d6c1fba81a18198e9ab8617667c5492e2b70355b7fcaabfacf385f652e3f8d39ee155921a7d5d3afe802bd98f9187ccd29cdcc602190
-EBUILD eduke32-20200824.9249.ebuild 5844 BLAKE2B 629bfc52e63b89af73ab3a77650b56e109159c90fa6569153143755e8a41ea2c75425a182e69670d0852bce4b76c2a2e0466f85df291218412f9c42d2849ccce SHA512 7b11458560af781dd6b2fa732d5038d609de94fde4f3545ec80d0d1a1f7383bcab1ac87b0d0c48df974434238f007f5995f32fdb34e2b180e7f51c03e960ce9a
+DIST eduke32_src_20200829-9253-156963ddc.tar.xz 19786792 BLAKE2B beff97aa7fa6e0db841abddfba6287034b501c6c727239157e986ded0993edf5bfbb891138d95e54a181b1f769b4a36a0406cceb531fed4a5b2c9cdd63dd59e9 SHA512 f69ad01c958cc180e75e4f6c231106634f57257b3d8fd14db5b5079721633df4dde8b72c93397fa75c2782735eb5baf0e00708b2fc5d8781e36c6cda9b949f4d
+EBUILD eduke32-20200829.9253.ebuild 5825 BLAKE2B 5af498587f796380697d51c3b1843a2d0a320a61b0ae33badc433f44d754e0f0264713653e1953d63d5ba89305d968cdd7a06b24a69a19878295eacbdeb01aa6 SHA512 ee28a6597158a2adfc68b3471bf84ec7ce89b35ad106d60acdb6943440425ccde474c8a27d58c6f10185ca65bd4dd41dbf6d45db6c7b940490fb4f1d04324349
 MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20200824.9249.ebuild b/games-fps/eduke32/eduke32-20200829.9253.ebuild
index 7f53b7f0a691..bf134c4e55b2 100644
--- a/games-fps/eduke32/eduke32-20200824.9249.ebuild
+++ b/games-fps/eduke32/eduke32-20200829.9253.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="175ae4cd5"
+EGIT_COMMIT="156963ddc"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -30,8 +30,8 @@ SRC_URI="
 
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
 REQUIRED_USE="
 	cdinstall? ( !demo )
 	demo? ( !cdinstall )
@@ -54,10 +54,10 @@ RESTRICT="bindist test"
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
 
 RDEPEND="
-	media-libs/libsdl2[joystick,opengl?,sound,video]
-	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
+	media-libs/flac
+	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
+	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis?]
 	sys-libs/zlib
-	flac? ( media-libs/flac )
 	gtk? ( x11-libs/gtk+:2 )
 	opengl? (
 		virtual/glu
@@ -128,7 +128,7 @@ src_compile() {
 		DEBUGANYWAY=0
 		F_JUMP_TABLES=""
 		FORCEDEBUG=0
-		HAVE_FLAC=$(usex flac 1 0)
+		HAVE_FLAC=1
 		HAVE_GTK2=$(usex gtk 1 0)
 		HAVE_VORBIS=$(usex vorbis 1 0)
 		HAVE_XMP=$(usex xmp 1 0)
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index b5fffb658ca3..79fece50273d 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,9 @@
 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
+AUX gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch 1215 BLAKE2B fe3fc937e33124a414abc3de15ede89f5a93a2165c9553eda5c62228bf6bce3a251b082a5a20ff197caf1234544b71d69319fea9eaf09ff091e5abb3167da9ff SHA512 83c5b84bfc972b3b8c6982f9e0f5687911c65982b8406ab8cc171afbc6f4d6c1aeb0072be416a7cdc84e4a3e4c37fdda5a5537713f27405ef59421773d30e718
+AUX gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch 1101 BLAKE2B c66b9e3e6bd76e2ab7609ae073094cefa3231aa2c0c4db20b7c336abaff9d651647a702ef849dfdec97eb8d24cf41e1bfdd43f63aaef70e8b24a359758669e0e SHA512 8dc90a9f36e155aa41712b67dd61c03c4d75c3c6455f1e7f8e4d4969a3d016c3c63b5d01ab16e39669c264f0e89d431eb702541a5de5153599cddb5f8b10b16a
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
+DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b SHA512 cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba
 EBUILD gzdoom-4.3.3.ebuild 2342 BLAKE2B 5144a68cf0e6bc01f4e8153b87d858df53a360117331eae2c55f6c0202db45bdd82dab6eef12213e1f6373b836a6ccbcaf9db99fe111dc8dd469471a88ad0c20 SHA512 ad3451f9539dfbfd4af50ea97b2082e98e98ac05fe85155c0642c524d7e285537b98710ad9eee00a6d9ae545208a263a6420c6063b6de8ae457f0295642c59d0
-MISC metadata.xml 1138 BLAKE2B 7ce7919829951fab600fa57bc9da7bbd78bbef548b2a967fd76a65748aeb02864022778516bac6a2d0bdb1a5bd4c8877c612167aee08293c161969f9f465734e SHA512 d771f3700ff95f65eba89ebda0ea15bb2126e93bce79b10000262ff6e7489f9f8ae2ccfb8be59cf993f3ff126e19ff9b2172269860754829a12611f4e3109636
+EBUILD gzdoom-4.4.2.ebuild 2032 BLAKE2B 6fa7ef768f91194eebae824700e712d746d31f673783e1be31a31bdbb2345dadce106090e69da172e5a1d1961f5b36c76201bc9df3903abb4439128a69da19ff SHA512 6b9a42d6945e1188f73b2a20a14adde4bd75a4568adf28b92306f8ed736ae62201f3d7ccb9647d01171ee6ea27eb28c32c23258337920c72176013050839d9b1
+MISC metadata.xml 1015 BLAKE2B 16dbdbd90a49effad802577e71d8e8026bb9b42d95480cc84a3b755f0f052b6741beae770c45fceb5352776a7e941c60b0ab50f202f82cd787dde735f0839a0b SHA512 021c4ae8ef38c797ed99e7e40ff63010dfe2bc736a8060a8b76c71cf003eeb18f4f9b71c3c65b98471f047205b4693df50cab28ce2ff416e8706a5b53815ef09
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
new file mode 100644
index 000000000000..779268ca6d7e
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
@@ -0,0 +1,30 @@
+From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Wed, 17 Jun 2020 15:17:49 -0400
+Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library
+
+This makes sure the internal version of this library bundled with the
+GZDoom source code is used. This prevents the system from building
+GZDoom for dynamic linking with an incompatible external library (see
+commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and
+<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
+---
+ libraries/glslang/spirv/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt
+index 453ac16b5..d39a6e300 100644
+--- a/libraries/glslang/spirv/CMakeLists.txt
++++ b/libraries/glslang/spirv/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
+     SPVRemapper.h
+     doc.h)
+ 
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC
+-- 
+2.26.2
+
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000000000000..d7ece785e25d
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,35 @@
+From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 31 Aug 2019 21:23:23 +0900
+Subject: [PATCH] Introduce the BUILD_NONFREE option
+
+This allow users to disable building nonfree components (brightmaps.pk3
+and game_support.pk3) if they so desire.
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4e59452..c2f49b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/gdtoa )
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
+ add_subdirectory( src )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++       add_subdirectory( wadsrc_bm )
++       add_subdirectory( wadsrc_extra )
++endif()
++
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+ 	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
+-- 
+2.26.2
+
diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
new file mode 100644
index 000000000000..976f3384a393
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk gtk2 +non-free openmp"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[opengl]
+	media-libs/openal
+	media-libs/zmusic
+	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}/${PN}-4.2.1-install_soundfonts.patch"
+	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${P}-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra || die
+	fi
+
+	cmake_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_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use non-free ; then
+		ewarn
+		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"
+		ewarn
+	fi
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 5e66764ba70e..73491087ed90 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -1,9 +1,6 @@
 <?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>
 	<maintainer type="person">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>