Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
Date: Sat, 28 Aug 2021 03:39:40
Message-Id: 1630119718.022cb8098bf4a77a24c5014805b45712a67825fa.sam@gentoo
1 commit: 022cb8098bf4a77a24c5014805b45712a67825fa
2 Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
3 AuthorDate: Fri Aug 27 11:25:02 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 28 03:01:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022cb809
7
8 games-strategy/0ad: Remove a25 (superceded by a25b)
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
12 Closes: https://github.com/gentoo/gentoo/pull/22118
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 games-strategy/0ad/0ad-0.0.25_alpha.ebuild | 221 -----------------------------
16 games-strategy/0ad/Manifest | 2 -
17 2 files changed, 223 deletions(-)
18
19 diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
20 deleted file mode 100644
21 index c4b1cf74eb7..00000000000
22 --- a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
23 +++ /dev/null
24 @@ -1,221 +0,0 @@
25 -# Copyright 2014-2021 Gentoo Authors
26 -# Distributed under the terms of the GNU General Public License v2
27 -
28 -EAPI=7
29 -
30 -WX_GTK_VER="3.0-gtk3"
31 -PYTHON_COMPAT=( python3_{7..9} )
32 -inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
33 -
34 -if [[ ${PV} == 9999 ]]; then
35 - inherit git-r3
36 - EGIT_REPO_URI="https://github.com/0ad/0ad"
37 - S="${WORKDIR}/${P}"
38 -elif [[ ${PV} == *_pre* ]]; then
39 - ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
40 - SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
41 - S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
42 -else
43 - MY_P="0ad-${PV/_/-}"
44 - SRC_URI="
45 - http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
46 - https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
47 - "
48 - S="${WORKDIR}/${MY_P}"
49 -fi
50 -
51 -DESCRIPTION="A free, real-time strategy game"
52 -HOMEPAGE="https://play0ad.com/"
53 -LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
54 -SLOT="0"
55 -KEYWORDS="~amd64 ~x86"
56 -IUSE="editor +lobby nvtt pch test"
57 -RESTRICT="test"
58 -CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
59 -CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
60 -# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
61 -# build and/or startup issues.
62 -QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
63 -
64 -# virtual/rust is for bundled SpiderMonkey
65 -# Build-time Python dependency is for SM, too.
66 -# TODO: Unbundle premake5
67 -# See bug #773472 which may help (bump for it)
68 -BDEPEND="
69 - ${PYTHON_DEPS}
70 - >=dev-util/premake-5.0.0_alpha12:5
71 - virtual/pkgconfig
72 - virtual/rust
73 - test? ( dev-lang/perl )
74 -"
75 -# Removed dependency on nvtt as we use the bundled one
76 -# bug #768930
77 -DEPEND="
78 - dev-libs/boost:=
79 - dev-libs/icu:=
80 - dev-libs/libfmt:0=
81 - dev-libs/libsodium
82 - dev-libs/libxml2
83 - media-libs/libpng:0
84 - media-libs/libsdl2[X,opengl,video]
85 - media-libs/libvorbis
86 - media-libs/openal
87 - net-libs/enet:1.3
88 - net-libs/miniupnpc:=
89 - net-misc/curl
90 - sys-libs/zlib
91 - virtual/opengl
92 - x11-libs/libX11
93 - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
94 - lobby? ( net-libs/gloox )
95 -"
96 -RDEPEND="
97 - ${DEPEND}
98 - !games-strategy/0ad-data
99 -"
100 -
101 -PATCHES=(
102 - "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
103 -)
104 -
105 -pkg_setup() {
106 - use editor && setup-wxwidgets
107 -}
108 -
109 -src_prepare() {
110 - default
111 -
112 - # SpiderMonkey's configure no longer recognises --build for
113 - # the build tuple
114 - sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
115 -
116 - # Originally from 0ad-data
117 - rm binaries/data/tools/fontbuilder/fonts/*.txt || die
118 -}
119 -
120 -src_configure() {
121 - # 0AD uses premake:5 to generate the Makefiles, so let's
122 - # 1. configure the configure args,
123 - # 2. export some toolchain args,
124 - # 3. configure premake args,
125 - # 4. run premake5.
126 - local myconf=(
127 - --minimal-flags
128 - $(usex nvtt "" "--without-nvtt")
129 - $(usex pch "" "--without-pch")
130 - $(usex test "" "--without-tests")
131 - $(usex editor "--atlas" "")
132 - $(usex lobby "" "--without-lobby")
133 - --bindir="/usr/bin"
134 - --libdir="/usr/$(get_libdir)"/${PN}
135 - --datadir="/usr/share/${PN}"
136 - )
137 -
138 - tc-export AR CC CXX RANLIB
139 -
140 - local mypremakeargs=(
141 - --outpath="../workspace/gcc"
142 - --os=linux
143 - --verbose
144 - )
145 -
146 - cd "${S}/build/premake" || die "Could not enter premake directory"
147 -
148 - /usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
149 - || die "Premake failed"
150 -}
151 -
152 -src_compile() {
153 - # Build 3rd party fcollada
154 - einfo "Building bundled fcollada"
155 - emake -C libraries/source/fcollada/src
156 -
157 - # Build bundled NVTT
158 - # nvtt is abandoned upstream and 0ad has forked it and added fixes.
159 - # Use their copy. bug #768930
160 - if use nvtt ; then
161 - cd libraries/source/nvtt || die
162 - elog "Building bundled NVTT (bug #768930)"
163 - JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
164 - cd "${S}" || die
165 - fi
166 -
167 - # Build bundled SpiderMonkey
168 - # We really can't use the system SpiderMonkey right now.
169 - # Breakages occur even on minor bumps in upstream SM,
170 - # e.g. bug #768840.
171 - cd libraries/source/spidermonkey || die
172 - elog "Building bundled SpiderMonkey (bug #768840)"
173 - XARGS="${EPREFIX}/usr/bin/xargs" \
174 - JOBS="-j$(makeopts_jobs)" \
175 - ./build.sh \
176 - || die "Failed to build bundled SpiderMonkey"
177 -
178 - cd "${S}" || die
179 -
180 - # Build 0ad itself!
181 - elog "Building 0ad"
182 - JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
183 -
184 - # Build assets
185 - # (We only do this if we're using a snapshot/non-release)
186 - # See bug #771147 (comment 3) and the old 0ad-data ebuild
187 - # Warning: fragile!
188 - if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
189 - # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
190 - addpredict /proc/self/task
191 -
192 - # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
193 - local archivebuild_input archivebuild_output mod_name
194 - for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
195 - mod_name="${archivebuild_input##*/}"
196 - archivebuild_output="archives/${mod_name}"
197 -
198 - mkdir -p "${archivebuild_output}" || die
199 -
200 - einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
201 - LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
202 - -archivebuild="${archivebuild_input}" \
203 - -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
204 - || die "Failed to build assets"
205 -
206 - if [[ -f "${archivebuild_input}/mod.json" ]]; then
207 - cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
208 - fi
209 -
210 - rm -r "${archivebuild_input}" || die
211 - mv "${archivebuild_output}" "${archivebuild_input}" || die
212 - done
213 -
214 - # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
215 - rm binaries/data/config/dev.cfg || die
216 - rm -r binaries/data/mods/_test.* || die
217 - fi
218 -}
219 -
220 -src_test() {
221 - cd binaries/system || die
222 - ./test -libdir "${S}/binaries/system" || die "Failed tests"
223 -}
224 -
225 -src_install() {
226 - newbin binaries/system/pyrogenesis 0ad
227 - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
228 -
229 - # Merged from 0ad-data
230 - # bug #771147 (comment 3)
231 - insinto /usr/share/${PN}
232 - doins -r binaries/data/{l10n,config,mods,tools}
233 -
234 - # Install bundled SpiderMonkey and nvtt
235 - # bug #771147 (comment 1)
236 - exeinto /usr/$(get_libdir)/${PN}
237 - doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
238 -
239 - use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
240 - use editor && doexe binaries/system/libAtlasUI.so
241 -
242 - dodoc binaries/system/readme.txt
243 - doicon -s 128 build/resources/${PN}.png
244 - make_desktop_entry ${PN}
245 -}
246
247 diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
248 index 3adb1e76c5e..923eae80585 100644
249 --- a/games-strategy/0ad/Manifest
250 +++ b/games-strategy/0ad/Manifest
251 @@ -1,7 +1,5 @@
252 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
253 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
254 -DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730
255 -DIST 0ad-0.0.25-alpha-unix-data.tar.xz 1272283892 BLAKE2B 7bc08e52b44129fce6a78914d36bcb0c8bb3312645982054274e230a23edc34f9aa899d7ca8f52f3044b8c7efd0aea4b5d16fcd9d6e20e274538007885cfa1c2 SHA512 92fad341ceb1156a3facea291856ca2f719691bba1cf085de0544f3ae9300f46391efdd1c88bcf1aafd9a9c938b6bef3babbd50c850dc17fb0c9609dbabe37ad
256 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
257 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2
258 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1