gentoo resync : 03.03.2021

3 files changed, 29 insertions, 122 deletions

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 b506fdd6aacc..000000000000
--- 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 <vilhelm.gray@gmail.com>
-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} $<TARGET_FILE_DIR:prboom-plus>
-         )
-     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 dee4306a4378..000000000000
--- 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 Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Tue, 11 Aug 2020 20:25:46 -0400
-Subject: [PATCH] Add install rules for prboom-plus documentation
-
----
- prboom2/CMakeLists.txt     |  3 +++
- prboom2/doc/CMakeLists.txt | 24 ++++++++++++++++++++++++
- 2 files changed, 27 insertions(+)
- create mode 100644 prboom2/doc/CMakeLists.txt
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index ec1885a5..52d91e19 100644
---- a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -9,6 +9,8 @@ include(TargetArch)
- include(TestBigEndian)
- TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
- 
-+include(GNUInstallDirs)
-+
- # Automated dependencies discovery, mostly needed for MSVC
- target_architecture(TARGET_ARCH)
- if(${TARGET_ARCH} MATCHES "i386")
-@@ -184,4 +186,5 @@ set(WAD_DATA prboom-plus.wad)
- set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
- 
- add_subdirectory(data)
-+add_subdirectory(doc)
- add_subdirectory(src)
-diff --git a/prboom2/doc/CMakeLists.txt b/prboom2/doc/CMakeLists.txt
-new file mode 100644
-index 00000000..9f9b96c8
---- /dev/null
-+++ b/prboom2/doc/CMakeLists.txt
-@@ -0,0 +1,24 @@
-+set(DOC_FILES
-+    boom.txt
-+    DeePBSPV4specs.txt
-+    MBFFAQ.txt
-+    MBF.txt
-+    prboom-plus-history.html
-+    prboom-plus-history.txt
-+    prboom-plus-usage.txt
-+    README.command-line
-+    README.compat
-+    README.demos
-+    umapinfo.txt
-+)
-+set(MAN5_FILES
-+    prboom-plus.cfg.5
-+)
-+set(MAN6_FILES
-+    prboom-plus.6
-+    prboom-plus-game-server.6
-+)
-+
-+install(FILES ${DOC_FILES} TYPE DOC COMPONENT "Documentation")
-+install(FILES ${MAN5_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man5" COMPONENT "Manpages")
-+install(FILES ${MAN6_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT "Manpages")
--- 
-2.28.0
-
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 000000000000..8f07606acd3c
--- /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 <vilhelm.gray@gmail.com>
+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
+