public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-base/files/, games-util/steam-games-meta/, ...
@ 2013-01-20 13:05 Mario Kicherer
  0 siblings, 0 replies; 3+ messages in thread
From: Mario Kicherer @ 2013-01-20 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     16fef49e69dd93a0f9185baf3dd227897d7ed526
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Sun Jan 20 13:04:14 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Sun Jan 20 13:04:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=16fef49e

[games-util/steam-*] new steam-base-1.0.0.22; new testdeps

---
 .../steam-base/files/usr_bin_steam-1.0.0.20.patch  |   11 --
 games-util/steam-base/files/usr_bin_steam.patch    |   20 ----
 games-util/steam-base/steam-base-1.0.0.18.ebuild   |   91 ------------------
 games-util/steam-base/steam-base-1.0.0.19.ebuild   |   98 --------------------
 games-util/steam-base/steam-base-1.0.0.21.ebuild   |    4 +-
 games-util/steam-base/steam-base-1.0.0.22.ebuild   |    1 +
 .../steam-games-meta/steam-games-meta-9999.ebuild  |    8 ++
 7 files changed, 11 insertions(+), 222 deletions(-)

diff --git a/games-util/steam-base/files/usr_bin_steam-1.0.0.20.patch b/games-util/steam-base/files/usr_bin_steam-1.0.0.20.patch
deleted file mode 100644
index d6f96ba..0000000
--- a/games-util/steam-base/files/usr_bin_steam-1.0.0.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- usr/bin/steam_orig	2013-01-10 11:35:42.777775828 +0400
-+++ usr/bin/steam	2013-01-10 11:37:02.936776107 +0400
-@@ -40,7 +40,7 @@
- 		# 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"
-+		"${TERM}" -T "$title" -e "cat $tmpfile; echo -n 'Press enter to continue: '; read input"
- 		rm -f "$tmpfile"
- 	fi
- }

diff --git a/games-util/steam-base/files/usr_bin_steam.patch b/games-util/steam-base/files/usr_bin_steam.patch
deleted file mode 100644
index 84ad30c..0000000
--- a/games-util/steam-base/files/usr_bin_steam.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr/bin/steam_orig	2012-12-14 16:51:53.429119063 +0100
-+++ usr/bin/steam	2012-12-14 16:56:08.843216298 +0100
-@@ -38,7 +38,7 @@
- 		# 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"
-+		${TERM} -T "$title" -e "cat $tmpfile; echo -n 'Press enter to continue: '; read input"
- 		rm -f "$tmpfile"
- 	fi
- }
-@@ -178,7 +178,7 @@
- 	umask "$omask"
- 
- 	# Try and install any extra packages
--	install_extra_packages jockey-common python-apt
-+	#install_extra_packages jockey-common python-apt
- }
- 
- function repair_bootstrap()

diff --git a/games-util/steam-base/steam-base-1.0.0.18.ebuild b/games-util/steam-base/steam-base-1.0.0.18.ebuild
deleted file mode 100644
index 36b11fd..0000000
--- a/games-util/steam-base/steam-base-1.0.0.18.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
-# or come to #gentoo-gamerlay in freenode IRC
-
-inherit eutils unpacker
-
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="https://steampowered.com"
-
-if [[ "${PV}" == "9999" ]] ; then
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
-	KEYWORDS=""
-else
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}_i386.deb"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="ValveSteamLicense"
-
-RESTRICT="bindist mirror"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-		gnome-extra/zenity
-
-		amd64? (
-			>=app-emulation/emul-linux-x86-baselibs-20121028
-			>=app-emulation/emul-linux-x86-xlibs-20121028
-			>=sys-devel/gcc-4.6.0[multilib]
-			>=sys-libs/glibc-2.15[multilib]
-			)
-		x86? (
-			>=sys-devel/gcc-4.6.0
-			>=sys-libs/glibc-2.15
-			>=x11-libs/libX11-1.5
-			x11-libs/libXau
-			x11-libs/libxcb
-			x11-libs/libXdmcp
-			)"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# leave -9999 vanilla to check if patches are still required
-	if [[ "${PV}" != "9999" ]] ; then
-		# fix QA notice
-		sed -r -i "s/^(MimeType=.*)/\1;/" usr/share/applications/steam.desktop
-		sed -r -i "s/^(Actions=.*)/\1;/" usr/share/applications/steam.desktop
-
-		# disable ubuntu-specific package installation and use $TERM instead
-		# of "xterm"
-		epatch "${FILESDIR}/usr_bin_steam.patch"
-	fi
-}
-
-src_install() {
-	dobin "usr/bin/steam"
-
-	insinto "/usr/lib/"
-	doins -r usr/lib/steam
-
-	dodoc usr/share/doc/steam/changelog.gz
-	doman usr/share/man/man6/steam.6.gz
-
-	insinto /usr/share/applications/
-	doins usr/share/applications/steam.desktop
-
-	insinto /usr/share/icons/
-	doins -r usr/share/icons/
-
-	doicon usr/share/pixmaps/steam.png
-}
-
-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."
-
-	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-base/steam-base-1.0.0.19.ebuild b/games-util/steam-base/steam-base-1.0.0.19.ebuild
deleted file mode 100644
index 5bef78d..0000000
--- a/games-util/steam-base/steam-base-1.0.0.19.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
-# or come to #gentoo-gamerlay in freenode IRC
-
-inherit eutils unpacker gnome2-utils fdo-mime
-
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="https://steampowered.com"
-
-if [[ "${PV}" == "9999" ]] ; then
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
-	KEYWORDS=""
-else
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}_i386.deb"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="ValveSteamLicense"
-
-RESTRICT="bindist mirror"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-		gnome-extra/zenity
-
-		amd64? (
-			>=app-emulation/emul-linux-x86-baselibs-20121028
-			>=app-emulation/emul-linux-x86-xlibs-20121028
-			>=sys-devel/gcc-4.6.0[multilib]
-			>=sys-libs/glibc-2.15[multilib]
-			)
-		x86? (
-			>=sys-devel/gcc-4.6.0
-			>=sys-libs/glibc-2.15
-			>=x11-libs/libX11-1.5
-			x11-libs/libXau
-			x11-libs/libxcb
-			x11-libs/libXdmcp
-			)"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; then
-		# 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"
-	fi
-}
-
-src_install() {
-	dobin "usr/bin/steam"
-
-	insinto "/usr/lib/"
-	doins -r usr/lib/steam
-
-	dodoc usr/share/doc/steam/changelog.gz
-	doman usr/share/man/man6/steam.6.gz
-
-	domenu usr/share/applications/steam.desktop
-
-	insinto /usr/share/icons/
-	doins -r usr/share/icons/
-
-	doicon usr/share/pixmaps/steam.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	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."
-
-	ewarn "The steam client and the games are _not_ controlled by portage."
-	ewarn "Updates are handled by the client itself."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

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 e9e87a4..873777b 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
@@ -58,9 +58,9 @@ src_prepare() {
 }
 
 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

diff --git a/games-util/steam-base/steam-base-1.0.0.22.ebuild b/games-util/steam-base/steam-base-1.0.0.22.ebuild
new file mode 120000
index 0000000..e228282
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.22.ebuild
@@ -0,0 +1 @@
+steam-base-1.0.0.21.ebuild
\ No newline at end of file

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 8049291..a8a0b65 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -34,6 +34,10 @@ RDEPEND="
 			x86? (
 				dev-games/ogre
 				media-libs/freealut
+				media-libs/freeglut
+				media-libs/libtheora
+				media-libs/libvorbis
+				media-libs/openal
 				media-libs/sdl-image
 				media-libs/sdl-mixer
 				media-libs/sdl-ttf
@@ -41,6 +45,10 @@ RDEPEND="
 				net-dns/libidn
 				net-misc/curl
 				sys-apps/pciutils
+				x11-libs/libXaw
+				x11-libs/libXft
+				x11-libs/libXmu
+				x11-libs/libXxf86vm
 				x11-misc/xclip
 				)
 			)


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-base/files/, games-util/steam-games-meta/, ...
@ 2013-02-08 21:03 Mario Kicherer
  0 siblings, 0 replies; 3+ messages in thread
From: Mario Kicherer @ 2013-02-08 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7bcdd3776d811e517458415ebdd5c9f5878b11e1
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Fri Feb  8 20:58:41 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Fri Feb  8 21:02:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=7bcdd377

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

---
 .../steam-base-1.0.0.25-disable_runtime.patch      |   16 ++
 .../files/steam-make-posix-1.0.0.20.patch          |  215 --------------------
 games-util/steam-base/steam-base-1.0.0.21.ebuild   |    3 +-
 games-util/steam-base/steam-base-1.0.0.23.ebuild   |    1 +
 games-util/steam-base/steam-base-1.0.0.24.ebuild   |    1 +
 ...-1.0.0.20.ebuild => steam-base-1.0.0.25.ebuild} |   14 +-
 .../steam-client-meta-9999.ebuild                  |    2 +-
 .../steam-games-meta/steam-games-meta-9999.ebuild  |   11 +-
 licenses/ValveSteamLicense                         |  151 +++++++++++++--
 9 files changed, 177 insertions(+), 237 deletions(-)

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
similarity index 84%
rename from games-util/steam-base/steam-base-1.0.0.20.ebuild
rename to 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 )
 			)
 		"
 

diff --git a/licenses/ValveSteamLicense b/licenses/ValveSteamLicense
index a808418..db58da3 100644
--- a/licenses/ValveSteamLicense
+++ b/licenses/ValveSteamLicense
@@ -1,13 +1,138 @@
- The software application(s) (the "Program"), and any and all copies of the Program are the copyrighted work of Valve Corporation ("Valve") or its suppliers.  All rights reserved, except as expressly stated herein.  The Program is provided solely for installation by end users according to the terms of this License Agreement. All use of the Program is governed by the terms of the Steam Agreement as described below. Any use, reproduction or redistribution of the Program not in accordance with the terms of the License Agreement and the Steam Agreement is expressly prohibited.
- LICENSE AGREEMENT
- 	1.  Limited Installation License.
- A. Valve hereby grants, and by installing the Program you thereby accept, a limited, non-exclusive license and right to install one (1) copy of the Program on a computer.  In order to use the Program you will have to obtain an account with the Steam service and accept the terms of the Steam subscriber agreement ("Steam Agreement").   By installing the Program, you agree that your future use of the Program will be subject to the terms of the Steam Agreement.  A copy of the Steam Agreement is available at www.steampowered.com/agreement.  The Steam Agreement will be displayed to you when you obtain an account with the Steam service.  The Program is licensed, not sold. Your license confers no title or ownership in the Program or copies thereof.
- B. You may not, in whole or in part: copy, photocopy, reproduce, translate, reverse engineer (with the exception of specific circumstances where such act is permitted by law), derive source code, modify, disassemble, decompile, or create derivative works based on the Program; remove any proprietary notices or labels on the Program; or attempt in any manner to circumvent any security measures designed to control access to the Program. The Program is licensed to you as a single product. Its component parts may not be separated for use on more than one computer.  You may not sell, grant a security interest in or transfer reproductions of the Program to other parties in any way, nor to rent, lease or license the Program to others without the prior written consent of Valve.
- 	2.  Ownership. All title, ownership rights and intellectual property rights in and to the Program and any and all copies thereof (including but not limited to any titles, computer code, themes, objects, characters, character names, stories, dialog, catch phrases, locations, concepts, artwork, animations, sounds, musical compositions, audio-visual effects, methods of operation, moral rights, any related documentation, and "applets" incorporated into the Program) are owned by Valve or its licensors.  The Program is protected by the copyright laws of the United States, international copyright treaties and conventions and other laws. All rights are reserved. The Program contains certain licensed materials and Valve's licensors may protect their rights in the event of any violation of this Agreement.
- 	3. Termination. This License Agreement is effective until terminated. You may terminate the License Agreement at any time by destroying the Program. Valve may, at its discretion, terminate this License Agreement in the event that you fail to comply with the terms and conditions contained herein. This License Agreement shall automatically terminate in the event that you fail to comply with the terms and conditions contained herein. In such event, you must immediately destroy the Program.  The provisions of Sections 2, 3, and 5-8 will survive any termination of the Agreement.
- 	4. Export Controls. The Program may not be re-exported, downloaded or otherwise exported into (or to a national or resident of) any country to which the U.S. has embargoed goods, or to anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S. Commerce Department's Table of Denial Orders. By installing the Program, you are agreeing to the foregoing and you are representing and warranting that you are not located in, under the control of, or a national or resident of any such country or on any such list.
- 5. Limited Warranty. The entire risk arising out of use or performance of the Program and any printed material(s) remains with the User. EXCEPT AS PROVIDED ABOVE, The Program and ANY PRINTED MATERIAL(s) are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability, fitness for a particular purpose, or noninfringement.  ANY WARRANTY AGAINST INFRINGEMENT THAT MAY BE PROVIDED IN SECTION 2-312(3) OF THE UNIFORM COMMERCIAL CODE AND/OR IN ANY OTHER COMPARABLE STATE STATUTE IS EXPRESSLY DISCLAIMED.  Some states/jurisdictions do not allow the exclusion or limitation of implied warranties, so the above limitations may not apply to you.
- 	6. Limitation of Liability. VALVE, ITS SUPPLIERS AND DISTRIBUTORS SHALL NOT BE LIABLE IN ANY WAY FOR LOSS OR DAMAGE OF ANY KIND RESULTING FROM THE USE OF THE PROGRAM INCLUDING, BUT NOT LIMITED TO, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. ANY WARRANTY AGAINST INFRINGEMENT THAT MAY BE PROVIDED IN SECTION 2-312(3) OF THE UNIFORM COMMERCIAL CODE AND/OR IN ANY OTHER COMPARABLE STATE STATUTE IS EXPRESSLY DISCLAIMED.  Valve CANNOT AND WILL NOT BE RESPONSIBLE FOR ANY SOFTWARE OR HARDWARE FAILURES OR ANY OTHER EVENT WHICH MAY RESULT IN A LOSS OF DATA OR DISRUPTION OF SERVICE. Some states/jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitations may not apply.
- 	7. Equitable Remedies. You hereby agree that Valve would be irreparably damaged if the terms of this License Agreement were not specifically enforced, and therefore you agree that Valve shall be entitled to appropriate equitable remedies with respect to breaches of this License Agreement, in addition to such other remedies as Valve may otherwise have available to it under applicable laws. In the event any litigation is brought by either party in connection with this License Agreement, the prevailing party in such litigation shall be entitled to recover from the other party all the costs, attorneys' fees and other expenses incurred by such prevailing party in the litigation.
- 	8. Miscellaneous.The terms of this paragraph do not apply to European Union consumers in the sense of Art. 5 of the Convention on the Law Applicable to Contractual Obligations opened for signature in Rome on 19 June 1980 (Rome Convention, 80/934/EEC) and national legislation based thereon. You agree that this Agreement shall be deemed to have been made and executed in the State of Washington, and any dispute arising hereunder shall be resolved in accordance with the law of Washington. You agree that any claim asserted in any legal proceeding by you against Valve shall only be commenced and maintained in any state or federal court located in King County, Washington, and you agree to submit to the exclusive jurisdiction of those courts.  In any dispute arising under this Agreement, the prevailing party will be entitled to attorneys' fees and expenses. This License Agreement may be amended, altered or modified only by an instrument in writing, specifying such amendment, alteration or
  modification, executed by both you and Valve. In the event that any provision of this License Agreement shall be held by a court or other tribunal of competent jurisdiction to be unenforceable, such provision will be enforced to the maximum extent permissible and the remaining portions of this License Agreement shall remain in full force and effect. This License Agreement and the Steam Agreement constitute and contain the entire agreement between the parties with respect to the subject matter hereof and supersede any prior oral or written agreements.
- You hereby acknowledge that you have read and understand the foregoing License Agreement and agree that the action of installing the Program is an acknowledgment of your agreement to be bound by the terms and conditions of the License Agreement contained herein.
+YOU SHOULD CAREFULLY READ THE ENTIRE FOLLOWING LICENSE AGREEMENT BEFORE
+INSTALLING THIS SOFTWARE PROGRAM.  THIS AGREEMENT CONTAINS IMPORTANT TERMS
+THAT AFFECT YOUR LEGAL RIGHTS.  BY INSTALLING THE SOFTWARE PROGRAM, YOU
+AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO
+THE TERMS OF THIS AGREEMENT, PLEASE DO NOT INSTALL THIS SOFTWARE PROGRAM.
+
+The software application(s) (the "Program"), and any and all copies of the
+Program are the copyrighted work of Valve Corporation ("Valve") or its
+suppliers.  All rights reserved, except as expressly stated herein.  The
+Program is provided solely for installation by end users according to the
+terms of this License Agreement.  All use of the Program is governed by
+the terms of the Steam Agreement as described below.  Any use,
+reproduction or redistribution of the Program not in accordance with the
+terms of the License Agreement and the Steam Agreement is expressly
+prohibited.
+
+LICENSE AGREEMENT
+
+	1.  Limited Installation License.
+
+A.  Valve hereby grants, and by installing the Program you thereby accept,
+a limited, non-exclusive license and right to install one (1) copy of the
+Program on a computer.  In order to use the Program you will have to
+obtain an account with the Steam service and accept the terms of the Steam
+subscriber agreement ("Steam Agreement").  By installing the Program, you
+agree that your future use of the Program will be subject to the terms of
+the Steam Agreement.  A copy of the Steam Agreement is available at
+www.steampowered.com/agreement.  The Steam Agreement will be displayed to
+you when you obtain an account with the Steam service.  The Program is
+licensed, not sold.  Your license confers no title or ownership in the
+Program or copies thereof.
+
+B.  You may not, in whole or in part: copy, photocopy, reproduce,
+translate, reverse engineer (with the exception of specific circumstances
+where such act is permitted by law), derive source code, modify,
+disassemble, decompile, or create derivative works based on the Program;
+remove any proprietary notices or labels on the Program; or attempt in any
+manner to circumvent any security measures designed to control access to
+the Program.  The Program is licensed to you as a single product.  Its
+component parts may not be separated for use on more than one computer.
+You may not sell, grant a security interest in or transfer reproductions
+of the Program to other parties in any way, nor to rent, lease or license
+the Program to others without the prior written consent of Valve.
+
+2.  Ownership.  All title, ownership rights and intellectual property
+rights in and to the Program and any and all copies thereof (including but
+not limited to any titles, computer code, themes, objects, characters,
+character names, stories, dialog, catch phrases, locations, concepts,
+artwork, animations, sounds, musical compositions, audio-visual effects,
+methods of operation, moral rights, any related documentation, and
+"applets" incorporated into the Program) are owned by Valve or its
+licensors.  The Program is protected by the copyright laws of the United
+States, international copyright treaties and conventions and other laws.
+All rights are reserved.  The Program contains certain licensed materials
+and Valve's licensors may protect their rights in the event of any
+violation of this Agreement.
+
+3.  Termination.  This License Agreement is effective until terminated.
+You may terminate the License Agreement at any time by destroying the
+Program.  Valve may, at its discretion, terminate this License Agreement
+in the event that you fail to comply with the terms and conditions
+contained herein.  This License Agreement shall automatically terminate in
+the event that you fail to comply with the terms and conditions contained
+herein.  In such event, you must immediately destroy the Program.  The
+provisions of Sections 2, 3, and 5-8 will survive any termination of the
+Agreement.
+
+4.  Export Controls.  The Program may not be re-exported, downloaded or
+otherwise exported into (or to a national or resident of) any country to
+which the U.S.  has embargoed goods, or to anyone on the U.S.  Treasury
+Department's list of Specially Designated Nationals or the U.S.  Commerce
+Department's Table of Denial Orders.  By installing the Program, you are
+agreeing to the foregoing and you are representing and warranting that you
+are not located in, under the control of, or a national or resident of any
+such country or on any such list.
+
+5.  Limited Warranty.  The entire risk arising out of use or performance
+of the Program and any printed material(s) remains with the User.  EXCEPT
+AS PROVIDED ABOVE, The Program and ANY PRINTED MATERIAL(s) are provided
+"as is" without warranty of any kind, either express or implied,
+including, without limitation, the implied warranties of merchantability,
+fitness for a particular purpose, or noninfringement.  ANY WARRANTY
+AGAINST INFRINGEMENT THAT MAY BE PROVIDED IN SECTION 2-312(3) OF THE
+UNIFORM COMMERCIAL CODE AND/OR IN ANY OTHER COMPARABLE STATE STATUTE IS
+EXPRESSLY DISCLAIMED.  Some states/jurisdictions do not allow the
+exclusion or limitation of implied warranties, so the above limitations
+may not apply to you.
+
+6.  Limitation of Liability.  VALVE, ITS SUPPLIERS AND DISTRIBUTORS SHALL
+NOT BE LIABLE IN ANY WAY FOR LOSS OR DAMAGE OF ANY KIND RESULTING FROM THE
+USE OF THE PROGRAM INCLUDING, BUT NOT LIMITED TO, LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+DAMAGES OR LOSSES.  ANY WARRANTY AGAINST INFRINGEMENT THAT MAY BE PROVIDED
+IN SECTION 2-312(3) OF THE UNIFORM COMMERCIAL CODE AND/OR IN ANY OTHER
+COMPARABLE STATE STATUTE IS EXPRESSLY DISCLAIMED.  Valve CANNOT AND WILL
+NOT BE RESPONSIBLE FOR ANY SOFTWARE OR HARDWARE FAILURES OR ANY OTHER
+EVENT WHICH MAY RESULT IN A LOSS OF DATA OR DISRUPTION OF SERVICE.  Some
+states/jurisdictions do not allow the exclusion or limitation of
+incidental or consequential damages, so the above limitations may not
+apply.
+
+7.  Equitable Remedies.  You hereby agree that Valve would be irreparably
+damaged if the terms of this License Agreement were not specifically
+enforced, and therefore you agree that Valve shall be entitled to
+appropriate equitable remedies with respect to breaches of this License
+Agreement, in addition to such other remedies as Valve may otherwise have
+available to it under applicable laws.  In the event any litigation is
+brought by either party in connection with this License Agreement, the
+prevailing party in such litigation shall be entitled to recover from the
+other party all the costs, attorneys' fees and other expenses incurred by
+such prevailing party in the litigation.
+
+8.  Miscellaneous.The terms of this paragraph do not apply to European
+Union consumers in the sense of Art.  5 of the Convention on the Law
+Applicable to Contractual Obligations opened for signature in Rome on 19
+June 1980 (Rome Convention, 80/934/EEC) and national legislation based
+thereon.  You agree that this Agreement shall be deemed to have been made
+and executed in the State of Washington, and any dispute arising hereunder
+shall be resolved in accordance with the law of Washington.  You agree
+that any claim asserted in any legal proceeding by you against Valve shall
+only be commenced and maintained in any state or federal court located in
+King County, Washington, and you agree to submit to the exclusive
+jurisdiction of those courts.  In any dispute arising under this
+Agreement, the prevailing party will be entitled to attorneys' fees and
+expenses.  This License Agreement may be amended, altered or modified only
+by an instrument in writing, specifying such amendment, alteration or
+modification, executed by both you and Valve.  In the event that any
+provision of this License Agreement shall be held by a court or other
+tribunal of competent jurisdiction to be unenforceable, such provision
+will be enforced to the maximum extent permissible and the remaining
+portions of this License Agreement shall remain in full force and effect.
+This License Agreement and the Steam Agreement constitute and contain the
+entire agreement between the parties with respect to the subject matter
+hereof and supersede any prior oral or written agreements.  You hereby
+acknowledge that you have read and understand the foregoing License
+Agreement and agree that the action of installing the Program is an
+acknowledgment of your agreement to be bound by the terms and conditions
+of the License Agreement contained herein.


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-base/files/, games-util/steam-games-meta/, ...
@ 2013-02-21 22:12 Mario Kicherer
  0 siblings, 0 replies; 3+ messages in thread
From: Mario Kicherer @ 2013-02-21 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f6ea84553a25974d228c627f91200d73c69e39ed
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Thu Feb 21 22:11:13 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Thu Feb 21 22:11:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f6ea8455

[games-util/steam*] new steam-base versions

---
 .../steam-base-1.0.0.25-disable_runtime.patch      |   16 -----
 games-util/steam-base/metadata.xml                 |    6 ++
 ...-1.0.0.25.ebuild => steam-base-1.0.0.28.ebuild} |   40 ++++++-------
 ...-1.0.0.25.ebuild => steam-base-1.0.0.29.ebuild} |   60 +++++++++++---------
 games-util/steam-games-meta/metadata.xml           |    1 +
 .../steam-games-meta/steam-games-meta-9999.ebuild  |   10 +++-
 6 files changed, 68 insertions(+), 65 deletions(-)

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
deleted file mode 100644
index 97482ee..0000000
--- a/games-util/steam-base/files/steam-base-1.0.0.25-disable_runtime.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/metadata.xml b/games-util/steam-base/metadata.xml
index 40fb94f..982aa7f 100644
--- a/games-util/steam-base/metadata.xml
+++ b/games-util/steam-base/metadata.xml
@@ -12,4 +12,10 @@
 	<upstream>
 		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
 	</upstream>
+	<use>
+		<flag name='steamruntime'>
+			Enables the Steam runtime environment that uses bundled
+			libraries instead of installed system libraries.
+		</flag>
+	</use>
 </pkgmetadata>

diff --git a/games-util/steam-base/steam-base-1.0.0.25.ebuild b/games-util/steam-base/steam-base-1.0.0.28.ebuild
similarity index 76%
copy from games-util/steam-base/steam-base-1.0.0.25.ebuild
copy to games-util/steam-base/steam-base-1.0.0.28.ebuild
index 6af16b0..3efb9fc 100644
--- a/games-util/steam-base/steam-base-1.0.0.25.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.28.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit eutils unpacker gnome2-utils fdo-mime
+inherit eutils gnome2-utils fdo-mime
 
 DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
 HOMEPAGE="http://steampowered.com"
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
 	KEYWORDS=""
 else
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}_i386.deb"
+	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -45,37 +45,35 @@ RDEPEND="
 			x11-libs/libXdmcp
 			)"
 
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
+S=${WORKDIR}/steam-${PV}/
 
 src_prepare() {
 	if [[ "${PV}" != "9999" ]] ; then
-		# remove carriage return
-		sed -i "s/\r//g" usr/share/applications/steam.desktop || die "Patching steam.desktop failed"
-
 		# use system libraries
-		epatch "${FILESDIR}/steam-base-1.0.0.25-disable_runtime.patch"
+		sed -i -r 's/#(if \[ -z "\$STEAM_RUNTIME" \]; then)/\1/' steam
+		sed -i -r "s/#	STEAM_RUNTIME=1/ export STEAM_RUNTIME=0/" steam
+		sed -i -r "s/#(fi)/\1/" steam
+		
+		# we use our ebuild functions to install the files
+		rm Makefile
 	fi
 }
 
 src_install() {
-	dobin usr/bin/steam
-
-	insinto /usr/lib/
-	doins -r usr/lib/steam
+	dobin steam
 
-	dodoc usr/share/doc/steam/changelog.gz
-	doman usr/share/man/man6/steam.6.gz
+	insinto /usr/lib/steam/
+	doins bootstraplinux_ubuntu12_32.tar.xz
 
-	domenu usr/share/applications/steam.desktop
+	dodoc debian/changelog steam_install_agreement.txt
+	doman steam.6
 
-	insinto /usr/share/icons/
-	doins -r usr/share/icons/
+	domenu steam.desktop
 
-	doicon usr/share/pixmaps/steam.png
+	cd icons/
+	for s in * ; do
+		doicon -s ${s} ${s}/steam.png
+	done
 }
 
 pkg_preinst() {

diff --git a/games-util/steam-base/steam-base-1.0.0.25.ebuild b/games-util/steam-base/steam-base-1.0.0.29.ebuild
similarity index 61%
rename from games-util/steam-base/steam-base-1.0.0.25.ebuild
rename to games-util/steam-base/steam-base-1.0.0.29.ebuild
index 6af16b0..542462d 100644
--- a/games-util/steam-base/steam-base-1.0.0.25.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.29.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit eutils unpacker gnome2-utils fdo-mime
+inherit eutils gnome2-utils fdo-mime
 
 DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
 HOMEPAGE="http://steampowered.com"
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_latest.deb"
 	KEYWORDS=""
 else
-	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}_i386.deb"
+	SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -24,7 +24,7 @@ LICENSE="ValveSteamLicense"
 
 RESTRICT="bindist mirror"
 SLOT="0"
-IUSE=""
+IUSE="-steamruntime"
 
 RDEPEND="
 		app-shells/bash
@@ -45,37 +45,37 @@ RDEPEND="
 			x11-libs/libXdmcp
 			)"
 
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
+S=${WORKDIR}/steam-${PV}/
 
 src_prepare() {
 	if [[ "${PV}" != "9999" ]] ; then
-		# remove carriage return
-		sed -i "s/\r//g" usr/share/applications/steam.desktop || die "Patching steam.desktop failed"
-
-		# use system libraries
-		epatch "${FILESDIR}/steam-base-1.0.0.25-disable_runtime.patch"
+		if ! use steamruntime; then
+			# use system libraries
+			sed -i -r 's/#(if \[ -z "\$STEAM_RUNTIME" \]; then)/\1/' steam
+			sed -i -r "s/#	STEAM_RUNTIME=1/ export STEAM_RUNTIME=0/" steam
+			sed -i -r "s/#(fi)/\1/" steam
+		fi
+
+		# we use our ebuild functions to install the files
+		rm Makefile
 	fi
 }
 
 src_install() {
-	dobin usr/bin/steam
+	dobin steam
 
-	insinto /usr/lib/
-	doins -r usr/lib/steam
+	insinto /usr/lib/steam/
+	doins bootstraplinux_ubuntu12_32.tar.xz
 
-	dodoc usr/share/doc/steam/changelog.gz
-	doman usr/share/man/man6/steam.6.gz
+	dodoc debian/changelog steam_install_agreement.txt
+	doman steam.6
 
-	domenu usr/share/applications/steam.desktop
+	domenu steam.desktop
 
-	insinto /usr/share/icons/
-	doins -r usr/share/icons/
-
-	doicon usr/share/pixmaps/steam.png
+	cd icons/
+	for s in * ; do
+		doicon -s ${s} ${s}/steam.png
+	done
 }
 
 pkg_preinst() {
@@ -89,10 +89,16 @@ 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"
+
+	if use steamruntime; then
+		ewarn "You enabled the steam runtime environment. Steam will use bundled"
+		ewarn "libraries instead of system libraries which is _not_ supported."
+	else
+		elog ""
+		elog "We disable STEAM_RUNTIME in order to ignore bundled libraries"
+		elog "and use installed system libraries instead. If you have problems,"
+		elog "try starting steam with: STEAM_RUNTIME=1 steam"
+	fi
 
 	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-games-meta/metadata.xml b/games-util/steam-games-meta/metadata.xml
index 42d52fa..6c5c429 100644
--- a/games-util/steam-games-meta/metadata.xml
+++ b/games-util/steam-games-meta/metadata.xml
@@ -14,6 +14,7 @@
 	</upstream>
 	<use>
 		<flag name='s3tc'>Pull in library for S3TC compression support</flag>
+		<flag name='steamgames_dwarfs'>Dwarfs</flag>
 		<flag name='steamgames_unwritten_tales'>
 			Dependencies for "The Book of Unwritten Tales: The Critter
 			Chronicles"

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 62c83ad..6529a16 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -19,7 +19,7 @@ IUSE="s3tc testdeps video_cards_intel video_cards_fglrx video_cards_nouveau
 
 # add USE_EXPAND="${USE_EXPAND} STEAMGAMES" to your make.conf for proper
 # display of steamgames use flags
-IUSE_STEAMGAMES="unwritten_tales tf2"
+IUSE_STEAMGAMES="dwarfs unwritten_tales tf2"
 
 for sgame in ${IUSE_STEAMGAMES}; do
 	IUSE="${IUSE} steamgames_${sgame}"
@@ -33,6 +33,7 @@ RDEPEND="
 		testdeps? (
 			dev-lang/mono
 			x86? (
+				dev-db/sqlite
 				dev-games/ogre
 				media-libs/freealut
 				media-libs/freeglut
@@ -55,8 +56,15 @@ RDEPEND="
 				video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 				)
 			)
+		steamgames_dwarfs? (
+				x86? (
+					media-libs/libexif
+					)
+				amd64? ( >=media-libs/libexif-0.6.21-r1[abi_x86_32] )
+			)
 		steamgames_unwritten_tales? (
 				x86? ( media-libs/jasper )
+				amd64? ( >=media-libs/jasper-1.900.1-r6[abi_x86_32] )
 			)
 		steamgames_tf2? (
 				video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.8 )


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-02-21 22:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-21 22:12 [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-base/files/, games-util/steam-games-meta/, Mario Kicherer
  -- strict thread matches above, loose matches on Subject: below --
2013-02-08 21:03 Mario Kicherer
2013-01-20 13:05 Mario Kicherer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox