gentoo resync : 20.03.2022

3 files changed, 96 insertions, 0 deletions

diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 03dd5a387857..68376fbb5613 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,4 +1,7 @@
 AUX prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch 739 BLAKE2B 308d840db294e39fe3d0460f2c493a1e3991a5c016c24640592ef97dfe08c1e56283b3b9be1ba5c17a1d11374b95169036f037cb5f8950df13f4a12d64a6b247 SHA512 3e87b824b5f53da9cd0039deaa476980005185a8da71fcec3cce9c95c7fa1a2cf4ea1eac0b12f7aecdd9233522f0fdfe6e1ea03465d9e38db66eca13a30eacc4
+AUX prboom-plus-2.6.2-Revert-force-overriding-of-the-documentation-install.patch 991 BLAKE2B 7a7fc57c91576b9955e219feffb0953e6c9ce31d4dfaa333f7ca5024a634c72615e409ab42ccc74db09adaa3f2e9b2a8bace401dc7bbc3e0bd1f7e932835ecfd SHA512 46b56b72408c7d72a7849b13832588a350bba9e6d3c3fc93aaf4568eb5ebdea12a7cad1a2c13972016b6e95527d23b0b5db6abf0a848ccaa26671dc87cedb778
 DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607 SHA512 6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39
+DIST prboom-plus-2.6.2.tar.gz 1557494 BLAKE2B 1ce63a893ffa6cb0e04fa3bcb34a06fdef47e2d6886f88bb7df9407f9342c81ddee6a245c15b614c15535fbfd889633f63f4532196b7ae46fd3ce32d20dda559 SHA512 7005fa55bdbfffa1b6b24ff470f5e1962e89367eaa28b23e95ebde0d1385dbe14e1c0f2d67d8ebefb1adfeeca8d551ec2b7b04a23a6af3a0f708b36da09613b3
 EBUILD prboom-plus-2.6.1.ebuild 1961 BLAKE2B f46c0c735669f8e2067ff5a1d64d4e9bb70ca6dfd409aac25ed4d9cbb1fb60cef6066a2331978a6191c4b84d05733178219d1763c3f5222c21458398f9c6fdad SHA512 5b00b4fb2e2dafae7ebb3470ea4e218bda8e617dffe2d16d37fe133fcf899273f54c8c47a978d4c0273117806fd17b7bd7b8de0be567e58bfb80c72fc0f3e00f
+EBUILD prboom-plus-2.6.2.ebuild 1966 BLAKE2B bc2777e9d3bfc846025db0928bd974e2c98bb6a50e9565189ba7c3b03fef0a46ce7c6964462554e3542f8a0f5b13309994cc001b217816753cda4e5d678ba582 SHA512 5befa1dcf47002d4739b065e82829e7a810a36c9d615f820cb297bcae363f7a735a52073c8bd29e3489a21781d4e032ecabcb820e21cd5adb8478e5e12b50981
 MISC metadata.xml 1928 BLAKE2B 3e848114401ff845732cab13483cb4692e127b1bee5f8db6ac459ca8f8e5f1a27a3f94c68bef5d50f511ef9a495afff3a8de52f89022522b8a6bed5e3deb805b SHA512 cc3441190920cd7d7cc77f8185412d9c5372a0529656312e37bb28f997dac1753e77ad6b9b13b9ab7441ded48e6e0ce06a83eb7f219e5d05b310c19dd54a6896
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.6.2-Revert-force-overriding-of-the-documentation-install.patch b/games-fps/prboom-plus/files/prboom-plus-2.6.2-Revert-force-overriding-of-the-documentation-install.patch
new file mode 100644
index 000000000000..856786ccd938
--- /dev/null
+++ b/games-fps/prboom-plus/files/prboom-plus-2.6.2-Revert-force-overriding-of-the-documentation-install.patch
@@ -0,0 +1,27 @@
+From 395fd2519f9f855b872fc59884cf88f643386a73 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Fri, 18 Feb 2022 13:54:35 +0900
+Subject: [PATCH] Revert "force overriding of the documentation installation
+ directory"
+
+This reverts commit daa454465c80231762f66aa2fa2794b547bbaa55.
+---
+ prboom2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index b5f92c87..18152ea0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(PACKAGE_TARNAME "prboom-plus")
+ set(PACKAGE_VERSION "${PROJECT_VERSION}")
+ set(PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
+ set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}" CACHE PATH "" FORCE)
++set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}" CACHE PATH "")
+ 
+ include(CheckSymbolExists)
+ 
+-- 
+2.35.1
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild
new file mode 100644
index 000000000000..69c554f17f1e
--- /dev/null
+++ b/games-fps/prboom-plus/prboom-plus-2.6.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="An enhanced clone of the classic first-person shooter Doom"
+HOMEPAGE="https://github.com/coelckers/prboom-plus/"
+SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib"
+REQUIRED_USE="server? ( net )"
+
+DEPEND="
+	media-libs/libsdl2[opengl?,joystick,sound,video]
+	alsa? ( media-libs/alsa-lib:= )
+	dumb? ( media-libs/dumb:= )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	mad? ( media-libs/libmad )
+	net? ( media-libs/sdl2-net )
+	pcre? ( dev-libs/libpcre:3 )
+	portmidi? ( media-libs/portmidi )
+	sdl2-image? ( media-libs/sdl2-image )
+	sdl2-mixer? ( media-libs/sdl2-mixer[midi] )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/prboom2"
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${P}-Revert-force-overriding-of-the-documentation-install.patch"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GL="$(usex opengl)"
+		-DWITH_IMAGE="$(usex sdl2-image)"
+		-DWITH_MIXER="$(usex sdl2-mixer)"
+		-DWITH_NET="$(usex net)"
+		-DWITH_PCRE="$(usex pcre)"
+		-DWITH_ZLIB="$(usex zlib)"
+		-DWITH_MAD="$(usex mad)"
+		-DWITH_FLUIDSYNTH="$(usex fluidsynth)"
+		-DWITH_DUMB="$(usex dumb)"
+		-DWITH_VORBISFILE="$(usex vorbis)"
+		-DWITH_PORTMIDI="$(usex portmidi)"
+		-DWITH_ALSA="$(usex alsa)"
+		-DDOOMWADDIR="${EPREFIX}/usr/share/doom"
+		-DPRBOOMDATADIR="${EPREFIX}/usr/share/${PF}"
+		-DWAD_DATA_PATH="${EPREFIX}/usr/share/doom"
+		-DBUILD_SERVER="$(usex server)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	doicon -s scalable ICONS/${PN}.svg
+	domenu ICONS/${PN}.desktop
+	cmake_src_install
+}