From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5BD1F1381F3 for ; Sun, 2 Dec 2012 13:31:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21C4E21C004; Sun, 2 Dec 2012 13:31:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74C3521C004 for ; Sun, 2 Dec 2012 13:31:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69B5F33D8CE for ; Sun, 2 Dec 2012 13:31:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 02F63E5436 for ; Sun, 2 Dec 2012 13:31:21 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1354455100.4058e17b11ef9fc685d693d3c7cf8aef54499bfe.mva@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-installer/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-util/steam-installer/files/remove-ubuntu-specifics.patch X-VCS-Directories: games-util/steam-installer/files/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 4058e17b11ef9fc685d693d3c7cf8aef54499bfe X-VCS-Branch: master Date: Sun, 2 Dec 2012 13:31:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c617384-d2c9-4f80-903b-db4fb0eb9992 X-Archives-Hash: b05976c714e2854986ae2dab5eea2419 commit: 4058e17b11ef9fc685d693d3c7cf8aef54499bfe Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Sun Dec 2 13:31:40 2012 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Sun Dec 2 13:31:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4058e17b [games-util/steam-installer] bumped (+ patch update) Signed-off-by: Vadim A. Misbakh-Soloviov mva.name> --- .../files/remove-ubuntu-specifics.patch | 45 ++++++++++---------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/games-util/steam-installer/files/remove-ubuntu-specifics.patch b/games-util/steam-installer/files/remove-ubuntu-specifics.patch index b9e5e9e..a5d6a8f 100644 --- a/games-util/steam-installer/files/remove-ubuntu-specifics.patch +++ b/games-util/steam-installer/files/remove-ubuntu-specifics.patch @@ -1,9 +1,11 @@ ---- usr/bin/steam.orig 2012-11-08 11:49:47.959025506 +0100 -+++ usr/bin/steam 2012-11-08 11:49:59.588025546 +0100 -@@ -1,26 +1,5 @@ - #! /bin/bash +--- usr/bin/steam.orig 2012-11-30 16:59:01.798537287 +0400 ++++ usr/bin/steam 2012-11-30 16:59:19.828312424 +0400 +@@ -108,27 +108,6 @@ + fi + } --function install_extra_packages() { +-function install_extra_packages() +-{ - EXTRA_PACKAGES="$*" - - # Get the list of packages which are already installed @@ -11,29 +13,28 @@ - - # compute the list of packages that need to be installed - NEEDSINSTALL="$(comm -23 <(echo "$EXTRA_PACKAGES" | tr ' ' '\n' | sort) <(echo "$INSTALLED") | xargs ) " +- NEEDSINSTALL=${NEEDSINSTALL## } # remove leading space - -- MESSAGE='Enter your password to complete the Steam installation. +- if [ "$NEEDSINSTALL" ]; then +- # Call to actually do the work +- MESSAGE=$"Please enter your password to complete the Steam installation. - -Steam needs to install these additional packages: --'$NEEDSINSTALL -- -- if [ $NEEDSINSTALL ]; then -- # Call gksudo to actually do the work -- gksudo --disable-grab --message "$MESSAGE" apt-get install $NEEDSINSTALL +-"$NEEDSINSTALL +- run_sudo "$MESSAGE" apt-get install $NEEDSINSTALL - fi -} - -- - # these variables can be overridden on commandline - LAUNCHSTEAMDIR=~/Steam - LAUNCHSTEAMPLATFORM=ubuntu12_32 -@@ -54,9 +33,6 @@ - - cp /usr/share/applications/steam.desktop "${DESKTOP_DIR}" - chmod +x "${DESKTOP_DIR}/steam.desktop" + function install_bootstrap() + { + STEAMDIR=$1 +@@ -158,9 +137,6 @@ + + # Restore the umask + umask $omask - - # Try and install any extra packages - install_extra_packages jockey-common python-apt - fi - # go to the install directory and run the client - LAUNCHSTEAMDIR=`readlink -e $STEAMROOTLINK` + } + + function repair_bootstrap()