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

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

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: $