[gentoo-commits] proj/gamerlay:master commit in: games-util/steam-games-meta/, games-util/steam-client-meta/, ...

[Mario Kicherer]

commit:     96ea30afc032324d818ca66d34c1069a411d9b50
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Tue Feb 26 22:17:26 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Tue Feb 26 22:17:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=96ea30af

[games-util/steam*] new base 1.0.0.34

---
 games-util/steam-base/steam-base-1.0.0.27.ebuild   |  102 --------------------
 games-util/steam-base/steam-base-1.0.0.28.ebuild   |  102 --------------------
 ...-1.0.0.29.ebuild => steam-base-1.0.0.33.ebuild} |    2 +-
 ...-1.0.0.26.ebuild => steam-base-1.0.0.34.ebuild} |   37 +++++--
 .../steam-client-meta-9999.ebuild                  |    2 +
 .../steam-games-meta/steam-games-meta-9999.ebuild  |    4 +-
 6 files changed, 30 insertions(+), 219 deletions(-)

diff --git a/games-util/steam-base/steam-base-1.0.0.27.ebuild b/games-util/steam-base/steam-base-1.0.0.27.ebuild
deleted file mode 100644
index 3efb9fc..0000000
--- a/games-util/steam-base/steam-base-1.0.0.27.ebuild
+++ /dev/null
@@ -1,102 +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 gnome2-utils fdo-mime
-
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="http://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}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="ValveSteamLicense"
-
-RESTRICT="bindist mirror"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-		app-shells/bash
-		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}/steam-${PV}/
-
-src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; 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
-		
-		# we use our ebuild functions to install the files
-		rm Makefile
-	fi
-}
-
-src_install() {
-	dobin steam
-
-	insinto /usr/lib/steam/
-	doins bootstraplinux_ubuntu12_32.tar.xz
-
-	dodoc debian/changelog steam_install_agreement.txt
-	doman steam.6
-
-	domenu steam.desktop
-
-	cd icons/
-	for s in * ; do
-		doicon -s ${s} ${s}/steam.png
-	done
-}
-
-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."
-	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."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/games-util/steam-base/steam-base-1.0.0.28.ebuild b/games-util/steam-base/steam-base-1.0.0.28.ebuild
deleted file mode 100644
index 3efb9fc..0000000
--- a/games-util/steam-base/steam-base-1.0.0.28.ebuild
+++ /dev/null
@@ -1,102 +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 gnome2-utils fdo-mime
-
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
-HOMEPAGE="http://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}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="ValveSteamLicense"
-
-RESTRICT="bindist mirror"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-		app-shells/bash
-		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}/steam-${PV}/
-
-src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; 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
-		
-		# we use our ebuild functions to install the files
-		rm Makefile
-	fi
-}
-
-src_install() {
-	dobin steam
-
-	insinto /usr/lib/steam/
-	doins bootstraplinux_ubuntu12_32.tar.xz
-
-	dodoc debian/changelog steam_install_agreement.txt
-	doman steam.6
-
-	domenu steam.desktop
-
-	cd icons/
-	for s in * ; do
-		doicon -s ${s} ${s}/steam.png
-	done
-}
-
-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."
-	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."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/games-util/steam-base/steam-base-1.0.0.29.ebuild b/games-util/steam-base/steam-base-1.0.0.33.ebuild
similarity index 99%
rename from games-util/steam-base/steam-base-1.0.0.29.ebuild
rename to games-util/steam-base/steam-base-1.0.0.33.ebuild
index 542462d..4dbd20d 100644
--- a/games-util/steam-base/steam-base-1.0.0.29.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.33.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 			x11-libs/libXdmcp
 			)"
 
-S=${WORKDIR}/steam-${PV}/
+S=${WORKDIR}/steam/
 
 src_prepare() {
 	if [[ "${PV}" != "9999" ]] ; then

diff --git a/games-util/steam-base/steam-base-1.0.0.26.ebuild b/games-util/steam-base/steam-base-1.0.0.34.ebuild
similarity index 72%
rename from games-util/steam-base/steam-base-1.0.0.26.ebuild
rename to games-util/steam-base/steam-base-1.0.0.34.ebuild
index 3efb9fc..ccb84eb 100644
--- a/games-util/steam-base/steam-base-1.0.0.26.ebuild
+++ b/games-util/steam-base/steam-base-1.0.0.34.ebuild
@@ -24,11 +24,18 @@ LICENSE="ValveSteamLicense"
 
 RESTRICT="bindist mirror"
 SLOT="0"
-IUSE=""
+IUSE="-steamruntime"
 
 RDEPEND="
+		app-arch/xz-utils
 		app-shells/bash
 		gnome-extra/zenity
+		net-misc/curl
+		|| (
+			x11-terms/gnome-terminal
+			x11-terms/xterm
+			kde-base/konsole
+			)
 
 		amd64? (
 			>=app-emulation/emul-linux-x86-baselibs-20121028
@@ -45,15 +52,17 @@ RDEPEND="
 			x11-libs/libXdmcp
 			)"
 
-S=${WORKDIR}/steam-${PV}/
+S=${WORKDIR}/steam/
 
 src_prepare() {
 	if [[ "${PV}" != "9999" ]] ; 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
-		
+		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
@@ -87,10 +96,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-client-meta/steam-client-meta-9999.ebuild b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
index 2a84f88..248efb8 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -19,6 +19,8 @@ IUSE="flash video_cards_intel windows-games"
 RDEPEND="
 		virtual/opengl
 
+		media-fonts/font-mutt-misc
+
 		windows-games? ( app-emulation/wine )
 
 		amd64? (

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 6529a16..cddff1d 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -57,9 +57,7 @@ RDEPEND="
 				)
 			)
 		steamgames_dwarfs? (
-				x86? (
-					media-libs/libexif
-					)
+				x86? ( media-libs/libexif )
 				amd64? ( >=media-libs/libexif-0.6.21-r1[abi_x86_32] )
 			)
 		steamgames_unwritten_tales? (