[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: ed1ee35ae6b03c883af7995d636c287c0c0050d5
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 06:08:32 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1ee35a
games-fps/prboom-plus: drop 2.6.1
Signed-off-by: Ionen Wolkens gentoo.org>
games-fps/prboom-plus/Manifest | 1 -
...ard-OpenGL-call-in-D_Display-with-GL_DOOM.patch | 28 -
games-fps/prboom-plus/prboom-plus-2.6.1.ebuild | 66 --
3 files changed, 95 deletions(-)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 5fe0fab49db5..100d5304041c 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,2 +1 @@
-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
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
deleted file mode 100644
index 78a0285703f4..
---
a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eca393ffd3c05279150a29e104953c0234a59736 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Fri, 27 Aug 2021 12:06:45 +0900
-Subject: [PATCH] Guard OpenGL call in D_Display() with GL_DOOM
-
-Fixes: https://github.com/coelckers/prboom-plus/issues/382
- prboom2/src/d_main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c
-index 16a9efc2..4fe97465 100644
a/prboom2/src/d_main.c
-+++ b/prboom2/src/d_main.c
-@@ -395,8 +395,10 @@ void D_Display (fixed_t frac)
- R_DrawViewBorder();
- HU_Drawer();
-
-+#ifdef GL_DOOM
- if (V_GetMode() == VID_MODEGL)
- gld_ProcessExtraAlpha();
-+#endif
- }
-
- isborderstate = isborder;
---
-2.33.0
-
diff --git a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
deleted file mode 100644
index 4dbc0b9a4876..
--- a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}um.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}um/prboom2"
-
-src_prepare() {
- eapply -p2
"${FILESDIR}/${P}-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.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"
-
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: 3e0f2e5a9cb91658fc108caf570185166c0b06c5
Author: William Breathitt Gray gmail com>
AuthorDate: Fri Feb 18 04:37:43 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Feb 19 09:45:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0f2e5a
games-fps/prboom-plus: Version bump to 2.6.2
Closes: https://bugs.gentoo.org/833587
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24243
Signed-off-by: James Le Cuirot gentoo.org>
games-fps/prboom-plus/Manifest | 1 +
...e-overriding-of-the-documentation-install.patch | 27 +
games-fps/prboom-plus/prboom-plus-2.6.2.ebuild | 66 ++
3 files changed, 94 insertions(+)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 11f61226eb91..5fe0fab49db5 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1 +1,2 @@
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
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 ..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
+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 ..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)"
+
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: 48562bdc9ac57ad2ea64c06924fc06b06ba8ffab
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 24 20:39:34 2021 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Feb 24 20:47:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48562bdc
games-fps/prboom-plus: Drop old 2.5.1.7.82
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: James Le Cuirot gentoo.org>
games-fps/prboom-plus/Manifest | 1 -
...plus-2.5.1.7.82-Add-CMake-install-targets.patch | 59
...stall-rules-for-prboom-plus-documentation.patch | 63 -
.../prboom-plus/prboom-plus-2.5.1.7.82.ebuild | 65 --
4 files changed, 188 deletions(-)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 6be7818da6d..e2d5bed539e 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,2 +1 @@
-DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B
7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9
SHA512
55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B
00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc02bc8764da78b34215ae4c00b490f12820b26704e45
SHA512
c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
deleted file mode 100644
index b506fdd6aac..000
---
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b123022530997df901abbfc7f8dab2846e7d1d7a Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Sat, 6 Jun 2020 13:39:46 -0400
-Subject: [PATCH] Add CMake install targets
-
-Fixes: https://github.com/coelckers/prboom-plus/issues/70
- prboom2/CMakeLists.txt | 2 +-
- prboom2/data/CMakeLists.txt | 2 ++
- prboom2/src/CMakeLists.txt | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index 4aba6b94..932182b6 100644
a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -150,7 +150,7 @@ check_symbol_exists(SDL_JoystickGetAxis "SDL.h"
HAVE_SDL_JOYSTICKGETAXIS)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_PREV})
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_PREV})
-
--set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to
install prboom.wad and look for other WAD files")
-+set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to
look for WAD files")
-
- option(SIMPLECHECKS "Enable checks which only impose significant overhead if
a posible error is detected" ON)
- option(ZONEIDCHECK "Enable id checks on zone blocks, to detect corrupted and
illegally freed blocks" ON)
-diff --git a/prboom2/data/CMakeLists.txt b/prboom2/data/CMakeLists.txt
-index b855e9e5..33e1d873 100644
a/prboom2/data/CMakeLists.txt
-+++ b/prboom2/data/CMakeLists.txt
-@@ -362,3 +362,5 @@ add_custom_command(
- DEPENDS rdatawad ${WAD_SRC}
- )
- add_custom_target(prboomwad DEPENDS ${WAD_DATA_PATH})
-+set(WAD_INSTALL_PATH ${DOOMWADDIR} CACHE PATH "Path to install prboom.wad")
-+install(FILES ${WAD_DATA_PATH} DESTINATION ${WAD_INSTALL_PATH} COMPONENT
"PrBoom-Plus internal WAD")
-diff --git a/prboom2/src/CMakeLists.txt b/prboom2/src/CMakeLists.txt
-index b5a0f6bd..89505603 100644
a/prboom2/src/CMakeLists.txt
-+++ b/prboom2/src/CMakeLists.txt
-@@ -340,6 +340,8 @@ function(AddGameExecutable TARGET SOURCES)
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${WAD_DATA_PATH}
$
- )
- endif()
-+
-+install(TARGETS ${TARGET} COMPONENT "Game executable")
- endfunction()
-
- AddGameExecutable(prboom-plus "${PRBOOM_PLUS_SOURCES}")
-@@ -426,6 +428,7 @@ if(BUILD_SERVER AND SDL2_NET_FOUND)
- RUNTIME_OUTPUT_DIRECTORY ${PRBOOM_OUTPUT_PATH}
- )
- ApplySDL2NetOptions(prboom-plus-game-server)
-+install(TARGETS prboom-plus-game-server COMPONENT "Game server
executable")
- endif()
-
-
---
-2.26.2
-
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
deleted file mode 100644
index dee4306a437..000
---
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3be21f1964d1446962adc15acf1e5d993708780f Mon Sep 17 00:00:00 2001
-From: William
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: 1af745b8ccc6841ef212231ff721b354dea991cb
Author: William Breathitt Gray gmail com>
AuthorDate: Mon Feb 22 08:44:53 2021 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Feb 24 20:47:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af745b8
games-fps/prboom-plus: Bump to version 2.6
Closes: https://bugs.gentoo.org/769737
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19592
Signed-off-by: James Le Cuirot gentoo.org>
games-fps/prboom-plus/Manifest | 1 +
...Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch | 29 ++
games-fps/prboom-plus/prboom-plus-2.6.ebuild | 63 ++
3 files changed, 93 insertions(+)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 9acad2caf4b..6be7818da6d 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1 +1,2 @@
DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B
7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9
SHA512
55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
+DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B
00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc02bc8764da78b34215ae4c00b490f12820b26704e45
SHA512
c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
new file mode 100644
index 000..8f07606acd3
--- /dev/null
+++
b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
@@ -0,0 +1,29 @@
+From 9f56505b7c41337cab3a6ce3f882cf8df6bf29a9 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray
+Date: Mon, 22 Feb 2021 18:27:24 +0900
+Subject: [PATCH] Set CMAKE_INSTALL_DOCDIR as a cache entry
+
+CMAKE_INSTALL_DOCDIR is being unconditionally set which prevents users
+from supplying their own docdir preference. This changes the behavior to
+set CMAKE_INSTALL_DOCDIR as a cache entry so that users can override the
+default install location if they so wish.
+---
+ prboom2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index 9c2c1fde..3110d7f3 100644
+--- a/prboom2/CMakeLists.txt
b/prboom2/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(PACKAGE_TARNAME "prboom-plus")
+ set(PACKAGE_VERSION "${PROJECT_VERSION}um")
+ set(PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
+ set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+-set(CMAKE_INSTALL_DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}")
++set(CMAKE_INSTALL_DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}" CACHE PATH "")
+
+ include(CheckSymbolExists)
+
+--
+2.30.1
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.6.ebuild
b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
new file mode 100644
index 000..dcd77904bd3
--- /dev/null
+++ b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}um.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="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]
+ 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}um/prboom2"
+
+src_prepare() {
+ eapply -p2
"${FILESDIR}/${P}-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.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)"
+
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: f20f45785c4b7d8ac3a146749238dd42ecdbe12a
Author: William Breathitt Gray gmail com>
AuthorDate: Sat Jun 6 18:22:03 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Jun 7 11:26:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20f4578
games-fps/prboom-plus: Bump to version 2.5.1.7.82
Closes: https://bugs.gentoo.org/723862
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16089
Signed-off-by: James Le Cuirot gentoo.org>
games-fps/prboom-plus/Manifest | 2 +-
1.4-Remove-nonstandard-gamesdir-variable.patch | 33 ---
...plus-2.5.1.7.82-Add-CMake-install-targets.patch | 59
games-fps/prboom-plus/metadata.xml | 3 +-
.../prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild | 64 --
.../prboom-plus/prboom-plus-2.5.1.7.82.ebuild | 64 ++
6 files changed, 126 insertions(+), 99 deletions(-)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index c1490c8fbdb..9acad2caf4b 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1 +1 @@
-DIST prboom-plus-2.5.1.5.4540.1.tar.xz 1023228 BLAKE2B
5b1c6aa80516cef4ced73701b640a261188c6eed818a204ef19f183061c0456f4af70dc8b466c240f5c8985903fe4daf0fed42cd32b47849c02b6c890fa807f0
SHA512
9fe207a395d92305dd3b89a38bc1376de6bd2a7bb29d454da42aea03a4ded82b49033d482d97c76377cbd1ecb7d8a65c9e0948af81ecd4e10bd49b0bad791bbc
+DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B
7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9
SHA512
55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
deleted file mode 100644
index c64bd135937..000
---
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d0aaa51e05da23c2b0ad46901c2f4b3cd0500681 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Fri, 21 Jun 2019 17:31:01 +0900
-Subject: [PATCH] Remove nonstandard gamesdir variable
-
-The Autotools canonical method of configuring the program installation
-directory is via the bindir variable (e.g. "--bindir=/usr/games/doom").
- src/Makefile.am | 6 ++
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c20da98..9b3ab13 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,12 +8,10 @@
-
- SUBDIRS = SDL POSIX MAC PCSOUND TEXTSCREEN MUSIC
-
--gamesdir=$(prefix)/games
--
- if BUILD_SERVER
--games_PROGRAMS = prboom-plus prboom-plus-game-server
-+bin_PROGRAMS = prboom-plus prboom-plus-game-server
- else
--games_PROGRAMS = prboom-plus
-+bin_PROGRAMS = prboom-plus
- endif
-
- CFLAGS = @CFLAGS@ @SDL_CFLAGS@
---
-2.22.0
-
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
new file mode 100644
index 000..b506fdd6aac
--- /dev/null
+++
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
@@ -0,0 +1,59 @@
+From b123022530997df901abbfc7f8dab2846e7d1d7a Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray
+Date: Sat, 6 Jun 2020 13:39:46 -0400
+Subject: [PATCH] Add CMake install targets
+
+Fixes: https://github.com/coelckers/prboom-plus/issues/70
+---
+ prboom2/CMakeLists.txt | 2 +-
+ prboom2/data/CMakeLists.txt | 2 ++
+ prboom2/src/CMakeLists.txt | 3 +++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index 4aba6b94..932182b6 100644
+--- a/prboom2/CMakeLists.txt
b/prboom2/CMakeLists.txt
+@@ -150,7 +150,7 @@ check_symbol_exists(SDL_JoystickGetAxis "SDL.h"
HAVE_SDL_JOYSTICKGETAXIS)
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_PREV})
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_PREV})
+
+-set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to
install prboom.wad and look for other WAD files")
++set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to
look for WAD files")
+
+ option(SIMPLECHECKS "Enable checks which only impose significant overhead if
a posible error is detected" ON)
+ option(ZONEIDCHECK "Enable id checks on zone blocks, to detect corrupted and
illegally freed blocks" ON)
+diff --git a/prboom2/data/CMakeLists.txt b/prboom2/data/CMakeLists.txt
+index b855e9e5..33e1d873 100644
+--- a/prboom2/data/CMakeLists.txt
b/prboom2/data/CMakeLists.txt
+@@ -362,3 +362,5 @@ add_custom_command(
+
[gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
commit: 54d69b5150e342464abbf45d4699877b32a2efc2
Author: William Breathitt Gray gmail com>
AuthorDate: Thu Jun 20 07:30:38 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Jun 24 19:57:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d69b51
games-fps/prboom-plus: Introduce version 2.5.1.4
Closes: https://bugs.gentoo.org/338027
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: William Breathitt Gray gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12297
Signed-off-by: James Le Cuirot gentoo.org>
games-fps/prboom-plus/Manifest | 1 +
1.4-Remove-nonstandard-gamesdir-variable.patch | 33 +++
games-fps/prboom-plus/metadata.xml | 33 +++
games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild | 68 ++
4 files changed, 135 insertions(+)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
new file mode 100644
index 000..74314aab3b5
--- /dev/null
+++ b/games-fps/prboom-plus/Manifest
@@ -0,0 +1 @@
+DIST prboom-plus-2.5.1.4.tar.gz 3007237 BLAKE2B
3dce8aad6fb521d13cf3e6b48a261f010b545bafa853860b284be0d0772f65b4fa0bfa965f7cb1869cc0d0eb21a4237e1873d08ff56d439cb3eed00f82bf12fb
SHA512
625b75c5fe663bb3ba54bcd90f914ad7461c0860448f6f179180de26bea0a4d766739c50f96a8245687bc213742ec53bf6ffa26cde09772b3ae0bba91662213e
diff --git
a/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
new file mode 100644
index 000..c64bd135937
--- /dev/null
+++
b/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
@@ -0,0 +1,33 @@
+From d0aaa51e05da23c2b0ad46901c2f4b3cd0500681 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray
+Date: Fri, 21 Jun 2019 17:31:01 +0900
+Subject: [PATCH] Remove nonstandard gamesdir variable
+
+The Autotools canonical method of configuring the program installation
+directory is via the bindir variable (e.g. "--bindir=/usr/games/doom").
+---
+ src/Makefile.am | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c20da98..9b3ab13 100644
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -8,12 +8,10 @@
+
+ SUBDIRS = SDL POSIX MAC PCSOUND TEXTSCREEN MUSIC
+
+-gamesdir=$(prefix)/games
+-
+ if BUILD_SERVER
+-games_PROGRAMS = prboom-plus prboom-plus-game-server
++bin_PROGRAMS = prboom-plus prboom-plus-game-server
+ else
+-games_PROGRAMS = prboom-plus
++bin_PROGRAMS = prboom-plus
+ endif
+
+ CFLAGS = @CFLAGS@ @SDL_CFLAGS@
+--
+2.22.0
+
diff --git a/games-fps/prboom-plus/metadata.xml
b/games-fps/prboom-plus/metadata.xml
new file mode 100644
index 000..c05b6d7832b
--- /dev/null
+++ b/games-fps/prboom-plus/metadata.xml
@@ -0,0 +1,33 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ PrBoom+ is a Doom source port developed from the original
PrBoom project.
+
+
+ vilhelm.g...@gmail.com
+ William Breathitt Gray
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
+ ga...@gentoo.org
+ Gentoo Games Project
+
+
+ Enable support for various tracker-style
music formats via media-libs/dumb
+ Enable support for MIDI via
media-sound/fluidsynth
+ Enable support for network play
+ Enable non-free components
+ Enable support for MIDI via
media-libs/portmidi
+ Enable support for high-resolution
texture support via media-libs/sdl-image
+ Enable support for MIDI via
media-libs/sdl-mixer
+
+
+ https://sourceforge.net/p/prboom-plus/bugs
+ https://prboom-plus.sourceforge.net
+ prboom-plus
+
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
new file mode 100644
index 000..29196ddfd2e
--- /dev/null
+++ b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="A Doom source port developed from the original PrBoom project"
+HOMEPAGE="https://prboom-plus.sourceforge.net;
+# We are using a github mirror here because the upstream tarball is missing the
+# free dog assets; we should update SRC_URI to point to the upstream tarball
+# once the free assets are present as expected
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/coelckers/prboom-plus/archive/f96f891d068dcc5ec52ed91056b46d27e9a8462d.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-2+
+ nonfree? ( freedist )
+ !nonfree? ( BSD )"
+SLOT="0"
