Version bump, bug #401297. Icon and elog improvements thanks to Oschtan. Decimal separator bug appears to be solved upstream, removing the locale patch. Reopen bug #262780 if it still occurs.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 224 insertions, 22 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 7f87ac099316..0d2333e8b14f 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.26 2012/02/05 05:54:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.27 2012/03/01 23:07:28 caster Exp $
+
+*googleearth-6.2.1.6014 (01 Mar 2012)
+
+  01 Mar 2012; Vlastimil Babka <caster@gentoo.org>
+  +googleearth-6.2.1.6014.ebuild, +files/googleearth-mimetypes.xml:
+  Version bump, bug #401297. Icon and elog improvements thanks to Oschtan.
+  Decimal separator bug appears to be solved upstream, removing the locale
+  patch. Reopen bug #262780 if it still occurs.
 
   05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
   googleearth-5.1.3535.3218-r1.ebuild, googleearth-5.2.1.1588.ebuild,
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 805150ffe1e3..4267976836af 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,32 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX decimal-separator.patch 324 RMD160 88c5c41517d4195a1f6ad03f58762021fe9ff255 SHA1 82b6920a3ac9ffd4481fe31f60bc72e22e0d4093 SHA256 5c1ffe3cb7b7328245d92c627f8b8d963a9a2aab67c70b5387b151f78b04c051
+AUX googleearth-mimetypes.xml 638 RMD160 2af02c7144488d0364d883659644281f5671e57b SHA1 b80e6e2d4f0be664cf4678d9ad92a74a58ce0b2e SHA256 71e57a7370dc2c0eb6b85e2bbb5282ed7a7542e58f849a20282b1627cef9b2b9
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 DIST GoogleEarthLinux-5.1.3535.3218.bin 25932414 RMD160 46d7a763e835d657798f3cd198f1a7931d31b292 SHA1 3af3c817a587b6bfd6e0fb20de157751a3ea4fda SHA256 f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac
 DIST GoogleEarthLinux-5.2.1.1588.bin 31406473 RMD160 181ed85cb057a2c2eca97f28c07bcda40a2fa0da SHA1 75a458be01c331ac6d4dcd29f91d562fc3dfc604 SHA256 2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30
 DIST GoogleEarthLinux-6.0.2.2074.bin 33685323 RMD160 a00d291279e61a435ee8cb3f89a36cd54b3eb733 SHA1 8eb3a1f5ac607e9dbfc9af67330bcd765227449c SHA256 06cf414d783617a0f7bade21bcc238997140701db6a5cbdf58413cd44f9f5727
 DIST GoogleEarthLinux-6.0.3.2197.bin 33688483 RMD160 a4af85b39bf1f792850aa467a5785e3fe1313382 SHA1 ceb2b16a1cd9ba26c003c8f774054b31a3b53033 SHA256 8c1cabb6a196e93224be05bd8a4786087813075f76e1734a17680c30a9ad972d
+DIST GoogleEarthLinux-6.2.1.6014_amd64.deb 25548980 RMD160 65686f688d9e8d6cfcda690507a327739ab6dc12 SHA1 605ef731b9053f34548642a2563aa55c55ed9fc7 SHA256 e046b56f632260d215db0118b1382cfde070d5985300d23d9ecc1ef8bd3891d9
+DIST GoogleEarthLnux-6.2.1.6014_i386.deb 25534464 RMD160 5212e0266f67d776236ebb175c191f8d680a1fc7 SHA1 708963d1a63e590ef85526400bc146cf6bf155f9 SHA256 b63006a20184c0aa0503acaa82bab65841163a0b48cc075a9523f774b83b6bd3
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 4326 RMD160 83a04fbe9bb9b611ff6824197648b6e5cd63a9ca SHA1 ad2a7f74037607c4331b8d23d19c64dceec3981b SHA256 cf7c2f3f014abade98f4429944e18f8a2a8a6d667b1e482aa55bbb89655d77c9
 EBUILD googleearth-5.2.1.1588.ebuild 5040 RMD160 32e94e8f6341816758a1bccf46d33862594ee3d3 SHA1 bf5e834dcc573859a4076d5fab5c7e283487d961 SHA256 a81ae8f81789d9415279eef67cfd89cff543a93fdf96bd20fa087d1ad37c1ca5
 EBUILD googleearth-6.0.2.2074.ebuild 5582 RMD160 cacbb1e42d0e4df6179f167aae17f36ed849bcd2 SHA1 fabab63df9aabd342cecc2a2ebed7e2a2e2b2ab1 SHA256 04b55a843f80d625120689598f95ff7f9ee7260f0b61d3055b3391b2602709f8
 EBUILD googleearth-6.0.3.2197.ebuild 5302 RMD160 928cb43e0fec5991b2dd4b2d6e3a7c1e66ba7417 SHA1 18e33e0e39cbeda748041feb70e60142e3cd4c77 SHA256 b2025b02d47bac34b7d96c8a7b3216be9d5af8b48dcb762e6c081d6b2f425ea0
-MISC ChangeLog 16563 RMD160 d13cafed4cc5b58ac432ffd626bcc9b97d8f4769 SHA1 ccd02f667d71578fb2bca68d62f2f6adb82e7aaf SHA256 671a7efbeb4f4c4f79f6787ce03e7509b19d6e5b8a9009f82ea059688db7d979
+EBUILD googleearth-6.2.1.6014.ebuild 6226 RMD160 ff7bd4e678f3b0c0f14022b320823a7662f0abce SHA1 ad291e80c4034a674ca7e533f30d84713430909e SHA256 e06a93941eddcef20de40e11610f95681c5b2a86dc6cd0d0194ef68668467e57
+MISC ChangeLog 16920 RMD160 d9b0c883be572d8a6a973a2af1ffc030830163b1 SHA1 321ee3b69bb84ef36cd5e10d07fb4fd981bf45c8 SHA256 292ef097529c57695e35adb86b0df8550914bdb9582ece5dbe840a7679b33b70
 MISC metadata.xml 592 RMD160 293f66d3138e8538252d9c542d1548305be543d7 SHA1 9c6cfc1f4066fb84dd77bc109651dc6526080ad7 SHA256 aeb2f5a091efa0e2325a89bf8501ca993ce235cb47847f3a95be339efb01bbb8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPLhmYAAoJELEHsLL7fEFWmoQP/iVfoBrTCarZQ7HgI8dKZfWU
-5wpqk7mWmsS0/osycv//m6/D3XIxcEmSeiHnW0y5jCia71HRa9NwPitGQgfqpXcG
-V+3mf4k84vtho7v/lTdIjvz3+66rd+74KBmy8RcpuGBzhAXQ/umrKWOSMbRkA+qm
-F0fuY5VpgHIvI7VfNhuIPi9qhvG07iIHLYIGdVwO0Rm7QAVsUy7XxRws0pxHh6ZQ
-1lwEOUJcsDdgePJU5KF10ICjbjGUGVZlolZpBQk2EIL0IND+zPOnIjCmXYHVqcjm
-VMLlk2Qo8Ysd15GWqwpwu+mqVGOY1S38aRiJKO8Hm+h4F6UhUkGYoPAZQeiD7X9t
-sJ/uGuvSNo19MsDulnq7nbyyHeYUpAMK+2+sukMgFFTm9Ie4/sX/RrdhuQgPQ9mB
-DqeDlshizImxVotN2/Y3Kg6mbiFqFQPay9FSUToUnzsAxcXI8xPp41n1BP2GRiys
-FTxoafdxd1d0NR8AE6E+hrErXPWeATmNXYiMc6sMtlyvcD6xXTbHuvl+CG4fz5UL
-jY8Tv4LX9LkioJ6I3BayhCugRmOuxfpKpDWVmHlj4YxrJTLZ1eJ+1cW7z7lE8Fhi
-l4cL1gsEL2G2m1UZjkAwvAQUzgV5lIvjY5KlyVGJczGDXlcmUMbQuuuZCsRdSU2R
-6ek60D6xyg0WVLnO7w/i
-=Foa/
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
new file mode 100644
index 000000000000..3ecfa97cdae0
--- /dev/null
+++ b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/vnd.google-earth.kml+xml">
+    <comment>Keyhole Markup Language data</comment>
+    <glob pattern="*.kml"/>
+  </mime-type>
+
+  <mime-type type="application/vnd.google-earth.kmz">
+    <comment>Keyhole Markup Language archive</comment>
+    <glob pattern="*.kmz"/>
+  </mime-type>
+
+  <mime-type type="application/keyhole">
+    <comment>Keyhole Markup Language data</comment>
+  </mime-type>
+
+  <mime-type type="application/earthviewer">
+    <comment>Keyhole Markup Language data</comment>
+  </mime-type>
+</mime-info>
+
diff --git a/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild b/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild
new file mode 100644
index 000000000000..ed0ad8a45108
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild,v 1.1 2012/03/01 23:07:28 caster Exp $
+
+EAPI="4"
+
+inherit eutils unpacker fdo-mime versionator toolchain-funcs
+
+DESCRIPTION="A 3D interface to the planet"
+HOMEPAGE="http://earth.google.com/"
+# no upstream versioning, version determined from help/about
+# incorrect digest means upstream bumped and thus needs version bump
+SRC_URI="x86? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb
+			-> GoogleEarthLnux-${PV}_i386.deb )
+	amd64? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb
+			-> GoogleEarthLinux-${PV}_amd64.deb ) "
+LICENSE="googleearth GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
+IUSE="mdns-bundled +qt-bundled"
+
+GCC_NEEDED="4.2"
+
+RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-nocxx] )
+	x86? (
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/opengl
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXext
+		x11-libs/libXrender
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		sys-libs/zlib
+		dev-libs/glib:2
+		!qt-bundled? (
+			>=x11-libs/qt-core-4.5.3
+			>=x11-libs/qt-gui-4.5.3
+			>=x11-libs/qt-webkit-4.5.3
+		)
+		net-misc/curl
+		sci-libs/gdal
+		!mdns-bundled? ( sys-auth/nss-mdns )
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-xlibs-20081109
+		>=app-emulation/emul-linux-x86-baselibs-20081109
+		app-emulation/emul-linux-x86-opengl
+		!qt-bundled? (
+			>=app-emulation/emul-linux-x86-qtlibs-20091231-r1
+		)
+	)
+	virtual/ttf-fonts"
+
+DEPEND="dev-util/patchelf"
+
+S="${WORKDIR}/opt/google/earth/free"
+
+pkg_nofetch() {
+	einfo "Wrong checksum or file size means that Google silently replaced the distfile with a newer version."
+	einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+	einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for googleearth first!)."
+	einfo "By redigesting the file yourself, you will install a different version than the ebuild says, untested!"
+}
+
+QA_TEXTRELS="opt/googleearth/plugins/imageformats/libqjpeg.so
+opt/googleearth/libQtGui.so.4
+opt/googleearth/libwebbrowser.so
+opt/googleearth/libviewsync.so
+opt/googleearth/libspatial.so
+opt/googleearth/libsgutil.so
+opt/googleearth/libsearch.so
+opt/googleearth/libsearchmodule.so
+opt/googleearth/librender.so
+opt/googleearth/libnavigate.so
+opt/googleearth/libmoduleframework.so
+opt/googleearth/libmeasure.so
+opt/googleearth/liblayer.so
+opt/googleearth/libinput_plugin.so
+opt/googleearth/libIGGfx.so
+opt/googleearth/libgps.so
+opt/googleearth/libgooglesearch.so
+opt/googleearth/libgoogleearth_free.so
+opt/googleearth/libgoogleapi.so
+opt/googleearth/libgeobaseutils.so
+opt/googleearth/libgdata.so
+opt/googleearth/libflightsim.so
+opt/googleearth/libevll.so
+opt/googleearth/libcommon_webbrowser.so
+opt/googleearth/libcommon.so
+opt/googleearth/libcommon_platform.so
+opt/googleearth/libcollada.so
+opt/googleearth/libbasicingest.so
+opt/googleearth/libbase.so
+opt/googleearth/libauth.so"
+
+pkg_setup() {
+	GCC_VER="$(gcc-version)"
+	if ! version_is_at_least ${GCC_NEEDED} ${GCC_VER}; then
+		ewarn "${PN} needs libraries from gcc-${GCC_NEEDED} or higher to run"
+		ewarn "Your active gcc version is only ${GCC_VER}"
+		ewarn "Please consult the GCC upgrade guide to set a higher version:"
+		ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
+	fi
+}
+
+src_unpack() {
+	# default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
+	unpack_deb ${A}
+
+	cd opt/google/earth/free || die
+
+	if ! use qt-bundled; then
+		rm -v libQt{Core,Gui,Network,WebKit}.so.4 qt.conf || die
+		rm -frv plugins/imageformats || die
+	fi
+	rm -v libcurl.so.4 || die
+	if ! use mdns-bundled; then
+		rm -v libnss_mdns4_minimal.so.2 || die
+	fi
+
+	if use x86; then
+		# no 32 bit libs for gdal
+		rm -v libgdal.so.1 || die
+	fi
+}
+
+src_prepare() {
+	# bug #262780 is hopefully now solved upstream
+#	epatch "${FILESDIR}/decimal-separator.patch"
+
+	# we have no ld-lsb.so.3 symlink
+	# thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
+	patchelf --set-interpreter /lib/ld-linux.so.2 ${PN}-bin || die "patchelf failed"
+}
+
+src_install() {
+	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
+
+	# install binaries and remove them
+	binaries="${PN} ${PN}-bin *.so *.so.*"
+	exeinto /opt/${PN}
+	doexe ${binaries} || die
+	rm ${binaries}
+
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}-mimetypes.xml" || die
+	sed "s#/opt/google/earth/free/google-earth/#/opt/${PN}/${PN}#" -i google-earth.desktop || die
+	domenu google-earth.desktop
+	for size in 16 22 24 32 48 64 128 256 ; do
+		insinto /usr/share/icons/hicolor/${size}x${size}/apps
+		newins product_logo_${size}.png google-earth.png
+	done
+	rm -rf product_logo_* xdg-mime xdg-settings google-earth google-earth.desktop || die
+
+	# just copy everything that's left
+	cp -pPR * "${D}"/opt/${PN} || die
+
+	# some files are executable and shouldn't
+	fperms -R a-x,a+X /opt/googleearth/resources
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	elog "The qt-bundled flag is now enabled by default due to crashes on startup with system Qt."
+	elog "Testing and reporting outcome with/without the flag is welcome (bug #319813)."
+	elog "If it crashes in both cases, disabling tips is reported to help (bug #354281):"
+	elog ""
+	elog "When you get a crash starting Google Earth, try adding a file ~./config/Google/GoogleEarthPlus.conf"
+	elog "the following options:"
+	elog "lastTip = 4"
+	elog "enableTips = false"
+	elog ""
+	elog "In addition, the use of free video drivers may be problems associated with using the Mesa"
+	elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
+	elog "To select the 32bit graphic library use the command:"
+	elog "	eselect mesa list"
+	elog "For example, for Radeon R300 (x86):"
+	elog "	eselect mesa set r300 2"
+	elog "For Intel Q33 (amd64):"
+	elog "	eselect mesa set 32bit i965 2"
+	elog "You may need to restart X afterwards"
+}