gentoo resync : 16.09.2020

5 files changed, 151 insertions, 4 deletions

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>