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

["Mario Kicherer" <dev@kicherer.org>]

commit:     5bb03085e26036ce31a6b998f8d3b1d52d653f82
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Tue Dec  4 08:39:52 2012 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Tue Dec  4 08:39:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5bb03085

[games-util/steam-*] new deps and default TERM patch from cynede

---
 .../steam-client-meta-9999.ebuild                  |   25 ++++++++++++++-----
 .../files/use-default-terminal.patch               |   20 ++++++++++++++++
 .../steam-installer/steam-installer-9999.ebuild    |    1 +
 games-util/steam-meta/metadata.xml                 |    7 +++++
 games-util/steam-meta/steam-meta-9999.ebuild       |   10 ++++++-
 5 files changed, 54 insertions(+), 9 deletions(-)

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 1b63200..c7974c6 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -14,22 +14,33 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="video_cards_intel windows-games flash"
 
 RDEPEND="
-		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
 		virtual/opengl
 
+		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
+
 		windows-games? ( app-emulation/wine )
 
 		amd64? (
-			>=app-emulation/emul-linux-x86-baselibs-20121028
-			>=app-emulation/emul-linux-x86-gtklibs-20121028
-			>=app-emulation/emul-linux-x86-opengl-20121028
-			>=app-emulation/emul-linux-x86-sdl-20121028
-			>=app-emulation/emul-linux-x86-soundlibs-20121028
-			>=app-emulation/emul-linux-x86-xlibs-20121028
 			>=sys-devel/gcc-4.6.0[multilib]
 			>=sys-libs/glibc-2.15[multilib]
 
 			flash? ( www-plugins/adobe-flash[32bit] )
+			video_cards_intel? (
+				>=app-emulation/emul-linux-x86-baselibs-20121202
+				>=app-emulation/emul-linux-x86-gtklibs-20121202
+				>=app-emulation/emul-linux-x86-opengl-20121202
+				>=app-emulation/emul-linux-x86-sdl-20121202
+				>=app-emulation/emul-linux-x86-soundlibs-20121202
+				>=app-emulation/emul-linux-x86-xlibs-20121202
+				)
+			!video_cards_intel? (
+				>=app-emulation/emul-linux-x86-baselibs-20121028
+				>=app-emulation/emul-linux-x86-gtklibs-20121028
+				>=app-emulation/emul-linux-x86-opengl-20121028
+				>=app-emulation/emul-linux-x86-sdl-20121028
+				>=app-emulation/emul-linux-x86-soundlibs-20121028
+				>=app-emulation/emul-linux-x86-xlibs-20121028
+				)
 			)
 		x86? (
 			dev-libs/glib:2

diff --git a/games-util/steam-installer/files/use-default-terminal.patch b/games-util/steam-installer/files/use-default-terminal.patch
new file mode 100644
index 0000000..eb22d13
--- /dev/null
+++ b/games-util/steam-installer/files/use-default-terminal.patch
@@ -0,0 +1,20 @@
+123--- usr/bin/steam.orig	2012-12-03 10:24:01.260300027 +0400
++++ usr/bin/steam	2012-12-03 10:24:45.379749695 +0400
+@@ -35,7 +35,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
+ }
+@@ -65,7 +65,7 @@
+ 	fi
+ 
+ 	# Fall back to sudo in a terminal
+-	xterm -e sudo -p "$prompt
++	${TERM} -e sudo -p "$prompt
+ [sudo] password for user: " $*
+ }
+ 

diff --git a/games-util/steam-installer/steam-installer-9999.ebuild b/games-util/steam-installer/steam-installer-9999.ebuild
index 9809c13..dc250cc 100644
--- a/games-util/steam-installer/steam-installer-9999.ebuild
+++ b/games-util/steam-installer/steam-installer-9999.ebuild
@@ -43,6 +43,7 @@ src_prepare() {
 	sed -r -i "s/^(Actions=.*)/\1;/" usr/share/applications/steam.desktop
 
 	epatch "${FILESDIR}/remove-ubuntu-specifics.patch"
+	epatch "${FILESDIR}/use-default-terminal.patch"
 }
 
 src_install() {

diff --git a/games-util/steam-meta/metadata.xml b/games-util/steam-meta/metadata.xml
index a6ed537..4fe7a71 100644
--- a/games-util/steam-meta/metadata.xml
+++ b/games-util/steam-meta/metadata.xml
@@ -12,4 +12,11 @@
 	<upstream>
 		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
 	</upstream>
+	<use>
+		<flag name='installer'>Pull in the steam-installer</flag>
+		<flag name='testdeps'>
+			Pull in dependencies that are not yet confirmed as strictly
+			required.
+		</flag>
+	</use>
 </pkgmetadata>

diff --git a/games-util/steam-meta/steam-meta-9999.ebuild b/games-util/steam-meta/steam-meta-9999.ebuild
index aa08135..3d8dadc 100644
--- a/games-util/steam-meta/steam-meta-9999.ebuild
+++ b/games-util/steam-meta/steam-meta-9999.ebuild
@@ -11,11 +11,17 @@ LICENSE="metapackage"
 
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+IUSE="+installer testdeps"
 
 RDEPEND="
-		games-util/steam-installer
 		games-util/steam-client-meta
+
+		installer? ( games-util/steam-installer )
+		testdeps? (
+			media-libs/libtxc_dxtn
+			sys-apps/pciutils
+			media-libs/jasper
+			)
 		"
 
 pkg_postinst() {