commit: 3e0f2e5a9cb91658fc108caf570185166c0b06c5 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> AuthorDate: Fri Feb 18 04:37:43 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Feb 19 09:45:45 2022 +0000 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 <vilhelm.gray <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24243 Signed-off-by: James Le Cuirot <chewi <AT> 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 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.g...@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 +}
