gentoo resync : 04.01.2022

3 files changed, 0 insertions, 126 deletions

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 49407c761d20..c422b3c04478 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,8 +1,4 @@
-AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1
 AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6
-DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
-DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543
-EBUILD gzdoom-4.7.0.ebuild 2381 BLAKE2B a100216fe53583cbf3313cf845ca2bcffedd22333e48e68cc317000a502ea3cd95984cca3392817781af526e6720ec1deb090fe97678f0ec358d5213d4b01667 SHA512 5636b6c17f47b8a5cd38040278d0bac30711527b0c8413750b6344a1603e8ecccb4aec913e3c7018c0db3175764d781087769ef6a3e87dd8ef95463c6bf40ae9
 EBUILD gzdoom-4.7.1.ebuild 2095 BLAKE2B ce16912a2083f9d86ab60ede55658df4bb26f0c6c858509473ba066e0dd6fc54a12bce8dc6b56b88ea703c1b0658a48b993a45e42cfe8690408a41e66ae5b749 SHA512 bd69a87286bd7e0c0f00d4cf78cfd48a1b959c6c4a06bb9c21b1b095a41fc9de5044bb159038868858a01c02758f681dab979f199707a9a7937fc7bf5e221857
 MISC metadata.xml 880 BLAKE2B 9e2c6bea13a2821469d6f6ac4d21c4b2313f42594257a78a574bf893ec70f94bf0c0208e53401e24cdd06aa0bdb2fedb18374d2785abea393688d62ea4427951 SHA512 2bbe5df923e586acb967be69648fc5ccd604254fc2c9eebfc1cee2ca5448fe16b68b639ca21c9225af1ca7e0ca745dfde7b427166c1482145105dcc2f52a1751
diff --git a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 64a230dcd984..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 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,
-game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
----
- CMakeLists.txt | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3763ec1f..d0c4720bd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -400,11 +400,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( wadsrc_widescreen )
- add_subdirectory( src )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+       add_subdirectory( wadsrc_bm )
-+       add_subdirectory( wadsrc_extra )
-+       add_subdirectory( wadsrc_widescreen )
-+endif()
- 
- if( NOT CMAKE_CROSSCOMPILING )
- 	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
--- 
-2.28.0
-
diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
deleted file mode 100644
index 52da570e32f4..000000000000
--- a/games-fps/gzdoom/gzdoom-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[gles2?,opengl,vulkan?]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.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 wadsrc_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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
-		-DHAVE_VULKAN="$(usex vulkan)"
-		-DHAVE_GLES2="$(usex gles2)"
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-	use telemetry || append-cppflags -DNO_SEND_STATS
-
-	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
-}