1 |
commit: b05b2bbf69a653960faf8cbf820e02583af87fa5 |
2 |
Author: Mario Kicherer <dev <AT> kicherer <DOT> org> |
3 |
AuthorDate: Wed May 29 18:23:17 2013 +0000 |
4 |
Commit: Mario Kicherer <dev <AT> kicherer <DOT> org> |
5 |
CommitDate: Wed May 29 18:27:04 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b05b2bbf |
7 |
|
8 |
[games-util/steam-*] new launcher version 39, sync with steam-overlay |
9 |
|
10 |
--- |
11 |
.../steam-client-meta-0-r20130514.ebuild | 118 +++++++++++++++++ |
12 |
.../steam-games-meta-0-r20130312.ebuild | 2 +- |
13 |
.../steam-launcher/steam-launcher-1.0.0.38.ebuild | 143 --------------------- |
14 |
...36.ebuild => steam-launcher-1.0.0.39-r2.ebuild} | 33 ++--- |
15 |
.../steam-meta/steam-meta-0-r20130514.ebuild | 25 ++++ |
16 |
5 files changed, 158 insertions(+), 163 deletions(-) |
17 |
|
18 |
diff --git a/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild |
19 |
new file mode 100644 |
20 |
index 0000000..5e32200 |
21 |
--- /dev/null |
22 |
+++ b/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild |
23 |
@@ -0,0 +1,118 @@ |
24 |
+# Copyright 1999-2013 Gentoo Foundation |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+# $Header: $ |
27 |
+ |
28 |
+EAPI=5 |
29 |
+ |
30 |
+inherit pax-utils |
31 |
+ |
32 |
+# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay |
33 |
+# or come to #gentoo-gamerlay in freenode IRC |
34 |
+ |
35 |
+DESCRIPTION="Meta package for Valve's native Steam client" |
36 |
+HOMEPAGE="http://steampowered.com" |
37 |
+SRC_URI="" |
38 |
+LICENSE="metapackage" |
39 |
+ |
40 |
+SLOT="0" |
41 |
+KEYWORDS="-* ~amd64 ~x86" |
42 |
+IUSE="flash trayicon video_cards_intel" |
43 |
+ |
44 |
+RDEPEND=" |
45 |
+ virtual/opengl |
46 |
+ |
47 |
+ media-fonts/font-mutt-misc |
48 |
+ || ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi ) |
49 |
+ |
50 |
+ amd64? ( |
51 |
+ >=sys-devel/gcc-4.6.0[multilib] |
52 |
+ >=sys-libs/glibc-2.15[multilib] |
53 |
+ >=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32] |
54 |
+ app-emulation/steam-runtime-bin |
55 |
+ |
56 |
+ >=app-emulation/emul-linux-x86-baselibs-20121202 |
57 |
+ >=app-emulation/emul-linux-x86-gtklibs-20121202 |
58 |
+ >=app-emulation/emul-linux-x86-opengl-20121202 |
59 |
+ >=app-emulation/emul-linux-x86-sdl-20121202 |
60 |
+ >=app-emulation/emul-linux-x86-soundlibs-20121202 |
61 |
+ || ( |
62 |
+ >=app-emulation/emul-linux-x86-xlibs-20121202 |
63 |
+ ( |
64 |
+ x11-libs/libX11[abi_x86_32] |
65 |
+ x11-libs/libXcomposite[abi_x86_32] |
66 |
+ x11-libs/libXcursor[abi_x86_32] |
67 |
+ x11-libs/libXdamage[abi_x86_32] |
68 |
+ x11-libs/libXext[abi_x86_32] |
69 |
+ x11-libs/libXfixes[abi_x86_32] |
70 |
+ media-libs/fontconfig[abi_x86_32] |
71 |
+ media-libs/freetype[abi_x86_32] |
72 |
+ x11-libs/libXi[abi_x86_32] |
73 |
+ x11-libs/libXinerama[abi_x86_32] |
74 |
+ x11-libs/libXrandr[abi_x86_32] |
75 |
+ x11-libs/libXrender[abi_x86_32] |
76 |
+ ) |
77 |
+ ) |
78 |
+ |
79 |
+ trayicon? ( >=dev-libs/libappindicator-12.10.0-r1[-gtk3,abi_x86_32] ) |
80 |
+ |
81 |
+ flash? ( www-plugins/adobe-flash[32bit] ) |
82 |
+ ) |
83 |
+ x86? ( |
84 |
+ dev-libs/glib:2 |
85 |
+ dev-libs/libgcrypt |
86 |
+ dev-libs/nspr |
87 |
+ dev-libs/nss |
88 |
+ media-libs/alsa-lib |
89 |
+ media-libs/fontconfig |
90 |
+ media-libs/freetype:2 |
91 |
+ media-libs/libjpeg-turbo |
92 |
+ media-libs/libogg |
93 |
+ media-libs/libpng:1.2 |
94 |
+ >=media-libs/libsdl-2.0.0_pre6964 |
95 |
+ media-libs/libtheora |
96 |
+ media-libs/libvorbis |
97 |
+ media-libs/openal |
98 |
+ media-sound/pulseaudio |
99 |
+ net-misc/curl |
100 |
+ net-print/cups |
101 |
+ sys-apps/dbus |
102 |
+ >=sys-devel/gcc-4.6.0 |
103 |
+ >=sys-libs/glibc-2.15 |
104 |
+ >=sys-libs/zlib-1.2.4 |
105 |
+ x11-libs/cairo |
106 |
+ x11-libs/gdk-pixbuf |
107 |
+ x11-libs/gtk+:2 |
108 |
+ >=x11-libs/libX11-1.5 |
109 |
+ x11-libs/libXext |
110 |
+ x11-libs/libXfixes |
111 |
+ x11-libs/libXi |
112 |
+ x11-libs/libXrandr |
113 |
+ x11-libs/libXrender |
114 |
+ x11-libs/pango |
115 |
+ >=x11-libs/pixman-0.24.4 |
116 |
+ |
117 |
+ trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3] ) |
118 |
+ flash? ( www-plugins/adobe-flash ) |
119 |
+ video_cards_intel? ( >=media-libs/mesa-9 ) |
120 |
+ )" |
121 |
+ |
122 |
+pkg_postinst() { |
123 |
+ elog "This is only a meta package that pulls in the required" |
124 |
+ elog "dependencies for the steam client." |
125 |
+ elog "" |
126 |
+ |
127 |
+ if use flash; then |
128 |
+ elog "In order to use flash, link the 32bit libflashplayer.so to" |
129 |
+ elog "\${STEAM_FOLDER}/ubuntu12_32/plugins/" |
130 |
+ elog "" |
131 |
+ fi |
132 |
+ |
133 |
+ if host-is-pax; then |
134 |
+ elog "If you're using PAX, please see:" |
135 |
+ elog "http://wiki.gentoo.org/wiki/Steam#Hardened_Gentoo" |
136 |
+ elog "" |
137 |
+ fi |
138 |
+ |
139 |
+ ewarn "The steam client and the games are not controlled by" |
140 |
+ ewarn "portage. Updates are handled by the client itself." |
141 |
+} |
142 |
|
143 |
diff --git a/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild b/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild |
144 |
index 46156e6..c837e71 100644 |
145 |
--- a/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild |
146 |
+++ b/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild |
147 |
@@ -107,7 +107,7 @@ pkg_postinst() { |
148 |
elog "accordingly." |
149 |
elog "" |
150 |
fi |
151 |
- elog "Ebuild development website: https://github.com/anyc/steam-overlay" |
152 |
+ elog "Ebuild development website: http://github.com/anyc/steam-overlay" |
153 |
elog "" |
154 |
elog "If you have problems, please also see http://wiki.gentoo.org/wiki/Steam" |
155 |
} |
156 |
|
157 |
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.38.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.38.ebuild |
158 |
deleted file mode 100644 |
159 |
index 35a64cb..0000000 |
160 |
--- a/games-util/steam-launcher/steam-launcher-1.0.0.38.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,143 +0,0 @@ |
163 |
-# Copyright 1999-2013 Gentoo Foundation |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
-# $Header: $ |
166 |
- |
167 |
-EAPI=5 |
168 |
- |
169 |
-# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay |
170 |
-# or come to #gentoo-gamerlay in freenode IRC |
171 |
- |
172 |
-inherit eutils gnome2-utils fdo-mime |
173 |
- |
174 |
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux" |
175 |
-HOMEPAGE="http://steampowered.com" |
176 |
- |
177 |
-if [[ "${PV}" == "9999" ]] ; then |
178 |
- SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb" |
179 |
- KEYWORDS="" |
180 |
-else |
181 |
- SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz" |
182 |
- KEYWORDS="-* ~amd64 ~x86" |
183 |
-fi |
184 |
- |
185 |
-LICENSE="ValveSteamLicense" |
186 |
- |
187 |
-RESTRICT="bindist mirror" |
188 |
-SLOT="0" |
189 |
-IUSE="-steamruntime" |
190 |
- |
191 |
-RDEPEND=" |
192 |
- app-arch/xz-utils |
193 |
- app-shells/bash |
194 |
- net-misc/curl |
195 |
- || ( |
196 |
- gnome-extra/zenity |
197 |
- x11-terms/xterm |
198 |
- ) |
199 |
- |
200 |
- amd64? ( |
201 |
- >=app-emulation/emul-linux-x86-baselibs-20121028 |
202 |
- || ( |
203 |
- >=app-emulation/emul-linux-x86-xlibs-20121028 |
204 |
- ( |
205 |
- x11-libs/libX11[abi_x86_32] |
206 |
- x11-libs/libXau[abi_x86_32] |
207 |
- x11-libs/libxcb[abi_x86_32] |
208 |
- x11-libs/libXdmcp[abi_x86_32] |
209 |
- ) |
210 |
- ) |
211 |
- >=sys-devel/gcc-4.6.0[multilib] |
212 |
- >=sys-libs/glibc-2.15[multilib] |
213 |
- ) |
214 |
- x86? ( |
215 |
- >=sys-devel/gcc-4.6.0 |
216 |
- >=sys-libs/glibc-2.15 |
217 |
- >=x11-libs/libX11-1.5 |
218 |
- x11-libs/libXau |
219 |
- x11-libs/libxcb |
220 |
- x11-libs/libXdmcp |
221 |
- )" |
222 |
- |
223 |
-S=${WORKDIR}/steam/ |
224 |
- |
225 |
-src_prepare() { |
226 |
- if [[ "${PV}" != "9999" ]] ; then |
227 |
- if ! use steamruntime; then |
228 |
- # use system libraries |
229 |
- sed -i -r 's/#(if \[ -z "\$STEAM_RUNTIME" \]; then)/\1/' steam |
230 |
- sed -i -r "s/# STEAM_RUNTIME=1/ export STEAM_RUNTIME=0/" steam |
231 |
- sed -i -r "s/#(fi)/\1/" steam |
232 |
- fi |
233 |
- |
234 |
- # we use our ebuild functions to install the files |
235 |
- rm Makefile |
236 |
- fi |
237 |
-} |
238 |
- |
239 |
-src_install() { |
240 |
- dobin steam |
241 |
- |
242 |
- insinto /usr/lib/steam/ |
243 |
- doins bootstraplinux_ubuntu12_32.tar.xz |
244 |
- |
245 |
- dodoc debian/changelog steam_install_agreement.txt |
246 |
- doman steam.6 |
247 |
- |
248 |
- domenu steam.desktop |
249 |
- |
250 |
- cd icons/ |
251 |
- for s in * ; do |
252 |
- doicon -s ${s} ${s}/steam.png |
253 |
- done |
254 |
- |
255 |
- # tgz archive contains no separate pixmap, see #38 |
256 |
- insinto /usr/share/pixmaps/ |
257 |
- newins 48/steam.png steam_tray_mono.png |
258 |
-} |
259 |
- |
260 |
-pkg_preinst() { |
261 |
- gnome2_icon_savelist |
262 |
-} |
263 |
- |
264 |
-pkg_postinst() { |
265 |
- fdo-mime_desktop_database_update |
266 |
- gnome2_icon_cache_update |
267 |
- |
268 |
- ewarn "This ebuild only installs the launcher. To start the client" |
269 |
- ewarn "and play games, you'll need further libraries that you can" |
270 |
- ewarn "pull in using the steam-meta ebuild." |
271 |
- ewarn "" |
272 |
- |
273 |
- elog "Execute /usr/bin/steam to download and install the actual" |
274 |
- elog "client into your home folder. After installation, the script" |
275 |
- elog "also starts the client from your home folder." |
276 |
- elog "" |
277 |
- |
278 |
- if use steamruntime; then |
279 |
- ewarn "You enabled the steam runtime environment. Steam will use bundled" |
280 |
- ewarn "libraries instead of system libraries which is _not_ supported." |
281 |
- ewarn "" |
282 |
- else |
283 |
- elog "We disable STEAM_RUNTIME in order to ignore bundled libraries" |
284 |
- elog "and use installed system libraries instead. If you have problems," |
285 |
- elog "try starting steam with: STEAM_RUNTIME=1 steam" |
286 |
- elog "" |
287 |
- ewarn "Due to new dependencies, the steam beta client currently only works" |
288 |
- ewarn "with steam runtime enabled." |
289 |
- ewarn "" |
290 |
- fi |
291 |
- |
292 |
- if ! has_version "gnome-extra/zenity"; then |
293 |
- ewarn "Valve does not provide a xterm fallback for all calls of zenity." |
294 |
- ewarn "Please install gnome-extra/zenity for full support." |
295 |
- ewarn "" |
296 |
- fi |
297 |
- |
298 |
- ewarn "The steam client and the games are _not_ controlled by portage." |
299 |
- ewarn "Updates are handled by the client itself." |
300 |
-} |
301 |
- |
302 |
-pkg_postrm() { |
303 |
- fdo-mime_desktop_database_update |
304 |
- gnome2_icon_cache_update |
305 |
-} |
306 |
|
307 |
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild |
308 |
similarity index 74% |
309 |
rename from games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild |
310 |
rename to games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild |
311 |
index 783de06..ff579d4 100644 |
312 |
--- a/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild |
313 |
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild |
314 |
@@ -24,7 +24,7 @@ LICENSE="ValveSteamLicense" |
315 |
|
316 |
RESTRICT="bindist mirror" |
317 |
SLOT="0" |
318 |
-IUSE="-steamruntime" |
319 |
+IUSE="steamruntime" |
320 |
|
321 |
RDEPEND=" |
322 |
app-arch/xz-utils |
323 |
@@ -42,8 +42,8 @@ RDEPEND=" |
324 |
( |
325 |
x11-libs/libX11[abi_x86_32] |
326 |
x11-libs/libXau[abi_x86_32] |
327 |
- x11-libs/libxcb[abi_x86_32] |
328 |
- x11-libs/libXdmcp[abi_x86_32] |
329 |
+ x11-libs/libxcb[abi_x86_32] |
330 |
+ x11-libs/libXdmcp[abi_x86_32] |
331 |
) |
332 |
) |
333 |
>=sys-devel/gcc-4.6.0[multilib] |
334 |
@@ -64,9 +64,7 @@ src_prepare() { |
335 |
if [[ "${PV}" != "9999" ]] ; then |
336 |
if ! use steamruntime; then |
337 |
# use system libraries |
338 |
- sed -i -r 's/#(if \[ -z "\$STEAM_RUNTIME" \]; then)/\1/' steam |
339 |
- sed -i -r "s/# STEAM_RUNTIME=1/ export STEAM_RUNTIME=0/" steam |
340 |
- sed -i -r "s/#(fi)/\1/" steam |
341 |
+ sed -i -r "s/(export TEXTDOMAIN=steam)/\1\nif \[ -z \"\$STEAM_RUNTIME\" \]; then export STEAM_RUNTIME=0; fi/" steam || die |
342 |
fi |
343 |
|
344 |
# we use our ebuild functions to install the files |
345 |
@@ -103,25 +101,22 @@ pkg_postinst() { |
346 |
fdo-mime_desktop_database_update |
347 |
gnome2_icon_cache_update |
348 |
|
349 |
- ewarn "This ebuild only installs the launcher. To start the client" |
350 |
- ewarn "and play games, you'll need further libraries that you can" |
351 |
- ewarn "pull in using the steam-meta ebuild." |
352 |
- ewarn "" |
353 |
- |
354 |
elog "Execute /usr/bin/steam to download and install the actual" |
355 |
elog "client into your home folder. After installation, the script" |
356 |
elog "also starts the client from your home folder." |
357 |
elog "" |
358 |
|
359 |
- if use steamruntime; then |
360 |
- ewarn "You enabled the steam runtime environment. Steam will use bundled" |
361 |
- ewarn "libraries instead of system libraries which is _not_ supported." |
362 |
+ if use steamruntime; then |
363 |
+ ewarn "You enabled the steam runtime environment. Steam will use bundled" |
364 |
+ ewarn "libraries instead of Gentoo's system libraries." |
365 |
+ ewarn "" |
366 |
+ else |
367 |
+ elog "We disable STEAM_RUNTIME in order to ignore bundled libraries" |
368 |
+ elog "and use installed system libraries instead. If you have problems," |
369 |
+ elog "try starting steam with: STEAM_RUNTIME=1 steam" |
370 |
+ ewarn "" |
371 |
+ ewarn "Notice: Valve only supports Steam with the runtime enabled!" |
372 |
ewarn "" |
373 |
- else |
374 |
- elog "We disable STEAM_RUNTIME in order to ignore bundled libraries" |
375 |
- elog "and use installed system libraries instead. If you have problems," |
376 |
- elog "try starting steam with: STEAM_RUNTIME=1 steam" |
377 |
- elog "" |
378 |
fi |
379 |
|
380 |
if ! has_version "gnome-extra/zenity"; then |
381 |
|
382 |
diff --git a/games-util/steam-meta/steam-meta-0-r20130514.ebuild b/games-util/steam-meta/steam-meta-0-r20130514.ebuild |
383 |
new file mode 100644 |
384 |
index 0000000..16fd220 |
385 |
--- /dev/null |
386 |
+++ b/games-util/steam-meta/steam-meta-0-r20130514.ebuild |
387 |
@@ -0,0 +1,25 @@ |
388 |
+# Copyright 1999-2013 Gentoo Foundation |
389 |
+# Distributed under the terms of the GNU General Public License v2 |
390 |
+# $Header: $ |
391 |
+ |
392 |
+EAPI=5 |
393 |
+ |
394 |
+# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay |
395 |
+# or come to #gentoo-gamerlay in freenode IRC |
396 |
+ |
397 |
+DESCRIPTION="Meta package for Valve's Steam environment" |
398 |
+HOMEPAGE="https://steampowered.com" |
399 |
+SRC_URI="" |
400 |
+LICENSE="metapackage" |
401 |
+ |
402 |
+SLOT="0" |
403 |
+KEYWORDS="-* ~amd64 ~x86" |
404 |
+IUSE="steamruntime" |
405 |
+ |
406 |
+RDEPEND=" |
407 |
+ games-util/steam-launcher |
408 |
+ !steamruntime? ( |
409 |
+ games-util/steam-client-meta |
410 |
+ games-util/steam-games-meta |
411 |
+ ) |
412 |
+ " |