commit: 48562bdc9ac57ad2ea64c06924fc06b06ba8ffab Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Feb 24 20:39:34 2021 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Feb 24 20:47:30 2021 +0000 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 <chewi <AT> 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 00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc011112bc8764da78b34215ae4c00b490f12820b26704e45 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..00000000000 --- 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 <[email protected]> -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 dee4306a437..00000000000 --- 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 <[email protected]> -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/prboom-plus-2.5.1.7.82.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild deleted file mode 100644 index 5736a368a56..00000000000 --- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg - -MY_PV=$(ver_rs 4 "um+git") -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}_${MY_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="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}/${PN}-master/prboom2" - -src_prepare() { - eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch - eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.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)" - -DDOOMWADDIR="${EPREFIX}/usr/share/doom" - -DWAD_INSTALL_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 -}
