1 |
commit: 4058e17b11ef9fc685d693d3c7cf8aef54499bfe |
2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
3 |
AuthorDate: Sun Dec 2 13:31:40 2012 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Sun Dec 2 13:31:40 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4058e17b |
7 |
|
8 |
[games-util/steam-installer] bumped (+ patch update) |
9 |
|
10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
11 |
|
12 |
--- |
13 |
.../files/remove-ubuntu-specifics.patch | 45 ++++++++++---------- |
14 |
1 files changed, 23 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/games-util/steam-installer/files/remove-ubuntu-specifics.patch b/games-util/steam-installer/files/remove-ubuntu-specifics.patch |
17 |
index b9e5e9e..a5d6a8f 100644 |
18 |
--- a/games-util/steam-installer/files/remove-ubuntu-specifics.patch |
19 |
+++ b/games-util/steam-installer/files/remove-ubuntu-specifics.patch |
20 |
@@ -1,9 +1,11 @@ |
21 |
---- usr/bin/steam.orig 2012-11-08 11:49:47.959025506 +0100 |
22 |
-+++ usr/bin/steam 2012-11-08 11:49:59.588025546 +0100 |
23 |
-@@ -1,26 +1,5 @@ |
24 |
- #! /bin/bash |
25 |
+--- usr/bin/steam.orig 2012-11-30 16:59:01.798537287 +0400 |
26 |
++++ usr/bin/steam 2012-11-30 16:59:19.828312424 +0400 |
27 |
+@@ -108,27 +108,6 @@ |
28 |
+ fi |
29 |
+ } |
30 |
|
31 |
--function install_extra_packages() { |
32 |
+-function install_extra_packages() |
33 |
+-{ |
34 |
- EXTRA_PACKAGES="$*" |
35 |
- |
36 |
- # Get the list of packages which are already installed |
37 |
@@ -11,29 +13,28 @@ |
38 |
- |
39 |
- # compute the list of packages that need to be installed |
40 |
- NEEDSINSTALL="$(comm -23 <(echo "$EXTRA_PACKAGES" | tr ' ' '\n' | sort) <(echo "$INSTALLED") | xargs ) " |
41 |
+- NEEDSINSTALL=${NEEDSINSTALL## } # remove leading space |
42 |
- |
43 |
-- MESSAGE='Enter your password to complete the Steam installation. |
44 |
+- if [ "$NEEDSINSTALL" ]; then |
45 |
+- # Call to actually do the work |
46 |
+- MESSAGE=$"Please enter your password to complete the Steam installation. |
47 |
- |
48 |
-Steam needs to install these additional packages: |
49 |
--'$NEEDSINSTALL |
50 |
-- |
51 |
-- if [ $NEEDSINSTALL ]; then |
52 |
-- # Call gksudo to actually do the work |
53 |
-- gksudo --disable-grab --message "$MESSAGE" apt-get install $NEEDSINSTALL |
54 |
+-"$NEEDSINSTALL |
55 |
+- run_sudo "$MESSAGE" apt-get install $NEEDSINSTALL |
56 |
- fi |
57 |
-} |
58 |
- |
59 |
-- |
60 |
- # these variables can be overridden on commandline |
61 |
- LAUNCHSTEAMDIR=~/Steam |
62 |
- LAUNCHSTEAMPLATFORM=ubuntu12_32 |
63 |
-@@ -54,9 +33,6 @@ |
64 |
- |
65 |
- cp /usr/share/applications/steam.desktop "${DESKTOP_DIR}" |
66 |
- chmod +x "${DESKTOP_DIR}/steam.desktop" |
67 |
+ function install_bootstrap() |
68 |
+ { |
69 |
+ STEAMDIR=$1 |
70 |
+@@ -158,9 +137,6 @@ |
71 |
+ |
72 |
+ # Restore the umask |
73 |
+ umask $omask |
74 |
- |
75 |
- # Try and install any extra packages |
76 |
- install_extra_packages jockey-common python-apt |
77 |
- fi |
78 |
- # go to the install directory and run the client |
79 |
- LAUNCHSTEAMDIR=`readlink -e $STEAMROOTLINK` |
80 |
+ } |
81 |
+ |
82 |
+ function repair_bootstrap() |