12 files changed, 36 insertions, 36 deletions
diff --git a/games-util/steam-installer/Manifest b/games-util/steam-base/Manifest
index 380036c..380036c 100644
--- a/games-util/steam-installer/Manifest
+++ b/games-util/steam-base/Manifest
diff --git a/games-util/steam-installer/files/usr_bin_steam.patch b/games-util/steam-base/files/usr_bin_steam.patch
index 84ad30c..84ad30c 100644
--- a/games-util/steam-installer/files/usr_bin_steam.patch
+++ b/games-util/steam-base/files/usr_bin_steam.patch
diff --git a/games-util/steam-installer/metadata.xml b/games-util/steam-base/metadata.xml
index 48c77f6..40fb94f 100644
--- a/games-util/steam-installer/metadata.xml
+++ b/games-util/steam-base/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Mario Kicherer</name>
 	</maintainer>
 	<longdescription>
-		This ebuild installs the Steam installer not the client
-		itself.
+		This ebuild installs common files for the Steam environment,
+		like bootstrap archive and icons, but not the client itself.
 	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
diff --git a/games-util/steam-base/steam-base-1.0.0.17.ebuild b/games-util/steam-base/steam-base-1.0.0.17.ebuild
new file mode 120000
index 0000000..8618b9a
--- /dev/null
+++ b/games-util/steam-base/steam-base-1.0.0.17.ebuild
@@ -0,0 +1 @@
+steam-base-9999.ebuild
+\ No newline at end of file
diff --git a/games-util/steam-installer/steam-installer-9999.ebuild b/games-util/steam-base/steam-base-9999.ebuild
index 35cd4a0..d1c7bb6 100644
--- a/games-util/steam-installer/steam-installer-9999.ebuild
+++ b/games-util/steam-base/steam-base-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=5
 
 inherit eutils unpacker
 
-DESCRIPTION="Installer for Valve's native Steam client"
+DESCRIPTION="Supplementary files for Valve's Steam client for Linux"
 HOMEPAGE="https://steampowered.com"
 
 if [[ "${PV}" == "9999" ]] ; then
@@ -55,9 +55,11 @@ src_prepare() {
 	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"
+	if [[ "${PV}" != "9999" ]] ; then
+		# disable ubuntu-specific package installation and use $TERM instead
+		# of "xterm"
+		epatch "${FILESDIR}/usr_bin_steam.patch"
+	fi
 }
 
 src_install() {
@@ -79,17 +81,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Execute /usr/bin/steam to install the actual client into"
-	einfo "your home folder."
-	einfo ""
-	einfo "After installing the client, /usr/bin/steam is also used to start"
-	einfo "the client. After unmerging the installer, you can start the client"
-	einfo "by executing ~/Steam/steam.sh"
-	einfo ""
-	einfo "To pull in the dependencies for the steam client and games,"
-	einfo "emerge: game-utils/steam-meta"
-
-	ewarn "This ebuild _only_ provides the steam installer. The steam client"
-	ewarn "and the games are _not_ controlled by portage. Updates are handled"
-	ewarn "by the client itself."
+	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-client-meta/steam-client-meta-9999.ebuild b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
index 870660c..01e650d 100644
--- a/games-util/steam-client-meta/steam-client-meta-9999.ebuild
+++ b/games-util/steam-client-meta/steam-client-meta-9999.ebuild
@@ -82,19 +82,19 @@ RDEPEND="
 			)"
 
 pkg_postinst() {
-	einfo "This is only a meta package that pulls in the required"
-	einfo "dependencies for the steam client."
+	elog "This is only a meta package that pulls in the required"
+	elog "dependencies for the steam client."
 
 	if use windows-games; then
-		einfo ""
-		einfo "To start games automatically with wine, follow"
-		einfo "https://wiki.archlinux.org/index.php/Wine#Using_Wine_as_an_interpreter_for_Win16.2FWin32_binaries"
+		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
-		einfo ""
-		einfo "In order to use flash, link the 32bit libflashplayer.so to"
-		einfo "/usr/lib/browser-plugins/"
+		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"
diff --git a/games-util/steam-games-meta/metadata.xml b/games-util/steam-games-meta/metadata.xml
index bc6989a..42d52fa 100644
--- a/games-util/steam-games-meta/metadata.xml
+++ b/games-util/steam-games-meta/metadata.xml
@@ -18,6 +18,7 @@
 			Dependencies for "The Book of Unwritten Tales: The Critter
 			Chronicles"
 		</flag>
+		<flag name='steamgames_tf2'>Team Fortress 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 82372da..a214907 100644
--- a/games-util/steam-games-meta/steam-games-meta-9999.ebuild
+++ b/games-util/steam-games-meta/steam-games-meta-9999.ebuild
@@ -14,11 +14,11 @@ LICENSE="metapackage"
 
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="s3tc testdeps video_cards_intel"
+IUSE="s3tc testdeps video_cards_intel video_cards_fglrx"
 
 # add USE_EXPAND="${USE_EXPAND} STEAMGAMES" to your make.conf for proper
 # display of steamgames use flags
-IUSE_STEAMGAMES="unwritten_tales"
+IUSE_STEAMGAMES="unwritten_tales tf2"
 
 for sgame in ${IUSE_STEAMGAMES}; do
 	IUSE="${IUSE} steamgames_${sgame}"
@@ -28,13 +28,20 @@ RDEPEND="
 		s3tc? ( 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
 			)
 		steamgames_unwritten_tales? ( media-libs/jasper )
+		steamgames_tf2? (
+				video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.8 )
+			)
 		"
 
 pkg_postinst() {
diff --git a/games-util/steam-installer/steam-installer-1.0.0.17.ebuild b/games-util/steam-installer/steam-installer-1.0.0.17.ebuild
deleted file mode 120000
index b7a0fbd..0000000
--- a/games-util/steam-installer/steam-installer-1.0.0.17.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-steam-installer-9999.ebuild
-\ No newline at end of file
diff --git a/games-util/steam-meta/metadata.xml b/games-util/steam-meta/metadata.xml
index 43081b2..a6ed537 100644
--- a/games-util/steam-meta/metadata.xml
+++ b/games-util/steam-meta/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
 	</upstream>
-	<use>
-		<flag name='installer'>Pull in the steam-installer</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-util/steam-meta/steam-meta-9999.ebuild b/games-util/steam-meta/steam-meta-9999.ebuild
index 471ca5d..d5b987b 100644
--- a/games-util/steam-meta/steam-meta-9999.ebuild
+++ b/games-util/steam-meta/steam-meta-9999.ebuild
@@ -14,11 +14,10 @@ LICENSE="metapackage"
 
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+installer"
+IUSE=""
 
 RDEPEND="
+		games-util/steam-base
 		games-util/steam-client-meta
 		games-util/steam-games-meta
-
-		installer? ( games-util/steam-installer )
 		"
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
index 4397d86..082a837 100644
--- a/profiles/updates/4Q-2012
+++ b/profiles/updates/4Q-2012
@@ -1 +1,2 @@
 move dev-games/tiled-qt dev-games/tiled
+move games-util/steam-installer games-util/steam-base