updated patch for googeearth-4

googleearth.patch (text/plain), 1.97 KB, created by Jory A. Pratt on 2007-01-13 03:39:26 UTC

Index: googleearth-4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 googleearth-4.ebuild
--- googleearth-4.ebuild	12 Jan 2007 19:29:38 -0000	1.1
+++ googleearth-4.ebuild	13 Jan 2007 03:38:04 -0000
@@ -6,18 +6,21 @@
 
 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 video_cards_nvidia"
 
 RDEPEND="x86? (
 	media-libs/fontconfig
 	media-libs/freetype
 	virtual/opengl
+	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers x11-drivers/nvidia-legacy-drivers ) )
+	video_cards_fglrx? ( x11-drivers/ati-drivers )
 	|| ( ( x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -27,19 +30,15 @@
 		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 )
 	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 +76,10 @@
 	# 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() {