1 |
commit: 059541e7707feb0d4465a863d2bacbc850d1495f |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 6 19:53:57 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 6 19:53:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059541e7 |
7 |
|
8 |
games-action/teeworlds: Remove vulnerable 0.6.3 wrt bug #600178 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
games-action/teeworlds/Manifest | 1 - |
13 |
games-action/teeworlds/teeworlds-0.6.3-r1.ebuild | 122 ----------------------- |
14 |
games-action/teeworlds/teeworlds-0.6.3.ebuild | 118 ---------------------- |
15 |
3 files changed, 241 deletions(-) |
16 |
|
17 |
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest |
18 |
index 74b45ac09c5..b3b591ad637 100644 |
19 |
--- a/games-action/teeworlds/Manifest |
20 |
+++ b/games-action/teeworlds/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST teeworlds-0.6.3-src.tar.gz 13101446 SHA256 490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b SHA512 0c7ef6ca59e4b49f9e208f39e8b0edd76965d67848008af3a223cb7615a6c62ff433d3113f733ae4dafc364baf522d2f56255e058d26d9f5c48071cdde41526d WHIRLPOOL dc501bb9a2f4c3971ad063102a55cc70633857e3052f3a349d032dd8e92ea05f6138c62e9775b743b38dc3a56366d9920850b5a7ffbf6913ed73536a5cacdff4 |
23 |
DIST teeworlds-0.6.4-src.tar.gz 8771622 SHA256 c261d19ebb00b5451faa2ceb4a7ca945cad2add48b06046eb43b40ccc9fd98e2 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce WHIRLPOOL ea45aeb1eeef511e38b19e051dc575b7506dba002ed27a3850aabbb9bfac9a0530bc033d3428ede75a0081c054a573a91c0c942cf49477645674ad5d4aa28764 |
24 |
|
25 |
diff --git a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index c7affb67818..00000000000 |
28 |
--- a/games-action/teeworlds/teeworlds-0.6.3-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,122 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
-PYTHON_COMPAT=( python2_7 ) |
36 |
-inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator |
37 |
- |
38 |
-REVISION="b177-r50edfd37" |
39 |
- |
40 |
-DESCRIPTION="Online multi-player platform 2D shooter" |
41 |
-HOMEPAGE="http://www.teeworlds.com/" |
42 |
-SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz" |
43 |
- |
44 |
-LICENSE="ZLIB" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="~amd64 ~x86" |
47 |
-IUSE="debug dedicated" |
48 |
- |
49 |
-RDEPEND=" |
50 |
- !dedicated? ( |
51 |
- app-arch/bzip2 |
52 |
- media-libs/freetype |
53 |
- media-libs/libsdl[X,sound,opengl,video] |
54 |
- media-libs/pnglite |
55 |
- media-sound/wavpack |
56 |
- virtual/glu |
57 |
- virtual/opengl |
58 |
- x11-libs/libX11 ) |
59 |
- sys-libs/zlib" |
60 |
-DEPEND="${RDEPEND} |
61 |
- ${PYTHON_DEPS} |
62 |
- ~dev-util/bam-0.4.0" |
63 |
- |
64 |
-S=${WORKDIR}/${P}-src |
65 |
-MY_PV=$(get_version_component_range 1-2) |
66 |
- |
67 |
-PATCHES=( |
68 |
- "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch" |
69 |
- "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch" |
70 |
- "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch" |
71 |
- "${FILESDIR}/${MY_PV}/04-dedicated.patch" |
72 |
- "${FILESDIR}/${MY_PV}/05-cc-cflags.patch" |
73 |
-) |
74 |
- |
75 |
-pkg_setup() { |
76 |
- python-any-r1_pkg_setup |
77 |
-} |
78 |
- |
79 |
-src_prepare() { |
80 |
- default |
81 |
- |
82 |
- rm -r src/engine/external/* || die |
83 |
- |
84 |
- cat <<- __EOF__ > "${S}/gentoo.lua" |
85 |
- function addSettings(settings) |
86 |
- print("Adding Gentoo settings") |
87 |
- settings.optimize = 0 |
88 |
- settings.cc.exe_c = "$(tc-getCC)" |
89 |
- settings.cc.exe_cxx = "$(tc-getCXX)" |
90 |
- settings.cc.flags_c:Add("${CFLAGS}") |
91 |
- settings.cc.flags_cxx:Add("${CXXFLAGS}") |
92 |
- settings.link.exe = "$(tc-getCXX)" |
93 |
- settings.link.flags:Add("${LDFLAGS}") |
94 |
- end |
95 |
- __EOF__ |
96 |
- |
97 |
- sed -i \ |
98 |
- -e "s#/usr/share/games/teeworlds/data#/usr/share/${PN}/data#" \ |
99 |
- src/engine/shared/storage.cpp || die |
100 |
-} |
101 |
- |
102 |
-src_configure() { |
103 |
- bam -v config || die |
104 |
-} |
105 |
- |
106 |
-src_compile() { |
107 |
- local myopt |
108 |
- |
109 |
- if use debug; then |
110 |
- myopt=" server_debug" |
111 |
- else |
112 |
- myopt=" server_release" |
113 |
- fi |
114 |
- if ! use dedicated; then |
115 |
- if use debug; then |
116 |
- myopt+=" client_debug" |
117 |
- else |
118 |
- myopt+=" client_release" |
119 |
- fi |
120 |
- fi |
121 |
- |
122 |
- bam -v -a -j $(makeopts_jobs) ${myopt} || die |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- if use debug; then |
127 |
- newbin ${PN}_srv_d ${PN}_srv |
128 |
- else |
129 |
- dobin ${PN}_srv |
130 |
- fi |
131 |
- if ! use dedicated; then |
132 |
- if use debug; then |
133 |
- newbin ${PN}_d ${PN} |
134 |
- else |
135 |
- dobin ${PN} |
136 |
- fi |
137 |
- |
138 |
- doicon "${FILESDIR}"/${PN}.xpm |
139 |
- make_desktop_entry ${PN} Teeworlds |
140 |
- |
141 |
- insinto /usr/share/${PN}/data |
142 |
- doins -r data/* |
143 |
- else |
144 |
- insinto /usr/share/${PN}/data/maps |
145 |
- doins -r data/maps/* |
146 |
- fi |
147 |
- newinitd "${FILESDIR}"/${PN}-init.d ${PN} |
148 |
- insinto "/etc/${PN}" |
149 |
- doins "${FILESDIR}"/teeworlds_srv.cfg |
150 |
- |
151 |
- dodoc readme.txt |
152 |
-} |
153 |
|
154 |
diff --git a/games-action/teeworlds/teeworlds-0.6.3.ebuild b/games-action/teeworlds/teeworlds-0.6.3.ebuild |
155 |
deleted file mode 100644 |
156 |
index 791c9d00e07..00000000000 |
157 |
--- a/games-action/teeworlds/teeworlds-0.6.3.ebuild |
158 |
+++ /dev/null |
159 |
@@ -1,118 +0,0 @@ |
160 |
-# Copyright 1999-2015 Gentoo Foundation |
161 |
-# Distributed under the terms of the GNU General Public License v2 |
162 |
- |
163 |
-EAPI=5 |
164 |
-PYTHON_COMPAT=( python2_7 ) |
165 |
-inherit eutils multiprocessing python-any-r1 toolchain-funcs games versionator |
166 |
- |
167 |
-REVISION="b177-r50edfd37" |
168 |
- |
169 |
-DESCRIPTION="Online multi-player platform 2D shooter" |
170 |
-HOMEPAGE="http://www.teeworlds.com/" |
171 |
-SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz" |
172 |
- |
173 |
-LICENSE="ZLIB" |
174 |
-SLOT="0" |
175 |
-KEYWORDS="amd64 x86" |
176 |
-IUSE="debug dedicated" |
177 |
- |
178 |
-RDEPEND=" |
179 |
- !dedicated? ( media-libs/pnglite |
180 |
- media-libs/libsdl[X,sound,opengl,video] |
181 |
- media-sound/wavpack |
182 |
- virtual/opengl |
183 |
- app-arch/bzip2 |
184 |
- media-libs/freetype |
185 |
- virtual/glu |
186 |
- x11-libs/libX11 ) |
187 |
- sys-libs/zlib" |
188 |
-DEPEND="${RDEPEND} |
189 |
- ${PYTHON_DEPS} |
190 |
- ~dev-util/bam-0.4.0" |
191 |
- |
192 |
-S=${WORKDIR}/${P}-src |
193 |
-MY_PV=$(get_version_component_range 1-2) |
194 |
- |
195 |
-pkg_setup() { |
196 |
- python-any-r1_pkg_setup |
197 |
- games_pkg_setup |
198 |
-} |
199 |
- |
200 |
-src_prepare() { |
201 |
- rm -r src/engine/external/* || die |
202 |
- |
203 |
- # 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493 |
204 |
- EPATCH_SOURCE="${FILESDIR}/${MY_PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ |
205 |
- epatch |
206 |
- |
207 |
- cat <<- __EOF__ > "${S}/gentoo.lua" |
208 |
- function addSettings(settings) |
209 |
- print("Adding Gentoo settings") |
210 |
- settings.optimize = 0 |
211 |
- settings.cc.exe_c = "$(tc-getCC)" |
212 |
- settings.cc.exe_cxx = "$(tc-getCXX)" |
213 |
- settings.cc.flags_c:Add("${CFLAGS}") |
214 |
- settings.cc.flags_cxx:Add("${CXXFLAGS}") |
215 |
- settings.link.exe = "$(tc-getCXX)" |
216 |
- settings.link.flags:Add("${LDFLAGS}") |
217 |
- end |
218 |
- __EOF__ |
219 |
- |
220 |
- sed -i \ |
221 |
- -e "s#/usr/share/games/teeworlds/data#${GAMES_DATADIR}/${PN}/data#" \ |
222 |
- src/engine/shared/storage.cpp || die |
223 |
-} |
224 |
- |
225 |
-src_configure() { |
226 |
- bam -v config || die |
227 |
-} |
228 |
- |
229 |
-src_compile() { |
230 |
- local myopt |
231 |
- |
232 |
- if use debug; then |
233 |
- myopt=" server_debug" |
234 |
- else |
235 |
- myopt=" server_release" |
236 |
- fi |
237 |
- if ! use dedicated; then |
238 |
- if use debug; then |
239 |
- myopt+=" client_debug" |
240 |
- else |
241 |
- myopt+=" client_release" |
242 |
- fi |
243 |
- fi |
244 |
- |
245 |
- bam -v -a -j $(makeopts_jobs) ${myopt} || die |
246 |
-} |
247 |
- |
248 |
-src_install() { |
249 |
- if use debug; then |
250 |
- newgamesbin ${PN}_srv_d ${PN}_srv |
251 |
- else |
252 |
- dogamesbin ${PN}_srv |
253 |
- fi |
254 |
- if ! use dedicated; then |
255 |
- if use debug; then |
256 |
- newgamesbin ${PN}_d ${PN} |
257 |
- else |
258 |
- dogamesbin ${PN} |
259 |
- fi |
260 |
- |
261 |
- doicon "${FILESDIR}"/${PN}.xpm |
262 |
- make_desktop_entry ${PN} Teeworlds |
263 |
- |
264 |
- insinto "${GAMES_DATADIR}"/${PN}/data |
265 |
- doins -r data/* |
266 |
- else |
267 |
- insinto "${GAMES_DATADIR}"/${PN}/data/maps |
268 |
- doins -r data/maps/* |
269 |
- fi |
270 |
- newinitd "${FILESDIR}"/${PN}-init.d ${PN} |
271 |
- insinto "/etc/${PN}" |
272 |
- doins "${FILESDIR}"/teeworlds_srv.cfg |
273 |
- |
274 |
- dodoc readme.txt |
275 |
- |
276 |
- prepgamesdirs |
277 |
-} |