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

Package-Manager: portage-2.1.2_rc4-r4

4 files changed, 38 insertions, 35 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/Manifest b/x11-misc/googleearth/Manifest
index 551164ed7465..32a390f9908d 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -1,30 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 MD5 c0e990bee2801da02915184a5e37d171 files/mime-magic.patch 572
 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 files/mime-magic.patch 572
 SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12 files/mime-magic.patch 572
 DIST GoogleEarthLinux.bin 21618415 RMD160 163c5090689032d61a5a913b51e1a284af8207eb SHA1 b1293d6b953e7049ee39ad3458e40cae2a5696b7 SHA256 61903c4bbc88482dfb8af2a0ce1d2a70ea44d66638a34b0029440c3748e84c6a
-EBUILD googleearth-4_beta.ebuild 2169 RMD160 c554f1461dc61388f0b3cf6ba313c595f37b1b8a SHA1 95c501e4362a75def792046a168a531137c0a580 SHA256 bc41bcff0f1261f8b82d1153b44c3a83d56b14f236667bbbb9af7edc0f9dd283
-MD5 0e27b4873e4cd7af263a6c2f03e0a50d googleearth-4_beta.ebuild 2169
-RMD160 c554f1461dc61388f0b3cf6ba313c595f37b1b8a googleearth-4_beta.ebuild 2169
-SHA256 bc41bcff0f1261f8b82d1153b44c3a83d56b14f236667bbbb9af7edc0f9dd283 googleearth-4_beta.ebuild 2169
-MISC ChangeLog 3579 RMD160 e50db7c03d6d57397f2ac77402e832bf9da855db SHA1 ff57a8bc215f0e4e14030089e60eac8b839d9da3 SHA256 0b90b4d90af50c7877c0598710b88a31bf2c7a6b185595717e3dc8f3070252c2
-MD5 f51a629a07348d3c0efbb4378be30ed3 ChangeLog 3579
-RMD160 e50db7c03d6d57397f2ac77402e832bf9da855db ChangeLog 3579
-SHA256 0b90b4d90af50c7877c0598710b88a31bf2c7a6b185595717e3dc8f3070252c2 ChangeLog 3579
+DIST libGL.so.1 783320 RMD160 d002afd0d501cc161dbf8dabd26b254841f6b2f3 SHA1 553c751453611d37407191f72d64b78736f4d159 SHA256 6d36f11a514e51cb09f3f77c10e4b61c7d96c849ab65cba2c1dbf67c62d8d706
+EBUILD googleearth-4_beta.ebuild 2421 RMD160 e5561573fbb7227751018ce86205f323a779d4c1 SHA1 ae6248e6becf64dd0f22603db8bc2653cf33168d SHA256 8b57f69d7e4a659f2862ab155b55a64c1700b29984ab3f5a9015a184cc312054
+MD5 f995dbbd97cdd7bdfa2a6b72d875f90d googleearth-4_beta.ebuild 2421
+RMD160 e5561573fbb7227751018ce86205f323a779d4c1 googleearth-4_beta.ebuild 2421
+SHA256 8b57f69d7e4a659f2862ab155b55a64c1700b29984ab3f5a9015a184cc312054 googleearth-4_beta.ebuild 2421
+MISC ChangeLog 3709 RMD160 724563509865099b78c911c7df30ab78052107a6 SHA1 ffb08d722c6777c5a5a360fcd4ea24d73ac2088d SHA256 cc16d7bf244e941a586e79a111638842971256f6ce094d42f9ea7cc3512fef84
+MD5 7ec84dfae00fd2160d982d57b260165c ChangeLog 3709
+RMD160 724563509865099b78c911c7df30ab78052107a6 ChangeLog 3709
+SHA256 cc16d7bf244e941a586e79a111638842971256f6ce094d42f9ea7cc3512fef84 ChangeLog 3709
 MISC metadata.xml 304 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 SHA1 9776781765288eeb9d4009f8ace681f40d7750d5 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290
 MD5 b2b1706c8796732b917f1c2bbdfd39d4 metadata.xml 304
 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 metadata.xml 304
 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290 metadata.xml 304
-MD5 3a7ff2377a937a6e0580ea76641c1e8e files/digest-googleearth-4_beta 247
-RMD160 87e69a9d1aed6568836e5511b9505bb62313d1b7 files/digest-googleearth-4_beta 247
-SHA256 8a1c4f9438ad979bba496674c8fcca69fdb4b8555125f88c4a85c5aa6a20ea68 files/digest-googleearth-4_beta 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFkwGWmdTrptrqvGERAvtvAJ95Q2b8GHKzMyG8A3h8IMX/FyMj1gCcCRHm
-HSqXs9xXrTzh3/iGihV/ewI=
-=DX/6
------END PGP SIGNATURE-----
+MD5 3ab40109f707480a9a41d05c3ae3f2e9 files/digest-googleearth-4_beta 458
+RMD160 7c283d4868a8eeebafd8ffb9f8034378a1c81b9c files/digest-googleearth-4_beta 458
+SHA256 99085ebb56439143d3ee6c246498061eb2fbcb372c236b2137dc89bcc62c09ac files/digest-googleearth-4_beta 458
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() {