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

(Portage version: 2.1.2)

3 files changed, 16 insertions, 21 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/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() {