Restore genstef's changes

Package-Manager: portage-2.1.2_rc4-r3

3 files changed, 28 insertions, 18 deletions

diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index aeb59b32903a..e6575140066d 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -3,10 +3,11 @@ MD5 c0e990bee2801da02915184a5e37d171 files/mime-magic.patch 572
 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 files/mime-magic.patch 572
 SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12 files/mime-magic.patch 572
 DIST GoogleEarthLinux.bin 21607720 RMD160 fed3a3cb81f963dcf1dde8e386640fd08a1ce9f8 SHA1 a5ab7ff78d7645f192c8c7d5ea97f4957fab90c2 SHA256 369046688de0a749ddce2aa444c6cd5c8b0a0fbd23f16626e241e3df6f8e0d76
-EBUILD googleearth-4.ebuild 2170 RMD160 0548d60d72cc1f45d2b6d2549534da28aba74144 SHA1 c019a8f348fd3d62ad6b79f6b249007caa493238 SHA256 bd5d8e3e6a12fd1e133bc68ad7c03f2ad913226e36cfca1d2517fe922f3372f3
-MD5 a300d172b903701fcabe1da92407ff94 googleearth-4.ebuild 2170
-RMD160 0548d60d72cc1f45d2b6d2549534da28aba74144 googleearth-4.ebuild 2170
-SHA256 bd5d8e3e6a12fd1e133bc68ad7c03f2ad913226e36cfca1d2517fe922f3372f3 googleearth-4.ebuild 2170
+DIST libGL.so.1 783320 RMD160 d002afd0d501cc161dbf8dabd26b254841f6b2f3 SHA1 553c751453611d37407191f72d64b78736f4d159 SHA256 6d36f11a514e51cb09f3f77c10e4b61c7d96c849ab65cba2c1dbf67c62d8d706
+EBUILD googleearth-4.ebuild 2423 RMD160 fae85e7da797c8e57e1c11446768ba6acf32c6b2 SHA1 8eb571a5d2c725b77c7de01ba9cb13fa993061b1 SHA256 80105ded1c855d7cd263bd5eeb124d5dc59d5764eb5abaacee86ff801da977a9
+MD5 07d8281cb22c95fdc93266edc47bf877 googleearth-4.ebuild 2423
+RMD160 fae85e7da797c8e57e1c11446768ba6acf32c6b2 googleearth-4.ebuild 2423
+SHA256 80105ded1c855d7cd263bd5eeb124d5dc59d5764eb5abaacee86ff801da977a9 googleearth-4.ebuild 2423
 MISC ChangeLog 3900 RMD160 b66685374d3c2c64f87507d7adf2278f0da48f9d SHA1 fabc3fff52e06c0ce8be210e595a1270eb0023df SHA256 2d092a0fb2d0a93ba0c3404e23e8ac139afae70e5a7bedbfc9f11b4120bc0d81
 MD5 6c7f3718e0268897bcf6751d1baff4c3 ChangeLog 3900
 RMD160 b66685374d3c2c64f87507d7adf2278f0da48f9d ChangeLog 3900
@@ -15,6 +16,6 @@ MISC metadata.xml 304 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 SHA1 97767
 MD5 b2b1706c8796732b917f1c2bbdfd39d4 metadata.xml 304
 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 metadata.xml 304
 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290 metadata.xml 304
-MD5 e13b50c54e54f01e013bbe7f4b040a72 files/digest-googleearth-4 247
-RMD160 faafc3f839cf3e8ce260b5178b988fb3f08ed633 files/digest-googleearth-4 247
-SHA256 5a29259fb17d73ddf1ab670598e53867beece5dc634f2413390b33c7726c5b5f files/digest-googleearth-4 247
+MD5 6cbaeb925b4fe9a98804d1c714963efa files/digest-googleearth-4 458
+RMD160 04ea62ac6f4e6eb4b4d8b63f6eb2cc6f808b887e files/digest-googleearth-4 458
+SHA256 9341a7bde276f67671947084ac9093b80d9d73fe4425178f30e829aef1212dd8 files/digest-googleearth-4 458
diff --git a/x11-misc/googleearth/files/digest-googleearth-4 b/x11-misc/googleearth/files/digest-googleearth-4
index 338a355b3bc9..138f9505ada6 100644
--- a/x11-misc/googleearth/files/digest-googleearth-4
+++ b/x11-misc/googleearth/files/digest-googleearth-4
@@ -1,3 +1,6 @@
 MD5 0a97dfa4b22d561799a0131822293fad GoogleEarthLinux.bin 21607720
 RMD160 fed3a3cb81f963dcf1dde8e386640fd08a1ce9f8 GoogleEarthLinux.bin 21607720
 SHA256 369046688de0a749ddce2aa444c6cd5c8b0a0fbd23f16626e241e3df6f8e0d76 GoogleEarthLinux.bin 21607720
+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.ebuild b/x11-misc/googleearth/googleearth-4.ebuild
index ece684e2a81e..d614c35ee64a 100644
--- a/x11-misc/googleearth/googleearth-4.ebuild
+++ b/x11-misc/googleearth/googleearth-4.ebuild
@@ -1,18 +1,19 @@
 # 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.ebuild,v 1.1 2007/01/12 19:29:38 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.ebuild,v 1.2 2007/01/13 09:56:05 masterdriverz 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() {