[games-util/steam-*] new steam-base ebuilds; removed old

9 files changed, 42 insertions, 225 deletions

diff --git a/games-util/steam-base/Manifest b/games-util/steam-base/Manifest
index c7492e0..54b9ae9 100644
--- a/games-util/steam-base/Manifest
+++ b/games-util/steam-base/Manifest
@@ -1,3 +1,5 @@
-DIST steam_1.0.0.20_i386.deb 1554410 SHA256 ede2d68f01d0383da9b6368157c925bb30f8076b8f86eff85c452dbd9ff23c60 SHA512 e2d673a8fc4a23e7fe5c8afe83f0f48d5d9bd25385c4f74c46c5bc2d4ed421a6748d4f64bffd1a8996eca2997e917f7ee8483bcef4859113f2981ef18e32c7bd WHIRLPOOL b4c946c826dcab3e4f1288bc2b893752ed123d708a320be2b2df755b9835d12425c211f3c3a15d0db92d180eb893c9ccd1642371e4e3c0afca077d00ce2aed83
 DIST steam_1.0.0.21_i386.deb 1555304 SHA256 52ef410b09e86b79b338fc5cb57fe1bb93e8ff2f94a7a8f5e909cfd9f2aee30e SHA512 1b22f40545194740921903b7c1132df4539dce480953e54d58105bb503b51169c7ab92c328995d18ed940df90013c9a7af401edb77fdc8ae2eeedee2adf6f1de WHIRLPOOL 0cebaeb9cf026aeb5e9a17eeacad25f2ecb398a0595d6b8ebbb4dacc2147a3da71c633c187ee74e6670f1e2001b71b4a40b17fff5caaca643a7f16841934453a
 DIST steam_1.0.0.22_i386.deb 1555012 SHA256 3f7bda0cb94c788ac57d295616d830d7d7dc09480c9af1e9e3abb573da914225 SHA512 dcc22d129b7f1f98fbde99a9c949b5b0dfd471b3d68a310264e0ebb2bebadef2f49a13c2cd9e7d3dc7f48d00a767a5b277b58a8d6dcf3dd4f337995fc01cf2ef WHIRLPOOL 29afb66e92c133e8fd73eafd419650f2e7823a53f20c1f53c553cea204927b2e493e8e6a4bef8d15ab46f484a2dbd988d0e988d76e0ac7597afc56f94322bced
+DIST steam_1.0.0.23_i386.deb 6501862 SHA256 f3a6271e1efc8d66f454f07216e1a9c1d60f82e026d97613083a296fb339f84e SHA512 1da3e580ba624e99545c7d902fb62f8c5d1751b49a29d02d42be4278c1f722aef91bf094f486946241c0657f822a3256ec2a2a66dd7038f7b2e3e8d5b3362945 WHIRLPOOL 4aceb21ba7dd484c364894d94800cebcd6299539660243c07e9f974b0078cc4740ae0ea6282afd1b17d3338bacba62c57511b68c1c2463c1435dc2818275d017
+DIST steam_1.0.0.24_i386.deb 6513862 SHA256 64f9dd5a7eeb6894e696053468a17ff541c7e0436ef182847b5b3789ace9a3b7 SHA512 34fb4cc5c4348ec6e80bf31e19669f9702989c8a2ddf970b0483dcee51b4d3a4b4325e0fa08aee2013aa952a0f640695c823b4f04c0e6fe26934662fd932da38 WHIRLPOOL 0e96a8d9699c2c9fede82bc8be1b56e9ae44bfe4b477aab950aff9fa747e096660b307dc9fdfa8d9d82c337833412d3ef3fe5caffddd3f808d2d8cd60d88cffc
+DIST steam_1.0.0.25_i386.deb 6521964 SHA256 708c08666c5fe1d8877d4e3805ce6fcb0139bf78974d3b7b24b13ca65d3f036a SHA512 32e5f1a07ef8d505110562a20212d853be3fb9ed8e054da578aa5a6596ff5d2411c826ebec166978ba0b25882e3b812c520245f84cd0c44e689aeb641be8aa24 WHIRLPOOL 853b26710dd7e8e65f90dd5a394fd51914182fd48b996ee4a9678707f12bdd7190203ccbf945fb3e3f92c1e8732716f10021d5450f8df7dd53f771adae79e4d7
diff --git a/games-util/steam-base/files/steam-base-1.0.0.25-disable_runtime.patch b/games-util/steam-base/files/steam-base-1.0.0.25-disable_runtime.patch
new file mode 100644
index 0000000..97482ee
--- /dev/null
+++ b/games-util/steam-base/files/steam-base-1.0.0.25-disable_runtime.patch
@@ -0,0 +1,16 @@
+--- a/usr/bin/steam       2013-02-08 21:11:49.634241372 +0100
++++ b/usr/bin/steam       2013-02-08 21:12:03.251354781 +0100
+@@ -175,10 +175,9 @@
+        exit 1
+ fi
+ 
+-# Uncomment this if your distribution supports the Steam Linux Runtime
+-#if [ -z "$STEAM_RUNTIME" ]; then
+-#	STEAM_RUNTIME=1
+-#fi
++if [ -z "$STEAM_RUNTIME" ]; then
++	export STEAM_RUNTIME=0
++fi
+ 
+ # go to the install directory and run the client
+ cp "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz"
diff --git a/games-util/steam-base/files/steam-make-posix-1.0.0.20.patch b/games-util/steam-base/files/steam-make-posix-1.0.0.20.patch
deleted file mode 100644
index b3c0cf2..0000000
--- a/games-util/steam-base/files/steam-make-posix-1.0.0.20.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- usr/bin/steam_orig
-+++ usr/bin/steam
-@@ -1,10 +1,11 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # This is the Steam script that typically resides in /usr/bin
- # It will create the Steam bootstrap if necessary and then launch steam.
- 
- # Get the full name of this script
--export STEAMSCRIPT="$(cd "${0%/*}" && echo "$PWD")/${0##*/}"
-+STEAMSCRIPT="$(cd "${0%/*}" && echo "$PWD")/${0##*/}"
-+export STEAMSCRIPT
- 
- # This version number is incremented when there is a critical fix that
- # end users need to pick up immediately.
-@@ -15,44 +16,61 @@
- # steamrepo@list.valvesoftware.com
- # You can subscribe to this list at:
- # 	https://list.valvesoftware.com/mailman/listinfo/steamrepo
--export STEAMSCRIPT_VERSION=0
-+STEAMSCRIPT_VERSION=0
-+export STEAMSCRIPT_VERSION
- 
- # Set up domain for script localization
--export TEXTDOMAIN=steam
-+TEXTDOMAIN=steam
-+export TEXTDOMAIN
- 
--function show_message()
-+if command -v gettext.sh >/dev/null; then
-+	GETTEXT_FOUND=1
-+	. gettext.sh
-+fi
-+
-+_gettextecho()
-+{
-+	if [ $GETTEXT_FOUND = 1 ] ; then
-+		echo "$(eval_gettext "$1")"
-+	else
-+		echo "$1"
-+	fi
-+}
-+
-+
-+show_message()
- {
- 	style=$1
- 	shift
- 	if ! zenity "$style" --text="$*" 2>/dev/null; then
- 		case "$style" in
- 		--error)
--			title=$"Error"
-+			title="$(_gettextecho "Error")"
- 			;;
- 		--warning)
--			title=$"Warning"
-+			title="$(_gettextecho "Warning")"
- 			;;
- 		*)
--			title=$"Note"
-+			title="$(_gettextecho "Note")"
- 			;;
- 		esac
- 
- 		# Save the prompt in a temporary file because it can have newlines in it
- 		tmpfile="$(mktemp || echo "/tmp/steam_message.txt")"
--		echo -e "$*" >"$tmpfile"
--		xterm -T "$title" -e "cat $tmpfile; echo -n 'Press enter to continue: '; read input"
-+		printf "%b$*" >"$tmpfile"
-+		xterm -T "$title" -e "cat $tmpfile; printf 'Press enter to continue: '; read input"
- 		rm -f "$tmpfile"
- 	fi
- }
- 
--function detect_platform()
-+detect_platform()
- {
- 	# Maybe be smarter someday
- 	# Right now this is the only platform we have a bootstrap for, so hard-code it.
- 	echo ubuntu12_32
- }
- 
--function setup_variables()
-+setup_variables()
- {
- 	STEAMPACKAGE="${0##*/}"
- 	STEAMCONFIG=~/.steam
-@@ -60,7 +78,8 @@
- 	STEAMBOOTSTRAP=steam.sh
- 	LAUNCHSTEAMDIR="$(readlink -e -q "$STEAMDATALINK")"
- 	LAUNCHSTEAMPLATFORM="$(detect_platform)"
--	LAUNCHSTEAMBOOTSTRAPFILE="/usr/lib/$STEAMPACKAGE/bootstraplinux_$LAUNCHSTEAMPLATFORM.tar.xz"
-+	[ -z $LAUNCHSTEAMBOOTSTRAPFILE ] && LAUNCHSTEAMBOOTSTRAPFILE="/usr/lib/$STEAMPACKAGE/bootstraplinux_$LAUNCHSTEAMPLATFORM.tar.xz"
-+	[ -z $DESKTOPFILE ] && DESKTOPFILE="/usr/share/applications/$STEAMPACKAGE.desktop"
- 
- 	# Get the default data path
- 	STEAM_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-@@ -74,18 +93,18 @@
- 			DEFAULTSTEAMDIR="$STEAM_DATA_HOME/SteamBeta"
- 			;;
- 		*)
--			echo $"Unknown Steam package '$STEAMPACKAGE'"
-+			_gettextecho "Unknown Steam package '$STEAMPACKAGE'"
- 			exit 1
- 			;;
- 	esac
- 
- 	# Create the config directory if needed
--	if [[ ! -d "$STEAMCONFIG" ]]; then
-+	if [ ! -d "$STEAMCONFIG" ]; then
- 		mkdir "$STEAMCONFIG"
- 	fi
- }
- 
--function install_bootstrap()
-+install_bootstrap()
- {
- 	STEAMDIR="$1"
- 
-@@ -93,11 +112,12 @@
- 	omask="$(umask)"
- 	umask 0077
- 
--	echo $"Setting up Steam content in $STEAMDIR"
-+	_gettextecho "Setting up Steam content in $STEAMDIR"
-+
- 	mkdir -p "$STEAMDIR"
- 	cd "$STEAMDIR"
- 	if ! tar xJf "$LAUNCHSTEAMBOOTSTRAPFILE" ; then
--		echo $"Failed to extract $LAUNCHSTEAMBOOTSTRAPFILE, aborting installation."
-+		_gettextecho "Failed to extract $LAUNCHSTEAMBOOTSTRAPFILE, aborting installation."
- 		exit 1
- 	fi
- 	rm -f "$STEAMDATALINK" && ln -s "$STEAMDIR" "$STEAMDATALINK"
-@@ -106,25 +126,27 @@
- 	# put the Steam icon on the user's desktop
- 	# try to read ~/.config/user-dirs.dirs to get the current desktop configuration
- 	# http://www.freedesktop.org/wiki/Software/xdg-user-dirs
--	test -f "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs" && source "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs"
-+	if test -f "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs" ; then
-+		. "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs"
-+	fi
- 	DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}"
- 
--	cp "/usr/share/applications/$STEAMPACKAGE.desktop" "$DESKTOP_DIR"
-+	cp "${DESKTOPFILE}" "$DESKTOP_DIR"
- 	chmod +x "$DESKTOP_DIR/$STEAMPACKAGE.desktop"
- 
- 	# Restore the umask
- 	umask "$omask"
- }
- 
--function repair_bootstrap()
-+repair_bootstrap()
- {
- 	rm -f "$STEAMDATALINK" && ln -s "$1" "$STEAMDATALINK"
- 	setup_variables
- }
- 
--function check_bootstrap()
-+check_bootstrap()
- {
--	if [[ -n "$1" && -x "$1/$STEAMBOOTSTRAP" ]]; then
-+	if [ -n "$1" ] && [ -x "$1/$STEAMBOOTSTRAP" ]; then
- 		# Looks good...
- 		return 0
- 	else
-@@ -138,23 +160,23 @@
- if ! check_bootstrap "$LAUNCHSTEAMDIR"; then
- 	# See if we just need to recreate the data link
- 	if check_bootstrap "$DEFAULTSTEAMDIR"; then
--		echo $"Repairing installation, linking $STEAMDATALINK to $DEFAULTSTEAMDIR"
-+		_gettextecho "Repairing installation, linking $STEAMDATALINK to $DEFAULTSTEAMDIR"
- 		repair_bootstrap "$DEFAULTSTEAMDIR"
- 	elif check_bootstrap "$CLASSICSTEAMDIR"; then
--		echo $"Repairing installation, linking $STEAMDATALINK to $CLASSICSTEAMDIR"
-+		_gettextecho "Repairing installation, linking $STEAMDATALINK to $CLASSICSTEAMDIR"
- 		repair_bootstrap "$CLASSICSTEAMDIR"
- 	fi
- fi
- 
--if [[ ! -L "$STEAMDATALINK" ]]; then
-+if [ ! -L "$STEAMDATALINK" ]; then
- 	# We don't have the data link and we couldn't find an existing bootstrap, so just install the bootstrap
- 	install_bootstrap "$DEFAULTSTEAMDIR"
- elif ! check_bootstrap "$LAUNCHSTEAMDIR"; then
- 	# We have the data link but we can't find the data, prompt the user
--	if zenity --question --text=$"Couldn't find Steam content, did you move it?" --ok-label=$"Search" --cancel-label=$"Reinstall"; then
-+	if zenity --question --text="$(_gettextecho "Could not find Steam content, did you move it?")" --ok-label="$(_gettextecho "Search")" --cancel-label="$(_gettextecho "Reinstall")"; then
- 		while true; do
- 			STEAMDIR="`zenity --file-selection --directory`"
--			if [[ -z "$STEAMDIR" ]]; then
-+			if [ -z "$STEAMDIR" ]; then
- 				# User canceled
- 				exit 0
- 			fi
-@@ -162,7 +184,7 @@
- 				repair_bootstrap "$STEAMDIR"
- 				break;
- 			else
--				show_message --error $"Please pick a valid Steam content directory"
-+				show_message --error "$(_gettextecho "Please pick a valid Steam content directory")"
- 			fi
- 		done
- 	else
-@@ -171,7 +193,7 @@
- fi
- 
- if ! check_bootstrap "$LAUNCHSTEAMDIR"; then
--	show_message --error $"Couldn't set up Steam data - please contact technical support"
-+	show_message --error "$(_gettextecho "Could not set up Steam data - please contact technical support")"
- 	exit 1
- fi
- 
diff --git a/games-util/steam-base/steam-base-1.0.0.21.ebuild b/games-util/steam-base/steam-base-1.0.0.21.ebuild
index 873777b..7ba9021 100644
--- a/games-util/steam-base/steam-base-1.0.0.21.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.21.ebuild
@@ -10,7 +10,7 @@ EAPI=5
 inherit eutils unpacker gnome2-utils fdo-mime
 
 DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="https://steampowered.com"
+HOMEPAGE="http://steampowered.com"
 
 if [[ "${PV}" == "9999" ]] ; then
 	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
@@ -27,6 +27,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+		app-shells/bash
 		gnome-extra/zenity
 
 		amd64? (
diff --git a/games-util/steam-base/steam-base-1.0.0.23.ebuild b/games-util/steam-base/steam-base-1.0.0.23.ebuild
new file mode 120000
index 0000000..e228282
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.23.ebuild
@@ -0,0 +1 @@
+steam-base-1.0.0.21.ebuild
\ No newline at end of file
diff --git a/games-util/steam-base/steam-base-1.0.0.24.ebuild b/games-util/steam-base/steam-base-1.0.0.24.ebuild
new file mode 120000
index 0000000..e228282
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.24.ebuild
@@ -0,0 +1 @@
+steam-base-1.0.0.21.ebuild
\ No newline at end of file
diff --git a/games-util/steam-base/steam-base-1.0.0.20.ebuild b/games-util/steam-base/steam-base-1.0.0.25.ebuild
index 5bef78d..6af16b0 100644
--- a/games-util/steam-base/steam-base-1.0.0.20.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.25.ebuild
@@ -10,7 +10,7 @@ EAPI=5
 inherit eutils unpacker gnome2-utils fdo-mime
 
 DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="https://steampowered.com"
+HOMEPAGE="http://steampowered.com"
 
 if [[ "${PV}" == "9999" ]] ; then
 	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
@@ -27,6 +27,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+		app-shells/bash
 		gnome-extra/zenity
 
 		amd64? (
@@ -55,14 +56,15 @@ src_prepare() {
 		# remove carriage return
 		sed -i "s/\r//g" usr/share/applications/steam.desktop || die "Patching steam.desktop failed"
 
-		epatch "${FILESDIR}/steam-make-posix-${PV}.patch"
+		# use system libraries
+		epatch "${FILESDIR}/steam-base-1.0.0.25-disable_runtime.patch"
 	fi
 }
 
 src_install() {
-	dobin "usr/bin/steam"
+	dobin usr/bin/steam
 
-	insinto "/usr/lib/"
+	insinto /usr/lib/
 	doins -r usr/lib/steam
 
 	dodoc usr/share/doc/steam/changelog.gz
@@ -87,6 +89,10 @@ pkg_postinst() {
 	elog "Execute /usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"
 	elog "also starts the client from your home folder."
+	elog ""
+	elog "We disable STEAM_RUNTIME in order to ignore packaged libraries"
+	elog "and use installed system libraries instead. If you have problems,"
+	elog "try starting steam with: STEAM_RUNTIME=1 steam"
 
 	ewarn "The steam client and the games are _not_ controlled by portage."
 	ewarn "Updates are handled by the client itself."
diff --git a/games-util/steam-client-meta/steam-client-meta-9999.ebuild b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
index 3df9eb5..2a84f88 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -8,7 +8,7 @@ EAPI=5
 # or come to #gentoo-gamerlay in freenode IRC
 
 DESCRIPTION="Meta package for Valve's native Steam client"
-HOMEPAGE="https://steampowered.com"
+HOMEPAGE="http://steampowered.com"
 SRC_URI=""
 LICENSE="metapackage"
 
diff --git a/games-util/steam-games-meta/steam-games-meta-9999.ebuild b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
index a8a0b65..62c83ad 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -8,13 +8,14 @@ EAPI=5
 # or come to #gentoo-gamerlay in freenode IRC
 
 DESCRIPTION="Meta package for Steam games"
-HOMEPAGE="https://steampowered.com"
+HOMEPAGE="http://steampowered.com"
 SRC_URI=""
 LICENSE="metapackage"
 
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="s3tc testdeps video_cards_intel video_cards_fglrx"
+IUSE="s3tc testdeps video_cards_intel video_cards_fglrx video_cards_nouveau
+	video_cards_nvidia video_cards_radeon"
 
 # add USE_EXPAND="${USE_EXPAND} STEAMGAMES" to your make.conf for proper
 # display of steamgames use flags
@@ -50,10 +51,12 @@ RDEPEND="
 				x11-libs/libXmu
 				x11-libs/libXxf86vm
 				x11-misc/xclip
+
+				video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 				)
 			)
 		steamgames_unwritten_tales? (
-			x86? ( media-libs/jasper )
+				x86? ( media-libs/jasper )
 			)
 		steamgames_tf2? (
 				video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.8 )
@@ -62,6 +65,8 @@ RDEPEND="
 REQUIRED_USE="
 		steamgames_tf2? (
 				video_cards_intel? ( s3tc )
+				video_cards_radeon? ( s3tc )
+				video_cards_nouveau? ( s3tc )
 			)
 		"