Revert the ati/nvidia changes, as SRC_URI doesn't work. Request by jakub, blame him

Package-Manager: portage-2.1.2

4 files changed, 27 insertions, 33 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 11eeae191630..1fec08b6a5bd 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/googleearth
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.21 2007/01/12 19:29:38 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.22 2007/01/18 13:14:09 armin76 Exp $
+
+  18 Jan 2007; Raúl Porcel <armin76@gentoo.org> googleearth-4.ebuild:
+  Revert the ati/nvidia changes, as SRC_URI doesn't work. Request by jakub,
+  blame him
 
 *googleearth-4 (12 Jan 2007)
 
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index e6575140066d..2a0f2a9d4765 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -3,19 +3,18 @@ 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
-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
-SHA256 2d092a0fb2d0a93ba0c3404e23e8ac139afae70e5a7bedbfc9f11b4120bc0d81 ChangeLog 3900
+EBUILD googleearth-4.ebuild 2164 RMD160 09b4acf6fb7f41d2c8718d5ef3152008374d3e15 SHA1 8338b6610cd8be3d7bc6f5bd2d5dedcecfdf4da7 SHA256 bff042d233018b441bc8584c43b88ea0770989b67acc9de17e93235d7a44bbb2
+MD5 6310df7ce599ef0f69946f58671e9762 googleearth-4.ebuild 2164
+RMD160 09b4acf6fb7f41d2c8718d5ef3152008374d3e15 googleearth-4.ebuild 2164
+SHA256 bff042d233018b441bc8584c43b88ea0770989b67acc9de17e93235d7a44bbb2 googleearth-4.ebuild 2164
+MISC ChangeLog 4054 RMD160 57aa24ee8b1b73bbeeac7f4853e0a774d9d32b70 SHA1 c3add0662fd8f0ca31604070cf4681acf66f5b13 SHA256 c129b1954488d122a0ae4a1091ea2c30e37e4e1cb5c325aa01b44b4868239fc1
+MD5 a7a8658e3e8bfef6fc77f7c1933d8978 ChangeLog 4054
+RMD160 57aa24ee8b1b73bbeeac7f4853e0a774d9d32b70 ChangeLog 4054
+SHA256 c129b1954488d122a0ae4a1091ea2c30e37e4e1cb5c325aa01b44b4868239fc1 ChangeLog 4054
 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 6cbaeb925b4fe9a98804d1c714963efa files/digest-googleearth-4 458
-RMD160 04ea62ac6f4e6eb4b4d8b63f6eb2cc6f808b887e files/digest-googleearth-4 458
-SHA256 9341a7bde276f67671947084ac9093b80d9d73fe4425178f30e829aef1212dd8 files/digest-googleearth-4 458
+MD5 e13b50c54e54f01e013bbe7f4b040a72 files/digest-googleearth-4 247
+RMD160 faafc3f839cf3e8ce260b5178b988fb3f08ed633 files/digest-googleearth-4 247
+SHA256 5a29259fb17d73ddf1ab670598e53867beece5dc634f2413390b33c7726c5b5f files/digest-googleearth-4 247
diff --git a/x11-misc/googleearth/files/digest-googleearth-4 b/x11-misc/googleearth/files/digest-googleearth-4
index 138f9505ada6..338a355b3bc9 100644
--- a/x11-misc/googleearth/files/digest-googleearth-4
+++ b/x11-misc/googleearth/files/digest-googleearth-4
@@ -1,6 +1,3 @@
 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 d614c35ee64a..495c01aa7cc3 100644
--- a/x11-misc/googleearth/googleearth-4.ebuild
+++ b/x11-misc/googleearth/googleearth-4.ebuild
@@ -1,19 +1,18 @@
 # 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.2 2007/01/13 09:56:05 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.ebuild,v 1.3 2007/01/18 13:14:09 armin76 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
-	 video_cards_fglrx? ( http://dev.gentooexperimental.org/~anarchy/libGL.so.1 )"
+SRC_URI="http://dl.google.com/earth/GE4/GoogleEarthLinux.bin"
 
 LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 RESTRICT="mirror strip"
-IUSE="video_cards_fglrx"
+IUSE=""
 
 RDEPEND="x86? (
 	media-libs/fontconfig
@@ -28,20 +27,19 @@ 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
-			video_cards_fglrx? ( x11-drivers/ati-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
+		<x11-drivers/ati-drivers-8.28.8 ) )
 	media-fonts/ttf-bitstream-vera"
 
 S="${WORKDIR}"
 
 src_unpack() {
-	unpack_makeself GoogleEarthLinux.bin
+	unpack_makeself
 	# make the postinst scripts behave
 	sed -i -e 's:$SETUP_INSTALLPATH/::' \
 		-e "s:^xdg-mime:linux/xdg/xdg-mime:" \
@@ -79,10 +77,6 @@ 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() {