Bring back stable version 4.2.205.5730, made possible by versioned SRC_URI discovered by Daniel Wallace (bug #221105)

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

4 files changed, 93 insertions, 5 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 35704e112a4e..81706bb9b84d 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/googleearth
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.38 2008/08/09 07:45:55 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.39 2008/08/09 18:06:31 wormo Exp $
+
+*googleearth-4.2.205.5730 (10 Aug 2008)
+
+  10 Aug 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +googleearth-4.2.205.5730.ebuild, googleearth-4.3.7284.3916.ebuild:
+  Introduce partially revisioned SRC_URI recommended by Daniel Wallace
+  in bug #221105, so now 4.2 ebuild can be available in parallel with 4.3
 
   09 Aug 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
   googleearth-4.3.7284.3916.ebuild:
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index 5dc29d34614d..264f27145f42 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -1,5 +1,6 @@
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 DIST GoogleEarthLinux.bin 20554977 RMD160 de8f92a45b72d37ba66bc33dd20b2bd59df79fad SHA1 35b883f75ca0da4cc4b5888d345ed5ec2a53123e SHA256 aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
-EBUILD googleearth-4.3.7284.3916.ebuild 2088 RMD160 344d8ec03b15a1211ec38d8e91283a11d99b1644 SHA1 58f31c48fbc9df8003d02089f53f10b22a2a7746 SHA256 99c6383de21fd3078cbdbf3e43f8311252b13e403b4225acddb87321d82d1bcf
-MISC ChangeLog 6434 RMD160 206569282149ea2f1003948fed7ae68dd939b96e SHA1 3fe48d0a653366bf196ac31151420bd04f53a382 SHA256 e7a2e507f2cfcf97c7667bfaf5510aebbee23b0355f21b1c4ab5b1f811cef453
+EBUILD googleearth-4.2.205.5730.ebuild 2071 RMD160 8192bab1be53ac5ec031b25e38153132b5f750fd SHA1 b2b977a8829960f4fbeba2f4eadb0b2dce4a8fed SHA256 07ab620ee20456354574fb5b083eed4b5ad0027856ff45c80ec958c1834f7e3c
+EBUILD googleearth-4.3.7284.3916.ebuild 2096 RMD160 5b84bee84e1f8c8f0eb8b920057829ac04b29c2b SHA1 fde72cda9d873323ab5dd3c4b17572760abeb1e5 SHA256 53de2fdbe87edf248f144bae48e77ee06ecbf5e645a3c250ea57593b9a4aa1fd
+MISC ChangeLog 6751 RMD160 c93ba16c7ee7de207f9a889ed3778148a234beff SHA1 98cf4475980e767b950c85829a68c2bc3602e933 SHA256 4ec17ab320007f5bbcbe40e641b70501098a532832518294314eb7018e97d5d1
 MISC metadata.xml 325 RMD160 a7051f86b61260d8a682b108bf6a7eed0edc7bd1 SHA1 93b04166fd686b8af24c69b0acee7c1781110883 SHA256 4029c778cbc31db5f49fd0467781a733e1be2530c3d88484d8d5c817a4ea2840
diff --git a/x11-misc/googleearth/googleearth-4.2.205.5730.ebuild b/x11-misc/googleearth/googleearth-4.2.205.5730.ebuild
new file mode 100644
index 000000000000..18231ecbbba9
--- /dev/null
+++ b/x11-misc/googleearth/googleearth-4.2.205.5730.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.2.205.5730.ebuild,v 1.5 2008/08/09 18:06:31 wormo Exp $
+
+inherit eutils fdo-mime
+
+DESCRIPTION="A 3D interface to the planet"
+HOMEPAGE="http://earth.google.com/"
+SRC_URI="http://dl.google.com/earth/client/GE4/release_4_2/GoogleEarthLinux.bin"
+
+LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="mirror strip"
+IUSE=""
+
+RDEPEND="x86? (
+	media-libs/fontconfig
+	media-libs/freetype
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender )
+	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/ati-drivers-8.28.8 ) )
+	media-fonts/ttf-bitstream-vera"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_makeself
+	# make the postinst script only create the files; it's  installation
+	# are too complicated and inserting them ourselves is easier than
+	# hacking around it
+	sed -i -e 's:$SETUP_INSTALLPATH/::' \
+		-e 's:$SETUP_INSTALLPATH:1:' \
+		-e "s:^xdg-desktop-icon.*$::" \
+		-e "s:^xdg-desktop-menu.*$::" \
+		-e "s:^xdg-mime.*$::" postinstall.sh
+}
+
+src_install() {
+	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
+	./postinstall.sh
+	insinto /usr/share/mime/packages
+	doins ${PN}-mimetypes.xml
+	domenu Google-${PN}.desktop
+	doicon ${PN}-icon.png
+	dodoc README.linux
+
+	cd bin
+	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
+	exeinto /opt/${PN}
+	doexe *
+
+	cd "${D}"/opt/${PN}
+	tar xf "${WORKDIR}"/${PN}-data.tar
+
+	cd "${D}"
+	# mime magic for gnome by Ed Catmur in bug 141371
+	epatch "${FILESDIR}"/mime-magic.patch
+
+	# make sure we install with correct permissions
+	fowners -R root:root /opt/${PN}
+	fperms -R a-x,a+X /opt/googleearth/{xml,res{,ources}}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild b/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild
index 4502882d65e6..0e6ff99db83c 100644
--- a/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild
+++ b/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild,v 1.2 2008/08/09 07:45:55 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4.3.7284.3916.ebuild,v 1.3 2008/08/09 18:06:31 wormo Exp $
 
 inherit eutils fdo-mime
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="http://earth.google.com/"
-SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin"
+SRC_URI="http://dl.google.com/earth/client/GE4/release_4_3/GoogleEarthLinux.bin"
 
 LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"