Fix troubles with newer ati drivers thanks to anarchy in bug 158701

(Portage version: 2.1.2_rc4-r4)

3 files changed, 26 insertions, 14 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index f9110b9804e0..bcc77289de44 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/googleearth
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.19 2006/12/27 23:27:50 dragonheart Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.20 2007/01/08 07:50:25 genstef Exp $
+
+  08 Jan 2007; <genstef@gentoo.org> googleearth-4_beta.ebuild:
+  Fix troubles with newer ati drivers thanks to anarchy in bug 158701
 
   27 Dec 2006; Daniel Black <dragonheart@gentoo.org>
   files/digest-googleearth-4_beta, Manifest:
diff --git a/x11-misc/googleearth/files/digest-googleearth-4_beta b/x11-misc/googleearth/files/digest-googleearth-4_beta
index 6618afcac277..1e41d52b83ee 100644
--- a/x11-misc/googleearth/files/digest-googleearth-4_beta
+++ b/x11-misc/googleearth/files/digest-googleearth-4_beta
@@ -1,3 +1,6 @@
 MD5 89fe72195f439448d949fa1bca4bdc8b GoogleEarthLinux.bin 21618415
 RMD160 163c5090689032d61a5a913b51e1a284af8207eb GoogleEarthLinux.bin 21618415
 SHA256 61903c4bbc88482dfb8af2a0ce1d2a70ea44d66638a34b0029440c3748e84c6a GoogleEarthLinux.bin 21618415
+MD5 9e061c7621a4128934cd8fa0cb42c682 libGL.so.1 783320
+RMD160 d002afd0d501cc161dbf8dabd26b254841f6b2f3 libGL.so.1 783320
+SHA256 6d36f11a514e51cb09f3f77c10e4b61c7d96c849ab65cba2c1dbf67c62d8d706 libGL.so.1 783320
diff --git a/x11-misc/googleearth/googleearth-4_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
index 42145a20fbea..1ac302dc1d8a 100644
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-4_beta.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.12 2006/10/05 21:47:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.13 2007/01/08 07:50:25 genstef Exp $
 
 inherit eutils fdo-mime
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="http://earth.google.com/"
-SRC_URI="http://dl.google.com/earth/GE4/GoogleEarthLinux.bin"
+SRC_URI="http://dl.google.com/earth/GE4/GoogleEarthLinux.bin
+	 video_cards_fglrx? ( http://dev.gentooexperimental.org/~anarchy/libGL.so.1 )"
 
 LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 RESTRICT="mirror strip"
-IUSE=""
+IUSE="video_cards_fglrx"
 
 RDEPEND="x86? (
 	media-libs/fontconfig
@@ -27,19 +28,20 @@ RDEPEND="x86? (
 		x11-libs/libXrender )
 		<virtual/x11-7.0 ) )
 	amd64? (
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-baselibs
-	|| (
-		>=app-emulation/emul-linux-x86-xlibs-7.0
-		x11-drivers/nvidia-drivers
-		x11-drivers/nvidia-legacy-drivers
-		<x11-drivers/ati-drivers-8.28.8 ) )
+		app-emulation/emul-linux-x86-xlibs
+		app-emulation/emul-linux-x86-baselibs
+		|| (
+			>=app-emulation/emul-linux-x86-xlibs-7.0
+			x11-drivers/nvidia-drivers
+			x11-drivers/nvidia-legacy-drivers
+			video_cards_fglrx? ( x11-drivers/ati-drivers )
+			<x11-drivers/ati-drivers-8.28.8 ) )
 	media-fonts/ttf-bitstream-vera"
 
 S=${WORKDIR}
 
 src_unpack() {
-	unpack_makeself
+	unpack_makeself GoogleEarthLinux.bin
 	# make the postinst scripts behave
 	sed -i -e 's:$SETUP_INSTALLPATH/::' \
 		-e "s:^xdg-mime:linux/xdg/xdg-mime:" \
@@ -77,6 +79,10 @@ src_install() {
 	# make sure we install with correct permissions
 	fowners -R root:root /opt/${PN}
 	fperms -R a-x,a+X /opt/googleearth/{xml,res{,ources}}
+
+	if use video_cards_fglrx; then
+		mv ${DISTDIR}/libGL.so.1 ${D}/opt/${PN}
+	fi
 }
 
 pkg_postinst() {