1 |
commit: 0fba856a672b3098df56c4ae99740ae3f677673d |
2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
3 |
AuthorDate: Thu Oct 14 20:23:45 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 16 21:26:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fba856a |
7 |
|
8 |
games-engines/openmw: version 0.47 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/22579 |
13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
14 |
|
15 |
games-engines/openmw/Manifest | 1 + |
16 |
.../{openmw-9999.ebuild => openmw-0.47.0.ebuild} | 51 ++++++---------------- |
17 |
games-engines/openmw/openmw-9999.ebuild | 28 +++++------- |
18 |
3 files changed, 25 insertions(+), 55 deletions(-) |
19 |
|
20 |
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest |
21 |
index 08b631916bc..088a9b8fd26 100644 |
22 |
--- a/games-engines/openmw/Manifest |
23 |
+++ b/games-engines/openmw/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32 |
26 |
DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486 |
27 |
+DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d SHA512 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b |
28 |
|
29 |
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-0.47.0.ebuild |
30 |
similarity index 78% |
31 |
copy from games-engines/openmw/openmw-9999.ebuild |
32 |
copy to games-engines/openmw/openmw-0.47.0.ebuild |
33 |
index a716d898ad5..2ee105fb115 100644 |
34 |
--- a/games-engines/openmw/openmw-9999.ebuild |
35 |
+++ b/games-engines/openmw/openmw-0.47.0.ebuild |
36 |
@@ -1,10 +1,9 @@ |
37 |
# Copyright 1999-2021 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-EAPI=7 |
41 |
+EAPI=8 |
42 |
|
43 |
-LUA_COMPAT=( lua5-{1,3,4} luajit ) |
44 |
-inherit cmake lua-single xdg-utils readme.gentoo-r1 |
45 |
+inherit cmake readme.gentoo-r1 xdg |
46 |
|
47 |
DESCRIPTION="Open source reimplementation of TES III: Morrowind" |
48 |
HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw" |
49 |
@@ -21,18 +20,17 @@ fi |
50 |
LICENSE="GPL-3 MIT BitstreamVera ZLIB" |
51 |
SLOT="0" |
52 |
IUSE="doc devtools +osg-fork test +qt5" |
53 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
54 |
RESTRICT="!test? ( test )" |
55 |
|
56 |
# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory, |
57 |
# used when BUILD_OPENCS flag is enabled. See bug #676266. |
58 |
|
59 |
-RDEPEND="${LUA_DEPS} |
60 |
- app-arch/lz4 |
61 |
+RDEPEND=" |
62 |
+ app-arch/lz4:= |
63 |
dev-games/mygui |
64 |
- dev-games/recastnavigation |
65 |
+ dev-games/recastnavigation:= |
66 |
dev-libs/boost:=[threads(+),zlib] |
67 |
- dev-libs/tinyxml:=[stl] |
68 |
+ dev-libs/tinyxml[stl] |
69 |
media-libs/libsdl2[joystick,opengl,video] |
70 |
media-libs/openal |
71 |
media-video/ffmpeg:= |
72 |
@@ -50,14 +48,12 @@ RDEPEND="${LUA_DEPS} |
73 |
) |
74 |
" |
75 |
|
76 |
-DEPEND="${RDEPEND} |
77 |
- dev-cpp/sol2 |
78 |
-" |
79 |
+DEPEND="${RDEPEND}" |
80 |
|
81 |
BDEPEND=" |
82 |
virtual/pkgconfig |
83 |
doc? ( |
84 |
- app-doc/doxygen[doc] |
85 |
+ app-doc/doxygen[dot] |
86 |
dev-python/sphinx |
87 |
) |
88 |
test? ( |
89 |
@@ -74,11 +70,10 @@ src_prepare() { |
90 |
|
91 |
# Use the system tinyxml headers |
92 |
rm -v extern/oics/tiny{str,xml}* || die |
93 |
- rm -rv extern/sol3.2.2 || die |
94 |
} |
95 |
|
96 |
src_configure() { |
97 |
- use devtools && ! use qt5 && \ |
98 |
+ use devtools && ! use qt5 && |
99 |
elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed" |
100 |
|
101 |
local mycmakeargs=( |
102 |
@@ -95,24 +90,8 @@ src_configure() { |
103 |
-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data" |
104 |
-DUSE_SYSTEM_TINYXML=ON |
105 |
-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON |
106 |
- -DDESIRED_QT_VERSION=5 |
107 |
- -DBULLET_USE_DOUBLES=ON |
108 |
) |
109 |
|
110 |
- if [[ ${ELUA} == luajit ]]; then |
111 |
- mycmakeargs+=( |
112 |
- -DUSE_LUAJIT=ON |
113 |
- ) |
114 |
- else |
115 |
- mycmakeargs+=( |
116 |
- -DUSE_LUAJIT=OFF |
117 |
- -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version)) |
118 |
- -DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version)) |
119 |
- -DLua_FIND_VERSION_COUNT=2 |
120 |
- -DLua_FIND_VERSION_EXACT=ON |
121 |
- ) |
122 |
- fi |
123 |
- |
124 |
cmake_src_configure |
125 |
} |
126 |
|
127 |
@@ -121,9 +100,9 @@ src_compile() { |
128 |
|
129 |
if use doc ; then |
130 |
cmake_src_compile doc |
131 |
- find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \ |
132 |
+ find "${BUILD_DIR}"/docs/Doxygen/html \ |
133 |
-name '*.md5' -type f -delete || die |
134 |
- HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. ) |
135 |
+ HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. ) |
136 |
fi |
137 |
} |
138 |
|
139 |
@@ -142,7 +121,7 @@ src_install() { |
140 |
directly).\n" |
141 |
|
142 |
if ! use qt5; then |
143 |
- local DOC_CONTENTS+="\n\n |
144 |
+ DOC_CONTENTS+="\n\n |
145 |
USE flag 'qt5' is disabled, 'openmw-launcher' and |
146 |
'openmw-wizard' are not available. You are on your own for |
147 |
making the Morrowind data files available and pointing |
148 |
@@ -158,10 +137,6 @@ src_install() { |
149 |
} |
150 |
|
151 |
pkg_postinst() { |
152 |
- xdg_icon_cache_update |
153 |
+ xdg_pkg_postinst |
154 |
readme.gentoo_print_elog |
155 |
} |
156 |
- |
157 |
-pkg_postrm() { |
158 |
- xdg_icon_cache_update |
159 |
-} |
160 |
|
161 |
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild |
162 |
index a716d898ad5..0bad76f5745 100644 |
163 |
--- a/games-engines/openmw/openmw-9999.ebuild |
164 |
+++ b/games-engines/openmw/openmw-9999.ebuild |
165 |
@@ -1,10 +1,10 @@ |
166 |
# Copyright 1999-2021 Gentoo Authors |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
|
169 |
-EAPI=7 |
170 |
+EAPI=8 |
171 |
|
172 |
LUA_COMPAT=( lua5-{1,3,4} luajit ) |
173 |
-inherit cmake lua-single xdg-utils readme.gentoo-r1 |
174 |
+inherit cmake lua-single readme.gentoo-r1 xdg |
175 |
|
176 |
DESCRIPTION="Open source reimplementation of TES III: Morrowind" |
177 |
HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw" |
178 |
@@ -28,11 +28,11 @@ RESTRICT="!test? ( test )" |
179 |
# used when BUILD_OPENCS flag is enabled. See bug #676266. |
180 |
|
181 |
RDEPEND="${LUA_DEPS} |
182 |
- app-arch/lz4 |
183 |
+ app-arch/lz4:= |
184 |
dev-games/mygui |
185 |
- dev-games/recastnavigation |
186 |
+ dev-games/recastnavigation:= |
187 |
dev-libs/boost:=[threads(+),zlib] |
188 |
- dev-libs/tinyxml:=[stl] |
189 |
+ dev-libs/tinyxml[stl] |
190 |
media-libs/libsdl2[joystick,opengl,video] |
191 |
media-libs/openal |
192 |
media-video/ffmpeg:= |
193 |
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND} |
194 |
BDEPEND=" |
195 |
virtual/pkgconfig |
196 |
doc? ( |
197 |
- app-doc/doxygen[doc] |
198 |
+ app-doc/doxygen[dot] |
199 |
dev-python/sphinx |
200 |
) |
201 |
test? ( |
202 |
@@ -78,7 +78,7 @@ src_prepare() { |
203 |
} |
204 |
|
205 |
src_configure() { |
206 |
- use devtools && ! use qt5 && \ |
207 |
+ use devtools && ! use qt5 && |
208 |
elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed" |
209 |
|
210 |
local mycmakeargs=( |
211 |
@@ -95,8 +95,6 @@ src_configure() { |
212 |
-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data" |
213 |
-DUSE_SYSTEM_TINYXML=ON |
214 |
-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON |
215 |
- -DDESIRED_QT_VERSION=5 |
216 |
- -DBULLET_USE_DOUBLES=ON |
217 |
) |
218 |
|
219 |
if [[ ${ELUA} == luajit ]]; then |
220 |
@@ -121,9 +119,9 @@ src_compile() { |
221 |
|
222 |
if use doc ; then |
223 |
cmake_src_compile doc |
224 |
- find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \ |
225 |
+ find "${BUILD_DIR}"/docs/Doxygen/html \ |
226 |
-name '*.md5' -type f -delete || die |
227 |
- HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. ) |
228 |
+ HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. ) |
229 |
fi |
230 |
} |
231 |
|
232 |
@@ -142,7 +140,7 @@ src_install() { |
233 |
directly).\n" |
234 |
|
235 |
if ! use qt5; then |
236 |
- local DOC_CONTENTS+="\n\n |
237 |
+ DOC_CONTENTS+="\n\n |
238 |
USE flag 'qt5' is disabled, 'openmw-launcher' and |
239 |
'openmw-wizard' are not available. You are on your own for |
240 |
making the Morrowind data files available and pointing |
241 |
@@ -158,10 +156,6 @@ src_install() { |
242 |
} |
243 |
|
244 |
pkg_postinst() { |
245 |
- xdg_icon_cache_update |
246 |
+ xdg_pkg_postinst |
247 |
readme.gentoo_print_elog |
248 |
} |
249 |
- |
250 |
-pkg_postrm() { |
251 |
- xdg_icon_cache_update |
252 |
-} |