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

commit:     20269233de3b11e9342770f05cbd53892778bf28
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Thu Jan 10 21:57:42 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Thu Jan 10 21:57:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=20269233

[games-util/steam*] -games-meta arch dependent deps; ebuild improvements for -base; header update

---
 games-util/steam-base/steam-base-1.0.0.19.ebuild   |    1 +
 games-util/steam-base/steam-base-1.0.0.20.ebuild   |   92 +-------------------
 games-util/steam-base/steam-base-9999.ebuild       |   27 +++---
 .../steam-client-meta-9999.ebuild                  |    2 +-
 .../steam-games-meta/steam-games-meta-9999.ebuild  |   52 ++++++++----
 games-util/steam-meta/steam-meta-9999.ebuild       |    2 +-
 6 files changed, 53 insertions(+), 123 deletions(-)

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
new file mode 120000
index 0000000..8618b9a
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.19.ebuild
@@ -0,0 +1 @@
+steam-base-9999.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.20.ebuild
deleted file mode 100644
index cb02dc5..0000000
--- a/games-util/steam-base/steam-base-1.0.0.20.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 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-1.0.0.20.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.20.ebuild b/games-util/steam-base/steam-base-1.0.0.20.ebuild
new file mode 120000
index 0000000..8618b9a
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.20.ebuild
@@ -0,0 +1 @@
+steam-base-9999.ebuild
\ No newline at end of file

diff --git a/games-util/steam-base/steam-base-9999.ebuild b/games-util/steam-base/steam-base-9999.ebuild
index b726581..7755ffe 100644
--- a/games-util/steam-base/steam-base-9999.ebuild
+++ b/games-util/steam-base/steam-base-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -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
+inherit eutils unpacker gnome2-utils fdo-mime
 
 DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
 HOMEPAGE="https://steampowered.com"
@@ -51,16 +51,8 @@ src_unpack() {
 }
 
 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
+	# remove carriage return
+	sed -i "s/\r//g" usr/share/applications/steam.desktop
 }
 
 src_install() {
@@ -72,8 +64,7 @@ src_install() {
 	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
+	domenu usr/share/applications/steam.desktop
 
 	insinto /usr/share/icons/
 	doins -r usr/share/icons/
@@ -82,6 +73,9 @@ src_install() {
 }
 
 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."
@@ -89,3 +83,8 @@ pkg_postinst() {
 	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
+}
\ No newline at end of file

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 01e650d..3df9eb5 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

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 bbb8543..8049291 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,20 +25,28 @@ for sgame in ${IUSE_STEAMGAMES}; do
 done
 
 RDEPEND="
-		s3tc? ( media-libs/libtxc_dxtn )
+		s3tc? (
+			amd64? ( media-libs/libtxc_dxtn[multilib] )
+			x86? ( media-libs/libtxc_dxtn )
+			)
 		testdeps? (
-			dev-games/ogre
 			dev-lang/mono
-			media-libs/freealut
-			media-libs/sdl-image
-			media-libs/sdl-mixer
-			media-libs/sdl-ttf
-			media-libs/tiff
-			net-misc/curl
-			sys-apps/pciutils
-			x11-misc/xclip
+			x86? (
+				dev-games/ogre
+				media-libs/freealut
+				media-libs/sdl-image
+				media-libs/sdl-mixer
+				media-libs/sdl-ttf
+				media-libs/tiff
+				net-dns/libidn
+				net-misc/curl
+				sys-apps/pciutils
+				x11-misc/xclip
+				)
+			)
+		steamgames_unwritten_tales? (
+			x86? ( media-libs/jasper )
 			)
-		steamgames_unwritten_tales? ( media-libs/jasper )
 		steamgames_tf2? (
 				video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.8 )
 			)
@@ -50,8 +58,20 @@ REQUIRED_USE="
 		"
 
 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 "Development website: https://github.com/anyc/steam-overlay"
+	if use x86; then
+		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."
+	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"
+	fi
+	elog "Ebuild development website: https://github.com/anyc/steam-overlay"
 }

diff --git a/games-util/steam-meta/steam-meta-9999.ebuild b/games-util/steam-meta/steam-meta-9999.ebuild
index d5b987b..9641762 100644
--- a/games-util/steam-meta/steam-meta-9999.ebuild
+++ b/games-util/steam-meta/steam-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 


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

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-meta/, games-util/steam-games-meta/, ...
@ 2013-03-09 20:33 Mario Kicherer
  0 siblings, 0 replies; 5+ messages in thread
From: Mario Kicherer @ 2013-03-09 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     219a7eeb797eb40869394b9cfa47e4f69a17cce1
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Sat Mar  9 20:32:35 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Sat Mar  9 20:32:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=219a7eeb

[games-util/steam*] renamed steam-base to steam-launcher; new launcher-1.0.0.35

---
 games-util/steam-base/steam-base-1.0.0.33.ebuild   |  110 --------------------
 .../steam-client-meta-9999.ebuild                  |    2 +
 games-util/steam-games-meta/metadata.xml           |    2 +
 .../steam-games-meta/steam-games-meta-9999.ebuild  |    8 ++-
 .../{steam-base => steam-launcher}/metadata.xml    |    0
 .../steam-launcher-1.0.0.35.ebuild}                |    0
 games-util/steam-meta/steam-meta-9999.ebuild       |    2 +-
 profiles/updates/1Q-2013                           |    1 +
 8 files changed, 13 insertions(+), 112 deletions(-)

diff --git a/games-util/steam-base/steam-base-1.0.0.33.ebuild b/games-util/steam-base/steam-base-1.0.0.33.ebuild
deleted file mode 100644
index 4dbd20d..0000000
--- a/games-util/steam-base/steam-base-1.0.0.33.ebuild
+++ /dev/null
@@ -1,110 +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-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/
-
-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-client-meta/steam-client-meta-9999.ebuild b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
index 248efb8..bb72ce1 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 		amd64? (
 			>=sys-devel/gcc-4.6.0[multilib]
 			>=sys-libs/glibc-2.15[multilib]
+			media-libs/libsdl:2[abi_x86_32]
 
 			flash? ( www-plugins/adobe-flash[32bit] )
 			video_cards_intel? (
@@ -57,6 +58,7 @@ RDEPEND="
 			media-libs/libogg
 			media-libs/libpng:1.2
 			media-libs/libsdl
+			media-libs/libsdl:2
 			media-libs/libtheora
 			media-libs/libvorbis
 			media-libs/openal

diff --git a/games-util/steam-games-meta/metadata.xml b/games-util/steam-games-meta/metadata.xml
index 6c5c429..474b6a5 100644
--- a/games-util/steam-games-meta/metadata.xml
+++ b/games-util/steam-games-meta/metadata.xml
@@ -20,6 +20,8 @@
 			Chronicles"
 		</flag>
 		<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='testdeps'>
 			Pull in dependencies that are not yet confirmed as strictly
 			required.

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 cddff1d..d512e8b 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="dwarfs unwritten_tales tf2"
+IUSE_STEAMGAMES="dwarfs unwritten_tales tf2 trine2 journey_down"
 
 for sgame in ${IUSE_STEAMGAMES}; do
 	IUSE="${IUSE} steamgames_${sgame}"
@@ -67,6 +67,12 @@ RDEPEND="
 		steamgames_tf2? (
 				video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.8 )
 			)
+		steamgames_journey_down? (
+				x86? ( media-libs/openal )
+			)
+		steamgames_trine2? (
+				x11-apps/xwininfo
+			)
 		"
 REQUIRED_USE="
 		steamgames_tf2? (

diff --git a/games-util/steam-base/metadata.xml b/games-util/steam-launcher/metadata.xml
similarity index 100%
rename from games-util/steam-base/metadata.xml
rename to games-util/steam-launcher/metadata.xml

diff --git a/games-util/steam-base/steam-base-1.0.0.34.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.35.ebuild
similarity index 100%
rename from games-util/steam-base/steam-base-1.0.0.34.ebuild
rename to games-util/steam-launcher/steam-launcher-1.0.0.35.ebuild

diff --git a/games-util/steam-meta/steam-meta-9999.ebuild b/games-util/steam-meta/steam-meta-9999.ebuild
index 9641762..9131bee 100644
--- a/games-util/steam-meta/steam-meta-9999.ebuild
+++ b/games-util/steam-meta/steam-meta-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-		games-util/steam-base
+		games-util/steam-launcher
 		games-util/steam-client-meta
 		games-util/steam-games-meta
 		"

diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
new file mode 100644
index 0000000..f24610a
--- /dev/null
+++ b/profiles/updates/1Q-2013
@@ -0,0 +1 @@
+move games-util/steam-base games-util/steam-launcher


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

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-meta/, games-util/steam-games-meta/, ...
@ 2013-03-12 19:53 Mario Kicherer
  0 siblings, 0 replies; 5+ messages in thread
From: Mario Kicherer @ 2013-03-12 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     7169538074258d59d2388c7b86ebd2a0ff8318ab
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Tue Mar 12 19:52:22 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Tue Mar 12 19:52:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=71695380

[games-util/steam*] deps update; moved to versioned meta ebuilds

---
 ...ebuild => steam-client-meta-0-r20130312.ebuild} |    6 +-
 games-util/steam-games-meta/metadata.xml           |    1 +
 ....ebuild => steam-games-meta-0-r20130312.ebuild} |   11 ++-
 .../steam-launcher-1.0.0.35-r1.ebuild              |  123 ++++++++++++++++++++
 ...a-9999.ebuild => steam-meta-0-r20130312.ebuild} |    0
 5 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/games-util/steam-client-meta/steam-client-meta-9999.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130312.ebuild
similarity index 94%
rename from games-util/steam-client-meta/steam-client-meta-9999.ebuild
rename to games-util/steam-client-meta/steam-client-meta-0-r20130312.ebuild
index bb72ce1..2d7a2c8 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-0-r20130312.ebuild
@@ -20,13 +20,14 @@ RDEPEND="
 		virtual/opengl
 
 		media-fonts/font-mutt-misc
+		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
 
 		windows-games? ( app-emulation/wine )
 
 		amd64? (
 			>=sys-devel/gcc-4.6.0[multilib]
 			>=sys-libs/glibc-2.15[multilib]
-			media-libs/libsdl:2[abi_x86_32]
+			>=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32]
 
 			flash? ( www-plugins/adobe-flash[32bit] )
 			video_cards_intel? (
@@ -57,8 +58,7 @@ RDEPEND="
 			media-libs/libjpeg-turbo
 			media-libs/libogg
 			media-libs/libpng:1.2
-			media-libs/libsdl
-			media-libs/libsdl:2
+			>=media-libs/libsdl-2.0.0_pre6964
 			media-libs/libtheora
 			media-libs/libvorbis
 			media-libs/openal

diff --git a/games-util/steam-games-meta/metadata.xml b/games-util/steam-games-meta/metadata.xml
index 474b6a5..428c203 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_defenders_quest'>Defender's Quest: Valley of the Forgotten</flag>
 		<flag name='testdeps'>
 			Pull in dependencies that are not yet confirmed as strictly
 			required.

diff --git a/games-util/steam-games-meta/steam-games-meta-9999.ebuild b/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
similarity index 88%
rename from games-util/steam-games-meta/steam-games-meta-9999.ebuild
rename to games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
index d512e8b..bf0ce6a 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-0-r20130312.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="dwarfs unwritten_tales tf2 trine2 journey_down"
+IUSE_STEAMGAMES="dwarfs unwritten_tales tf2 trine2 journey_down defenders_quest"
 
 for sgame in ${IUSE_STEAMGAMES}; do
 	IUSE="${IUSE} steamgames_${sgame}"
@@ -27,7 +27,10 @@ done
 
 RDEPEND="
 		s3tc? (
-			amd64? ( media-libs/libtxc_dxtn[multilib] )
+			amd64? ( || (
+				>=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32]
+				<media-libs/libtxc_dxtn-1.0.1-r1[multilib]
+				) )
 			x86? ( media-libs/libtxc_dxtn )
 			)
 		testdeps? (
@@ -73,6 +76,9 @@ RDEPEND="
 		steamgames_trine2? (
 				x11-apps/xwininfo
 			)
+		steamgames_defenders_quest? (
+				dev-util/adobe-air-runtime
+			)
 		"
 REQUIRED_USE="
 		steamgames_tf2? (
@@ -99,4 +105,5 @@ pkg_postinst() {
 		elog "https://bugs.gentoo.org/show_bug.cgi?id=446682"
 	fi
 	elog "Ebuild development website: https://github.com/anyc/steam-overlay"
+	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
new file mode 100644
index 0000000..63fbd12
--- /dev/null
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.35-r1.ebuild
@@ -0,0 +1,123 @@
+# 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
+			>=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-meta/steam-meta-9999.ebuild b/games-util/steam-meta/steam-meta-0-r20130312.ebuild
similarity index 100%
rename from games-util/steam-meta/steam-meta-9999.ebuild
rename to games-util/steam-meta/steam-meta-0-r20130312.ebuild


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

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-meta/, games-util/steam-games-meta/, ...
@ 2013-05-29 18:27 Mario Kicherer
  0 siblings, 0 replies; 5+ messages in thread
From: Mario Kicherer @ 2013-05-29 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b05b2bbf69a653960faf8cbf820e02583af87fa5
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Wed May 29 18:23:17 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Wed May 29 18:27:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b05b2bbf

[games-util/steam-*] new launcher version 39, sync with steam-overlay

---
 .../steam-client-meta-0-r20130514.ebuild           | 118 +++++++++++++++++
 .../steam-games-meta-0-r20130312.ebuild            |   2 +-
 .../steam-launcher/steam-launcher-1.0.0.38.ebuild  | 143 ---------------------
 ...36.ebuild => steam-launcher-1.0.0.39-r2.ebuild} |  33 ++---
 .../steam-meta/steam-meta-0-r20130514.ebuild       |  25 ++++
 5 files changed, 158 insertions(+), 163 deletions(-)

diff --git a/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild
new file mode 100644
index 0000000..5e32200
--- /dev/null
+++ b/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit pax-utils
+
+# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
+# or come to #gentoo-gamerlay in freenode IRC
+
+DESCRIPTION="Meta package for Valve's native Steam client"
+HOMEPAGE="http://steampowered.com"
+SRC_URI=""
+LICENSE="metapackage"
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="flash trayicon video_cards_intel"
+
+RDEPEND="
+		virtual/opengl
+
+		media-fonts/font-mutt-misc
+		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
+
+		amd64? (
+			>=sys-devel/gcc-4.6.0[multilib]
+			>=sys-libs/glibc-2.15[multilib]
+			>=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32]
+			app-emulation/steam-runtime-bin
+
+			>=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
+				(
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXcomposite[abi_x86_32]
+					x11-libs/libXcursor[abi_x86_32]
+					x11-libs/libXdamage[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+					x11-libs/libXfixes[abi_x86_32]
+					media-libs/fontconfig[abi_x86_32]
+					media-libs/freetype[abi_x86_32]
+					x11-libs/libXi[abi_x86_32]
+					x11-libs/libXinerama[abi_x86_32]
+					x11-libs/libXrandr[abi_x86_32]
+					x11-libs/libXrender[abi_x86_32]
+				)
+			)
+
+			trayicon? ( >=dev-libs/libappindicator-12.10.0-r1[-gtk3,abi_x86_32] )
+
+			flash? ( www-plugins/adobe-flash[32bit] )
+			)
+		x86? (
+			dev-libs/glib:2
+			dev-libs/libgcrypt
+			dev-libs/nspr
+			dev-libs/nss
+			media-libs/alsa-lib
+			media-libs/fontconfig
+			media-libs/freetype:2
+			media-libs/libjpeg-turbo
+			media-libs/libogg
+			media-libs/libpng:1.2
+			>=media-libs/libsdl-2.0.0_pre6964
+			media-libs/libtheora
+			media-libs/libvorbis
+			media-libs/openal
+			media-sound/pulseaudio
+			net-misc/curl
+			net-print/cups
+			sys-apps/dbus
+			>=sys-devel/gcc-4.6.0
+			>=sys-libs/glibc-2.15
+			>=sys-libs/zlib-1.2.4
+			x11-libs/cairo
+			x11-libs/gdk-pixbuf
+			x11-libs/gtk+:2
+			>=x11-libs/libX11-1.5
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXi
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/pango
+			>=x11-libs/pixman-0.24.4
+
+			trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3] )
+			flash? ( www-plugins/adobe-flash )
+			video_cards_intel? ( >=media-libs/mesa-9 )
+			)"
+
+pkg_postinst() {
+	elog "This is only a meta package that pulls in the required"
+	elog "dependencies for the steam client."
+	elog ""
+
+	if use flash; then
+		elog "In order to use flash, link the 32bit libflashplayer.so to"
+		elog "\${STEAM_FOLDER}/ubuntu12_32/plugins/"
+		elog ""
+	fi
+
+	if host-is-pax; then
+		elog "If you're using PAX, please see:"
+		elog "http://wiki.gentoo.org/wiki/Steam#Hardened_Gentoo"
+		elog ""
+	fi
+	
+	ewarn "The steam client and the games are not controlled by"
+	ewarn "portage. Updates are handled by the client itself."
+}

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 46156e6..c837e71 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
@@ -107,7 +107,7 @@ pkg_postinst() {
 		elog "accordingly."
 		elog ""
 	fi
-	elog "Ebuild development website: https://github.com/anyc/steam-overlay"
+	elog "Ebuild development website: http://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.38.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.38.ebuild
deleted file mode 100644
index 35a64cb..0000000
--- a/games-util/steam-launcher/steam-launcher-1.0.0.38.ebuild
+++ /dev/null
@@ -1,143 +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
-
-	# tgz archive contains no separate pixmap, see #38
-	insinto /usr/share/pixmaps/
-	newins 48/steam.png steam_tray_mono.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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."
-	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 ""
-		ewarn "Due to new dependencies, the steam beta client currently only works"
-		ewarn "with steam runtime enabled."
-		ewarn ""
-	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.36.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
similarity index 74%
rename from games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild
rename to games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
index 783de06..ff579d4 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.36.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
@@ -24,7 +24,7 @@ LICENSE="ValveSteamLicense"
 
 RESTRICT="bindist mirror"
 SLOT="0"
-IUSE="-steamruntime"
+IUSE="steamruntime"
 
 RDEPEND="
 		app-arch/xz-utils
@@ -42,8 +42,8 @@ RDEPEND="
 				(
 					x11-libs/libX11[abi_x86_32]
 					x11-libs/libXau[abi_x86_32]
-		                        x11-libs/libxcb[abi_x86_32]
-		                        x11-libs/libXdmcp[abi_x86_32]
+					x11-libs/libxcb[abi_x86_32]
+					x11-libs/libXdmcp[abi_x86_32]
 				)
 			)
 			>=sys-devel/gcc-4.6.0[multilib]
@@ -64,9 +64,7 @@ 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
+			sed -i -r "s/(export TEXTDOMAIN=steam)/\1\nif \[ -z \"\$STEAM_RUNTIME\" \]; then export STEAM_RUNTIME=0; fi/" steam || die
 		fi
 
 		# we use our ebuild functions to install the files
@@ -103,25 +101,22 @@ 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."
 	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."
+ 	if use steamruntime; then
+ 		ewarn "You enabled the steam runtime environment. Steam will use bundled"
+ 		ewarn "libraries instead of Gentoo's system libraries."
+ 		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"
+		ewarn ""
+ 		ewarn "Notice: Valve only supports Steam with the runtime enabled!"
 		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

diff --git a/games-util/steam-meta/steam-meta-0-r20130514.ebuild b/games-util/steam-meta/steam-meta-0-r20130514.ebuild
new file mode 100644
index 0000000..16fd220
--- /dev/null
+++ b/games-util/steam-meta/steam-meta-0-r20130514.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="Meta package for Valve's Steam environment"
+HOMEPAGE="https://steampowered.com"
+SRC_URI=""
+LICENSE="metapackage"
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="steamruntime"
+
+RDEPEND="
+		games-util/steam-launcher
+		!steamruntime? (
+			games-util/steam-client-meta
+			games-util/steam-games-meta
+		)
+		"


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

* [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-meta/, games-util/steam-games-meta/, ...
@ 2013-06-02 10:00 Mario Kicherer
  0 siblings, 0 replies; 5+ messages in thread
From: Mario Kicherer @ 2013-06-02 10:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ee0e66182d5062eceec9e4e4854ff03cd3a1b4e7
Author:     Mario Kicherer <dev <AT> kicherer <DOT> org>
AuthorDate: Sun Jun  2 10:00:22 2013 +0000
Commit:     Mario Kicherer <dev <AT> kicherer <DOT> org>
CommitDate: Sun Jun  2 10:00:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ee0e6618

[games-util/steam-*] removed ebuilds that are not required with the steam runtime - valve only supports installations with runtime enabled. see steam-overlay for non-runtime ebuilds

---
 games-util/steam-client-meta/metadata.xml          |  19 ----
 .../steam-client-meta-0-r20130314.ebuild           | 117 --------------------
 .../steam-client-meta-0-r20130316.ebuild           | 108 -------------------
 .../steam-client-meta-0-r20130514.ebuild           | 118 ---------------------
 games-util/steam-games-meta/metadata.xml           |  32 ------
 .../steam-games-meta-0-r20130312.ebuild            | 113 --------------------
 .../steam-launcher-1.0.0.39-r2.ebuild              |  37 +------
 games-util/steam-meta/metadata.xml                 |  15 ---
 .../steam-meta/steam-meta-0-r20130312.ebuild       |  23 ----
 .../steam-meta/steam-meta-0-r20130514.ebuild       |  25 -----
 10 files changed, 5 insertions(+), 602 deletions(-)

diff --git a/games-util/steam-client-meta/metadata.xml b/games-util/steam-client-meta/metadata.xml
deleted file mode 100644
index ef55a25..0000000
--- a/games-util/steam-client-meta/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This is a meta package that pulls in dependencies
-		for the steam client.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</upstream>
-	<use>
-		<flag name='flash'>Pull in www-plugins/adobe-flash for the internal browser</flag>
-		<flag name='trayicon'>Enable system tray icon with libappindicator</flag>
-	</use>
-</pkgmetadata>

diff --git a/games-util/steam-client-meta/steam-client-meta-0-r20130314.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130314.ebuild
deleted file mode 100644
index be0af4a..0000000
--- a/games-util/steam-client-meta/steam-client-meta-0-r20130314.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
-
-DESCRIPTION="Meta package for Valve's native Steam client"
-HOMEPAGE="http://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="flash trayicon video_cards_intel windows-games"
-
-RDEPEND="
-		virtual/opengl
-
-		media-fonts/font-mutt-misc
-		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
-
-
-		windows-games? ( app-emulation/wine )
-
-		amd64? (
-			>=sys-devel/gcc-4.6.0[multilib]
-			>=sys-libs/glibc-2.15[multilib]
-			>=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32]
-
-			>=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
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXcomposite[abi_x86_32]
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXdamage[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXfixes[abi_x86_32]
-					media-libs/fontconfig[abi_x86_32]
-					media-libs/freetype[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-			)
-
-			trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3,abi_x86_32] )
-
-			flash? ( www-plugins/adobe-flash[32bit] )
-			)
-		x86? (
-			dev-libs/glib:2
-			dev-libs/libgcrypt
-			dev-libs/nspr
-			dev-libs/nss
-			media-libs/alsa-lib
-			media-libs/fontconfig
-			media-libs/freetype:2
-			media-libs/libjpeg-turbo
-			media-libs/libogg
-			media-libs/libpng:1.2
-			>=media-libs/libsdl-2.0.0_pre6964
-			media-libs/libtheora
-			media-libs/libvorbis
-			media-libs/openal
-			media-sound/pulseaudio
-			net-misc/curl
-			net-print/cups
-			sys-apps/dbus
-			>=sys-devel/gcc-4.6.0
-			>=sys-libs/glibc-2.15
-			>=sys-libs/zlib-1.2.4
-			x11-libs/cairo
-			x11-libs/gdk-pixbuf
-			x11-libs/gtk+:2
-			>=x11-libs/libX11-1.5
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/pango
-			>=x11-libs/pixman-0.24.4
-
-			trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3] )
-			flash? ( www-plugins/adobe-flash )
-			video_cards_intel? ( >=media-libs/mesa-9 )
-			)"
-
-pkg_postinst() {
-	elog "This is only a meta package that pulls in the required"
-	elog "dependencies for the steam client."
-
-	if use windows-games; then
-		elog ""
-		elog "To start games automatically with wine, follow"
-		elog "https://wiki.archlinux.org/index.php/Wine#Using_Wine_as_an_interpreter_for_Win16.2FWin32_binaries"
-	fi
-
-	if use flash; then
-		elog ""
-		elog "In order to use flash, link the 32bit libflashplayer.so to"
-		elog "\${STEAM_FOLDER}/ubuntu12_32/plugins/"
-	fi
-
-	ewarn "The steam client and the games are not controlled by"
-	ewarn "portage. Updates are handled by the client itself."
-}

diff --git a/games-util/steam-client-meta/steam-client-meta-0-r20130316.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130316.ebuild
deleted file mode 100644
index 8312bae..0000000
--- a/games-util/steam-client-meta/steam-client-meta-0-r20130316.ebuild
+++ /dev/null
@@ -1,108 +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
-
-DESCRIPTION="Meta package for Valve's native Steam client"
-HOMEPAGE="http://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="flash trayicon video_cards_intel"
-
-RDEPEND="
-		virtual/opengl
-
-		media-fonts/font-mutt-misc
-		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
-
-		amd64? (
-			>=sys-devel/gcc-4.6.0[multilib]
-			>=sys-libs/glibc-2.15[multilib]
-			>=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32]
-
-			>=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
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXcomposite[abi_x86_32]
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXdamage[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXfixes[abi_x86_32]
-					media-libs/fontconfig[abi_x86_32]
-					media-libs/freetype[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-			)
-
-			trayicon? ( >=dev-libs/libappindicator-12.10.0-r1[-gtk3,abi_x86_32] )
-
-			flash? ( www-plugins/adobe-flash[32bit] )
-			)
-		x86? (
-			dev-libs/glib:2
-			dev-libs/libgcrypt
-			dev-libs/nspr
-			dev-libs/nss
-			media-libs/alsa-lib
-			media-libs/fontconfig
-			media-libs/freetype:2
-			media-libs/libjpeg-turbo
-			media-libs/libogg
-			media-libs/libpng:1.2
-			>=media-libs/libsdl-2.0.0_pre6964
-			media-libs/libtheora
-			media-libs/libvorbis
-			media-libs/openal
-			media-sound/pulseaudio
-			net-misc/curl
-			net-print/cups
-			sys-apps/dbus
-			>=sys-devel/gcc-4.6.0
-			>=sys-libs/glibc-2.15
-			>=sys-libs/zlib-1.2.4
-			x11-libs/cairo
-			x11-libs/gdk-pixbuf
-			x11-libs/gtk+:2
-			>=x11-libs/libX11-1.5
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/pango
-			>=x11-libs/pixman-0.24.4
-
-			trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3] )
-			flash? ( www-plugins/adobe-flash )
-			video_cards_intel? ( >=media-libs/mesa-9 )
-			)"
-
-pkg_postinst() {
-	elog "This is only a meta package that pulls in the required"
-	elog "dependencies for the steam client."
-
-	if use flash; then
-		elog ""
-		elog "In order to use flash, link the 32bit libflashplayer.so to"
-		elog "\${STEAM_FOLDER}/ubuntu12_32/plugins/"
-	fi
-
-	ewarn "The steam client and the games are not controlled by"
-	ewarn "portage. Updates are handled by the client itself."
-}

diff --git a/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild b/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild
deleted file mode 100644
index 5e32200..0000000
--- a/games-util/steam-client-meta/steam-client-meta-0-r20130514.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit pax-utils
-
-# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
-# or come to #gentoo-gamerlay in freenode IRC
-
-DESCRIPTION="Meta package for Valve's native Steam client"
-HOMEPAGE="http://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="flash trayicon video_cards_intel"
-
-RDEPEND="
-		virtual/opengl
-
-		media-fonts/font-mutt-misc
-		|| ( media-fonts/font-bitstream-100dpi media-fonts/font-adobe-100dpi )
-
-		amd64? (
-			>=sys-devel/gcc-4.6.0[multilib]
-			>=sys-libs/glibc-2.15[multilib]
-			>=media-libs/libsdl-2.0.0_pre6964:2[abi_x86_32]
-			app-emulation/steam-runtime-bin
-
-			>=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
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXcomposite[abi_x86_32]
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXdamage[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXfixes[abi_x86_32]
-					media-libs/fontconfig[abi_x86_32]
-					media-libs/freetype[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-			)
-
-			trayicon? ( >=dev-libs/libappindicator-12.10.0-r1[-gtk3,abi_x86_32] )
-
-			flash? ( www-plugins/adobe-flash[32bit] )
-			)
-		x86? (
-			dev-libs/glib:2
-			dev-libs/libgcrypt
-			dev-libs/nspr
-			dev-libs/nss
-			media-libs/alsa-lib
-			media-libs/fontconfig
-			media-libs/freetype:2
-			media-libs/libjpeg-turbo
-			media-libs/libogg
-			media-libs/libpng:1.2
-			>=media-libs/libsdl-2.0.0_pre6964
-			media-libs/libtheora
-			media-libs/libvorbis
-			media-libs/openal
-			media-sound/pulseaudio
-			net-misc/curl
-			net-print/cups
-			sys-apps/dbus
-			>=sys-devel/gcc-4.6.0
-			>=sys-libs/glibc-2.15
-			>=sys-libs/zlib-1.2.4
-			x11-libs/cairo
-			x11-libs/gdk-pixbuf
-			x11-libs/gtk+:2
-			>=x11-libs/libX11-1.5
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/pango
-			>=x11-libs/pixman-0.24.4
-
-			trayicon? ( =dev-libs/libappindicator-12.10.0-r1[-gtk3] )
-			flash? ( www-plugins/adobe-flash )
-			video_cards_intel? ( >=media-libs/mesa-9 )
-			)"
-
-pkg_postinst() {
-	elog "This is only a meta package that pulls in the required"
-	elog "dependencies for the steam client."
-	elog ""
-
-	if use flash; then
-		elog "In order to use flash, link the 32bit libflashplayer.so to"
-		elog "\${STEAM_FOLDER}/ubuntu12_32/plugins/"
-		elog ""
-	fi
-
-	if host-is-pax; then
-		elog "If you're using PAX, please see:"
-		elog "http://wiki.gentoo.org/wiki/Steam#Hardened_Gentoo"
-		elog ""
-	fi
-	
-	ewarn "The steam client and the games are not controlled by"
-	ewarn "portage. 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
deleted file mode 100644
index 7bf198a..0000000
--- a/games-util/steam-games-meta/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This is a meta package that pulls in the known dependencies
-		for different steam games.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</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"
-		</flag>
-		<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
-			required.
-		</flag>
-	</use>
-</pkgmetadata>

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
deleted file mode 100644
index c837e71..0000000
--- a/games-util/steam-games-meta/steam-games-meta-0-r20130312.ebuild
+++ /dev/null
@@ -1,113 +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
-
-DESCRIPTION="Meta package for Steam games"
-HOMEPAGE="http://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-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
-IUSE_STEAMGAMES="dwarfs unwritten_tales tf2 trine2 journey_down defenders_quest
-	shatter"
-
-for sgame in ${IUSE_STEAMGAMES}; do
-	IUSE="${IUSE} steamgames_${sgame}"
-done
-
-RDEPEND="
-		s3tc? (
-			amd64? ( || (
-				>=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32]
-				<media-libs/libtxc_dxtn-1.0.1-r1[multilib]
-				) )
-			x86? ( media-libs/libtxc_dxtn )
-			)
-		testdeps? (
-			dev-lang/mono
-			x86? (
-				dev-db/sqlite
-				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
-				media-libs/tiff
-				net-dns/libidn
-				net-misc/curl
-				sys-apps/pciutils
-				x11-libs/libXaw
-				x11-libs/libXft
-				x11-libs/libXmu
-				x11-libs/libXxf86vm
-				x11-misc/xclip
-				)
-			)
-		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 )
-			)
-		steamgames_journey_down? (
-				x86? ( media-libs/openal )
-			)
-		steamgames_trine2? (
-				x11-apps/xwininfo
-			)
-		steamgames_defenders_quest? (
-				dev-util/adobe-air-sdk-bin
-			)
-		steamgames_shatter? (
-				amd64? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013 )
-				x86? ( media-gfx/nvidia-cg-toolkit )
-			)
-		"
-REQUIRED_USE="
-		steamgames_tf2? (
-				video_cards_intel? ( s3tc )
-				video_cards_radeon? ( s3tc )
-				video_cards_nouveau? ( s3tc )
-			)
-		"
-
-pkg_postinst() {
-	if use x86; then
-		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 "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: http://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.39-r2.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
index ff579d4..5e5487d 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.39-r2.ebuild
@@ -9,22 +9,15 @@ EAPI=5
 
 inherit eutils gnome2-utils fdo-mime
 
-DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
+DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="http://steampowered.com"
+SRC_URI="http://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
 
-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
-
+KEYWORDS="-* ~amd64 ~x86"
 LICENSE="ValveSteamLicense"
 
 RESTRICT="bindist mirror"
 SLOT="0"
-IUSE="steamruntime"
 
 RDEPEND="
 		app-arch/xz-utils
@@ -61,15 +54,8 @@ RDEPEND="
 S=${WORKDIR}/steam/
 
 src_prepare() {
-	if [[ "${PV}" != "9999" ]] ; then
-		if ! use steamruntime; then
-			# use system libraries
-			sed -i -r "s/(export TEXTDOMAIN=steam)/\1\nif \[ -z \"\$STEAM_RUNTIME\" \]; then export STEAM_RUNTIME=0; fi/" steam || die
-		fi
-
-		# we use our ebuild functions to install the files
-		rm Makefile
-	fi
+	# we use our ebuild functions to install the files
+	rm Makefile
 }
 
 src_install() {
@@ -106,19 +92,6 @@ pkg_postinst() {
 	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 Gentoo's system libraries."
- 		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"
-		ewarn ""
- 		ewarn "Notice: Valve only supports Steam with the runtime enabled!"
-		ewarn ""
-	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."

diff --git a/games-util/steam-meta/metadata.xml b/games-util/steam-meta/metadata.xml
deleted file mode 100644
index a6ed537..0000000
--- a/games-util/steam-meta/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This is a meta package that pulls in dependencies
-		for the steam environment.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</upstream>
-</pkgmetadata>

diff --git a/games-util/steam-meta/steam-meta-0-r20130312.ebuild b/games-util/steam-meta/steam-meta-0-r20130312.ebuild
deleted file mode 100644
index 9131bee..0000000
--- a/games-util/steam-meta/steam-meta-0-r20130312.ebuild
+++ /dev/null
@@ -1,23 +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
-
-DESCRIPTION="Meta package for Valve's Steam environment"
-HOMEPAGE="https://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-		games-util/steam-launcher
-		games-util/steam-client-meta
-		games-util/steam-games-meta
-		"

diff --git a/games-util/steam-meta/steam-meta-0-r20130514.ebuild b/games-util/steam-meta/steam-meta-0-r20130514.ebuild
deleted file mode 100644
index 16fd220..0000000
--- a/games-util/steam-meta/steam-meta-0-r20130514.ebuild
+++ /dev/null
@@ -1,25 +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
-
-DESCRIPTION="Meta package for Valve's Steam environment"
-HOMEPAGE="https://steampowered.com"
-SRC_URI=""
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="steamruntime"
-
-RDEPEND="
-		games-util/steam-launcher
-		!steamruntime? (
-			games-util/steam-client-meta
-			games-util/steam-games-meta
-		)
-		"


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

end of thread, other threads:[~2013-06-02 10:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-12 19:53 [gentoo-commits] proj/gamerlay:master commit in: games-util/steam-meta/, games-util/steam-games-meta/, Mario Kicherer
  -- strict thread matches above, loose matches on Subject: below --
2013-06-02 10:00 Mario Kicherer
2013-05-29 18:27 Mario Kicherer
2013-03-09 20:33 Mario Kicherer
2013-01-10 21:58 Mario Kicherer

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