Bump to googleearth-4; fixes bug 160849

(Portage version: 2.1.2_rc4-r3)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 110 deletions

diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index 32a390f9908d..aeb59b32903a 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -2,20 +2,19 @@ AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6
 MD5 c0e990bee2801da02915184a5e37d171 files/mime-magic.patch 572
 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 files/mime-magic.patch 572
 SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12 files/mime-magic.patch 572
-DIST GoogleEarthLinux.bin 21618415 RMD160 163c5090689032d61a5a913b51e1a284af8207eb SHA1 b1293d6b953e7049ee39ad3458e40cae2a5696b7 SHA256 61903c4bbc88482dfb8af2a0ce1d2a70ea44d66638a34b0029440c3748e84c6a
-DIST libGL.so.1 783320 RMD160 d002afd0d501cc161dbf8dabd26b254841f6b2f3 SHA1 553c751453611d37407191f72d64b78736f4d159 SHA256 6d36f11a514e51cb09f3f77c10e4b61c7d96c849ab65cba2c1dbf67c62d8d706
-EBUILD googleearth-4_beta.ebuild 2421 RMD160 e5561573fbb7227751018ce86205f323a779d4c1 SHA1 ae6248e6becf64dd0f22603db8bc2653cf33168d SHA256 8b57f69d7e4a659f2862ab155b55a64c1700b29984ab3f5a9015a184cc312054
-MD5 f995dbbd97cdd7bdfa2a6b72d875f90d googleearth-4_beta.ebuild 2421
-RMD160 e5561573fbb7227751018ce86205f323a779d4c1 googleearth-4_beta.ebuild 2421
-SHA256 8b57f69d7e4a659f2862ab155b55a64c1700b29984ab3f5a9015a184cc312054 googleearth-4_beta.ebuild 2421
-MISC ChangeLog 3709 RMD160 724563509865099b78c911c7df30ab78052107a6 SHA1 ffb08d722c6777c5a5a360fcd4ea24d73ac2088d SHA256 cc16d7bf244e941a586e79a111638842971256f6ce094d42f9ea7cc3512fef84
-MD5 7ec84dfae00fd2160d982d57b260165c ChangeLog 3709
-RMD160 724563509865099b78c911c7df30ab78052107a6 ChangeLog 3709
-SHA256 cc16d7bf244e941a586e79a111638842971256f6ce094d42f9ea7cc3512fef84 ChangeLog 3709
+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
+MISC ChangeLog 3900 RMD160 b66685374d3c2c64f87507d7adf2278f0da48f9d SHA1 fabc3fff52e06c0ce8be210e595a1270eb0023df SHA256 2d092a0fb2d0a93ba0c3404e23e8ac139afae70e5a7bedbfc9f11b4120bc0d81
+MD5 6c7f3718e0268897bcf6751d1baff4c3 ChangeLog 3900
+RMD160 b66685374d3c2c64f87507d7adf2278f0da48f9d ChangeLog 3900
+SHA256 2d092a0fb2d0a93ba0c3404e23e8ac139afae70e5a7bedbfc9f11b4120bc0d81 ChangeLog 3900
 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 3ab40109f707480a9a41d05c3ae3f2e9 files/digest-googleearth-4_beta 458
-RMD160 7c283d4868a8eeebafd8ffb9f8034378a1c81b9c files/digest-googleearth-4_beta 458
-SHA256 99085ebb56439143d3ee6c246498061eb2fbcb372c236b2137dc89bcc62c09ac files/digest-googleearth-4_beta 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_beta b/x11-misc/googleearth/files/digest-googleearth-4_beta
deleted file mode 100644
index 1e41d52b83ee..000000000000
--- a/x11-misc/googleearth/files/digest-googleearth-4_beta
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 89fe72195f439448d949fa1bca4bdc8b GoogleEarthLinux.bin 21618415
-RMD160 163c5090689032d61a5a913b51e1a284af8207eb GoogleEarthLinux.bin 21618415
-SHA256 61903c4bbc88482dfb8af2a0ce1d2a70ea44d66638a34b0029440c3748e84c6a GoogleEarthLinux.bin 21618415
-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_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
deleted file mode 100644
index 1ac302dc1d8a..000000000000
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_beta.ebuild,v 1.13 2007/01/08 07:50:25 genstef 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 )"
-
-LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="mirror strip"
-IUSE="video_cards_fglrx"
-
-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 )
-		<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 ) )
-	media-fonts/ttf-bitstream-vera"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself GoogleEarthLinux.bin
-	# make the postinst scripts behave
-	sed -i -e 's:$SETUP_INSTALLPATH/::' \
-		-e "s:^xdg-mime:linux/xdg/xdg-mime:" \
-		-e "s:^xdg-menu:linux/xdg/xdg-menu:" \
-		-e "s: --user: --system:" \
-		-e 's:$SETUP_INSTALLPATH:1:' postinstall.sh
-	sed -i -e "s:/usr:${D}/usr:g" \
-		-e "s:^detectDE$::" \
-		-e 's:-x $x/update-mime:-d nonexis:' \
-		-e 's:-x $x/update-desktop:-d nonexis:' linux/xdg/xdg-m{ime,enu}
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-
-	unset XDG_DATA_DIRS
-	dodir /usr/share/{appl{ications,nk},gnome/apps,mime/packages}
-	./postinstall.sh
-	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}}
-
-	if use video_cards_fglrx; then
-		mv ${DISTDIR}/libGL.so.1 ${D}/opt/${PN}
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}