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

[Mario Kicherer]

commit:     476c8377bdf1f2dff6aba9cb2796a0074b7e61a0
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Fri Mar 29 21:02:15 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Fri Mar 29 21:02:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=476c8377

[games-util/steam*] small updates

---
 games-util/steam-games-meta/metadata.xml           |    1 +
 .../steam-games-meta-0-r20130312.ebuild            |   20 ++--
 .../steam-launcher-1.0.0.35-r1.ebuild              |  131 --------------------
 .../steam-launcher/steam-launcher-1.0.0.35.ebuild  |  117 -----------------
 .../steam-launcher/steam-launcher-1.0.0.36.ebuild  |    7 +-
 5 files changed, 19 insertions(+), 257 deletions(-)

diff --git a/games-util/steam-games-meta/metadata.xml b/games-util/steam-games-meta/metadata.xml
index 428c203..7bf198a 100644
--- a/games-util/steam-games-meta/metadata.xml
+++ b/games-util/steam-games-meta/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name='steamgames_tf2'>Team Fortress 2</flag>
 		<flag name='steamgames_journey_down'>The journy down</flag>
 		<flag name='steamgames_trine2'>Trine 2</flag>
+		<flag name='steamgames_shatter'>Sidhe's Shatter</flag>
 		<flag name='steamgames_defenders_quest'>Defender's Quest: Valley of the Forgotten</flag>
 		<flag name='testdeps'>
 			Pull in dependencies that are not yet confirmed as strictly

diff --git a/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild b/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
index bf0ce6a..8fbda14 100644
--- a/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
@@ -19,7 +19,8 @@ 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="dwarfs unwritten_tales tf2 trine2 journey_down defenders_quest"
+IUSE_STEAMGAMES="dwarfs unwritten_tales tf2 trine2 journey_down defenders_quest
+	shatter"
 
 for sgame in ${IUSE_STEAMGAMES}; do
 	IUSE="${IUSE} steamgames_${sgame}"
@@ -55,8 +56,6 @@ RDEPEND="
 				x11-libs/libXmu
 				x11-libs/libXxf86vm
 				x11-misc/xclip
-
-				video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 				)
 			)
 		steamgames_dwarfs? (
@@ -79,6 +78,10 @@ RDEPEND="
 		steamgames_defenders_quest? (
 				dev-util/adobe-air-runtime
 			)
+		steamgames_shatter? (
+				amd64? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013 )
+				x86? ( media-gfx/nvidia-cg-toolkit )
+			)
 		"
 REQUIRED_USE="
 		steamgames_tf2? (
@@ -93,17 +96,18 @@ pkg_postinst() {
 		elog "If a game does not start, please enable \"testdeps\" use-flag and"
 		elog "check if it fixes the issue. Please report, if and which one of the"
 		elog "dependencies is required for a game, so we can mark it accordingly."
+		elog ""
 	fi
 
 	if use amd64; then
 		elog "If a game does not start, please take a look at the dependencies"
 		elog "for the x86 architecture in this ebuild. It might be required that"
-		elog "you build them in a x86 chroot environment or using crossdev (see"
-		elog "http://en.gentoo-wiki.com/wiki/Crossdev ). Please report, if and"
-		elog "which one of the dependencies is required for a game, so we can"
-		elog "request the inclusion in the emul-linux-x86* packages, see:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=446682"
+		elog "we create a multilib ebuild for x86. Please report, if and which"
+		elog "one of the dependencies is required for a game, so we can mark it"
+		elog "accordingly."
+		elog ""
 	fi
 	elog "Ebuild development website: https://github.com/anyc/steam-overlay"
+	elog ""
 	elog "If you have problems, please also see http://wiki.gentoo.org/wiki/Steam"
 }

diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.35-r1.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.35-r1.ebuild
deleted file mode 100644
index d3de8d8..0000000
--- a/games-util/steam-launcher/steam-launcher-1.0.0.35-r1.ebuild
+++ /dev/null
@@ -1,131 +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="-steamruntime"
-
-RDEPEND="
-		app-arch/xz-utils
-		app-shells/bash
-		net-misc/curl
-		|| (
-			gnome-extra/zenity
-			x11-terms/xterm
-			)
-
-		amd64? (
-			>=app-emulation/emul-linux-x86-baselibs-20121028
-			|| (
-				>=app-emulation/emul-linux-x86-xlibs-20121028
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXau[abi_x86_32]
-		                        x11-libs/libxcb[abi_x86_32]
-		                        x11-libs/libXdmcp[abi_x86_32]
-				)
-			)
-			>=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/
-
-src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; then
-		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 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 ""
-
-	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."
-		ewarn ""
-	else
-		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"
-		elog ""
-	fi
-
-	if ! has_version "gnome-extra/zenity"; then
-		ewarn "Valve does not provide a xterm fallback for all calls of zenity."
-		ewarn "Please install gnome-extra/zenity for full support."
-		ewarn ""
-	fi
-
-	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-launcher/steam-launcher-1.0.0.35.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.35.ebuild
deleted file mode 100644
index ccb84eb..0000000
--- a/games-util/steam-launcher/steam-launcher-1.0.0.35.ebuild
+++ /dev/null
@@ -1,117 +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="-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
-			>=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/
-
-src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; then
-		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 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."
-
-	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."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild
index 3fa95d9..783de06 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild
@@ -89,7 +89,7 @@ src_install() {
 	for s in * ; do
 		doicon -s ${s} ${s}/steam.png
 	done
-	
+
 	# tgz archive contains no separate pixmap, see #38
 	insinto /usr/share/pixmaps/
 	newins 48/steam.png steam_tray_mono.png
@@ -103,6 +103,11 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 
+	ewarn "This ebuild only installs the launcher. To start the client"
+	ewarn "and play games, you'll need further libraries that you can"
+	ewarn "pull in using the steam-meta ebuild."
+	ewarn ""
+
 	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."