Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/, games-fps/prboom-plus/files/
Date: Mon, 17 Aug 2020 21:41:08
Message-Id: 1597700334.58d081c9ba60c9fa96740d5ff04e9d4ff2bc79e0.chewi@gentoo
1 commit: 58d081c9ba60c9fa96740d5ff04e9d4ff2bc79e0
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 12 01:07:50 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 17 21:38:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d081c9
7
8 games-fps/prboom-plus: Install documentation files
9
10 Closes: https://bugs.gentoo.org/736713
11 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/17096
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 ...stall-rules-for-prboom-plus-documentation.patch | 63 ++++++++++++++++++++++
16 .../prboom-plus/prboom-plus-2.5.1.7.82.ebuild | 1 +
17 2 files changed, 64 insertions(+)
18
19 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
20 new file mode 100644
21 index 00000000000..dee4306a437
22 --- /dev/null
23 +++ b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
24 @@ -0,0 +1,63 @@
25 +From 3be21f1964d1446962adc15acf1e5d993708780f Mon Sep 17 00:00:00 2001
26 +From: William Breathitt Gray <vilhelm.gray@×××××.com>
27 +Date: Tue, 11 Aug 2020 20:25:46 -0400
28 +Subject: [PATCH] Add install rules for prboom-plus documentation
29 +
30 +---
31 + prboom2/CMakeLists.txt | 3 +++
32 + prboom2/doc/CMakeLists.txt | 24 ++++++++++++++++++++++++
33 + 2 files changed, 27 insertions(+)
34 + create mode 100644 prboom2/doc/CMakeLists.txt
35 +
36 +diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
37 +index ec1885a5..52d91e19 100644
38 +--- a/prboom2/CMakeLists.txt
39 ++++ b/prboom2/CMakeLists.txt
40 +@@ -9,6 +9,8 @@ include(TargetArch)
41 + include(TestBigEndian)
42 + TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
43 +
44 ++include(GNUInstallDirs)
45 ++
46 + # Automated dependencies discovery, mostly needed for MSVC
47 + target_architecture(TARGET_ARCH)
48 + if(${TARGET_ARCH} MATCHES "i386")
49 +@@ -184,4 +186,5 @@ set(WAD_DATA prboom-plus.wad)
50 + set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
51 +
52 + add_subdirectory(data)
53 ++add_subdirectory(doc)
54 + add_subdirectory(src)
55 +diff --git a/prboom2/doc/CMakeLists.txt b/prboom2/doc/CMakeLists.txt
56 +new file mode 100644
57 +index 00000000..9f9b96c8
58 +--- /dev/null
59 ++++ b/prboom2/doc/CMakeLists.txt
60 +@@ -0,0 +1,24 @@
61 ++set(DOC_FILES
62 ++ boom.txt
63 ++ DeePBSPV4specs.txt
64 ++ MBFFAQ.txt
65 ++ MBF.txt
66 ++ prboom-plus-history.html
67 ++ prboom-plus-history.txt
68 ++ prboom-plus-usage.txt
69 ++ README.command-line
70 ++ README.compat
71 ++ README.demos
72 ++ umapinfo.txt
73 ++)
74 ++set(MAN5_FILES
75 ++ prboom-plus.cfg.5
76 ++)
77 ++set(MAN6_FILES
78 ++ prboom-plus.6
79 ++ prboom-plus-game-server.6
80 ++)
81 ++
82 ++install(FILES ${DOC_FILES} TYPE DOC COMPONENT "Documentation")
83 ++install(FILES ${MAN5_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man5" COMPONENT "Manpages")
84 ++install(FILES ${MAN6_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT "Manpages")
85 +--
86 +2.28.0
87 +
88
89 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
90 index ec37137ed26..5736a368a56 100644
91 --- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
92 +++ b/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
93 @@ -34,6 +34,7 @@ S="${WORKDIR}/${PN}-master/prboom2"
94
95 src_prepare() {
96 eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
97 + eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
98 cmake_src_prepare
99 }