version bump wrt #466910 thanks to Magnus Kessler for the patchelf hint

Package-Manager: portage-2.2.0_alpha175/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 207 insertions, 19 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 93f7c2680555..20fc2c127ae2 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.49 2013/04/21 19:21:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.50 2013/05/19 14:14:09 hasufell Exp $
+
+*googleearth-7.1.1.1580 (19 May 2013)
+
+  19 May 2013; Julian Ospald <hasufell@gentoo.org>
+  +googleearth-7.1.1.1580.ebuild,
+  +files/googleearth-7.1.1.1580-desktopfile.patch:
+  version bump wrt #466910 thanks to Magnus Kessler for the patchelf hint
 
   21 Apr 2013; Michał Górny <mgorny@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 e857cf1763d4..fb8fda911cc8 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX decimal-separator.patch 324 SHA256 5c1ffe3cb7b7328245d92c627f8b8d963a9a2aab67c70b5387b151f78b04c051 SHA512 e158ad397af8f2f14e417b90c4c415ded34f27c513d0c651c8c5b242876625ba0c2f3167d7c4a401dfa0c2e2ab8ef0b7974df3df8a7a685fa59b928cc2aa36d5 WHIRLPOOL 8b6432a88e776b18ddaebab211d45a723562df32b523f686cbe9bf1ccdabfd5f594dd75c4a13bae641a29b80fddd1678e94e571983dc0a8b7e080f4fd716ddeb
 AUX googleearth-7.0.2.8415-desktopfile.patch 646 SHA256 9b69e401ea0a6c70c69c5f7848c1a62bd99096233742bfb2b9c006b67c2f0f3c SHA512 91beacecc5dc4dd7b8f37ccf4f6470356c162e5cc45ce23b8bd9c34b5f88a05c9f9d707f6d1d1093fbe71246f00c73152405c882f1991708651defd2c322e47f WHIRLPOOL 14529b9b4e934831d31196273b7de9f29700f4bd9b69c9b098c739d80eabd1f4f9eebec17f8ac0a1919537803951dfee3900b25389c72b5a8f34241a5c2f3cf1
 AUX googleearth-7.0.3.8542-desktopfile.patch 646 SHA256 9b69e401ea0a6c70c69c5f7848c1a62bd99096233742bfb2b9c006b67c2f0f3c SHA512 91beacecc5dc4dd7b8f37ccf4f6470356c162e5cc45ce23b8bd9c34b5f88a05c9f9d707f6d1d1093fbe71246f00c73152405c882f1991708651defd2c322e47f WHIRLPOOL 14529b9b4e934831d31196273b7de9f29700f4bd9b69c9b098c739d80eabd1f4f9eebec17f8ac0a1919537803951dfee3900b25389c72b5a8f34241a5c2f3cf1
+AUX googleearth-7.1.1.1580-desktopfile.patch 646 SHA256 9b69e401ea0a6c70c69c5f7848c1a62bd99096233742bfb2b9c006b67c2f0f3c SHA512 91beacecc5dc4dd7b8f37ccf4f6470356c162e5cc45ce23b8bd9c34b5f88a05c9f9d707f6d1d1093fbe71246f00c73152405c882f1991708651defd2c322e47f WHIRLPOOL 14529b9b4e934831d31196273b7de9f29700f4bd9b69c9b098c739d80eabd1f4f9eebec17f8ac0a1919537803951dfee3900b25389c72b5a8f34241a5c2f3cf1
 AUX googleearth-mimetypes.xml 638 SHA256 71e57a7370dc2c0eb6b85e2bbb5282ed7a7542e58f849a20282b1627cef9b2b9 SHA512 47c855b0a3c2ad0e8951f238411ef99f029c3f9079803d4063072fa03b4fe02c69fc57ae9cc599d0bb5d1b3b584d73928b2eea6a4faded8f0074139a5c08a79c WHIRLPOOL edac2920e71b589668fff0f83dc96c8e088c4894156f2f3d6b69cb6043e71bf59d5b2584bebf5169ee3fe07501c8fcf7f30c664bd5466e6df0179bfff8215510
 AUX mime-magic.patch 572 SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12 SHA512 75257361e040ca14bf501991cf50e0fe02fef1be2abc792493883f0e330d36348241b1f6375b2154cd5835a8d37141cc7bc1ff02ec13a1cd01021d67c1f8b663 WHIRLPOOL 8853610b67004150ded78b71f18e95ddc007d8de988a0ba351519bca775b19d496b07669b131ef4fba3b5a03ac70ecfb8b1e13b221ecd8f587339fa6d61a39cd
 DIST GoogleEarthLinux-5.1.3535.3218.bin 25932414 SHA256 f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac SHA512 97b1af077e8fc4ec19e8824d0996c5bbf5f3347e6a6f9a2c5b1cf48b76c5ced81e7462a4335d23ef2cbaf1ea361d861e4cecec0b209653f7a3ff9c1be1b65479 WHIRLPOOL bc7088a960aa5fc96b8148f55176916867858028ff09dc5ee90d7a11586733ef0c9e697bd8d956ce07330d722208ecdb14534b745caab169e7312b97616e96af
@@ -15,6 +16,8 @@ DIST GoogleEarthLinux-7.0.2.8415_amd64.deb 30832428 SHA256 878e8a23ada537ae5ab28
 DIST GoogleEarthLinux-7.0.2.8415_i386.deb 30809718 SHA256 a7c2fd63e5e9d25a4f3f599d3c4470a285db8bb7c5981db409a1ebb19ebdb6e1 SHA512 1bdbd14e017244f8ecf5b67f115bddd400c1ac5d0bcd1b9ae7e1d676f62e838c84b13f2aa410d0dad8084db6a72235e80b8d16754b3714f13341de11fea28119 WHIRLPOOL b53a364b01de459761a03ebfbae89704b02cef979fad9da1d2d8c438643d1f914d464e0297daa5a05e1a8004ec8bc052a32f90f8a85f4de7a7a9dab2bdd8d1a6
 DIST GoogleEarthLinux-7.0.3.8542_amd64.deb 30671794 SHA256 b3d8e11d3fd8db6e70e4c18270bedc988505c401149f66eb81c993b35c2d1367 SHA512 f6b42213e367b7891b1bfcd51b13db1cc7cfd15dc03546e170bd089aa22ad8e2904147723fbdf6249be3ac91c8f82449646c2721c52da13dafc9699f2fb1d301 WHIRLPOOL 4862e00747d9e243f63186a65351fb3b44f837fabbf6e54749e6da21b99fb4422786bda093dbf886c3ebbf5f3c143cf9e5531b5ac547a1c1c788b398260d601f
 DIST GoogleEarthLinux-7.0.3.8542_i386.deb 30675086 SHA256 706bf8a74b87dbafc2529e508fd8bb11276b2f8d6bc7524ef2b888761c46bf67 SHA512 476cda1ced6522a6a0d417300354fae815c140eb72f83fd3ab0ee2d5b1b28a3f1ed11491e1ac4d6a9791c97be88ee4521fd550a613ede52831b2a4f7092fee02 WHIRLPOOL a0ca3985bbd71c8adf8c7335eb4d5b2baaf65f73e64c0705e50c049afaf7acfcf137dd4c24779f7d628feffcc424c3caa2445def76d5b7e113217743eef2d5bc
+DIST GoogleEarthLinux-7.1.1.1580_amd64.deb 46423542 SHA256 bb134e6c67e6019b6c5662dc987e70c2ae91c5b19508e9ba5761aeeef8db8606 SHA512 c1f53c7234f4d90f6178c474f0ff02b483405bf22687631fbd4c7a62aa5719bb8457a1b1828cc7b64c8fb782c4d262ad75a0a7d7c0785d80927bd248f25313d8 WHIRLPOOL 2e56b4eaa6035dba95539f80b940153ddf9a2567e247b3448610a8eb3bb19c47f8a9b71b6e32283ed5839dfefb4c920c70cc11d2dedd790a351d0763255937dd
+DIST GoogleEarthLinux-7.1.1.1580_i386.deb 45551694 SHA256 5ed826f0903ed8426126f9f33824bbe2a46e77902e4c4ef037818c580bc505d4 SHA512 760fe2321d781ab9de50a680f33ca60b0fee341bbad3b5aaba62df29194727cb186bcbbeb2897488c24130f22c2df37cb0664a0813548892dd8ef79d27963652 WHIRLPOOL 4688a884dad3be74f8e00a089cddadfadf050ddea616237f11b79a7aeffc3b82bec1b6a7449863ddedc404dffd4f58159edd13967e16a3b999185638eaace3b9
 DIST GoogleEarthLnux-6.2.2.6613_i386.deb 25620810 SHA256 e309ce1493dec6abc742037b1e6822b08771827db59ee7e5d5da56cb40c92111
 DIST googleearth-libexpat-2.1.0-novisibility.tar.xz 54812 SHA256 f300a3f76ef8350a9e681005c4d6ec5ba086e7f12acc7b83b68445e770dec6c9 SHA512 21f0510f391e242a2a87191ecb53f45bf837801b8e8e937dd50b6ff454b52d0dd4d31f32461add7604226d786a188a3a2a8dd86c86f9678c8d317b0d432f91e3 WHIRLPOOL 55440c3924735cf03b8c283c7f4787b735fa5dad62dfa753332b5c149ebe9a4734a24924a6a12b12a43c7292d544d0e971fd92d84ebe751fa439afffc54f1dae
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 4687 SHA256 bf86008372aea9966e38a9e59659150fb9f5592fe0f7b2179797969af85d0876 SHA512 546edc89eeefc4bff4fef8548c2fa9931c6b369747760a6b25c6e206e39c4ffcb2aaf6d8f338f73daa3d5951a228e3af9509184ff1e427a7d0f1c71736dad96f WHIRLPOOL 217cc549518c530fa25bc82efa0908cd7e3beee6bb3a7e03979e7f6764645d2203ed6918b74153be451c7108f028ec0200102d5d667cef40b31af4f1b853dad5
@@ -25,24 +28,17 @@ EBUILD googleearth-6.2.2.6613.ebuild 6075 SHA256 fad712b016e1d2009d466ba5991d4bf
 EBUILD googleearth-7.0.2.8415-r2.ebuild 6280 SHA256 e97bd5f198b92a5e465eaa9cd6d2cb2356978cee5f17a989aff7fa4512e1f1fb SHA512 5b549ae6eef01c72e72a97d027691e10f66bfffae83d0000af4ae95591640a0e1a2ef580534ba493fb993a165cda4440da6c16fb2be8694ea48ec83384a7ec04 WHIRLPOOL 4a56a01aeac99f45fcd7210acab2a3b4deb8a69e2c557c52cff2c58a633510caae9d93656749125a70ff3d8a5be49e741f27e96ec916aadc407a07e80f2d75c7
 EBUILD googleearth-7.0.2.8415.ebuild 6299 SHA256 5dc23c1849f05d2d11dc71042075c01912cfa8b8e17503ecaae59b39d879b264 SHA512 59d301747bbb8847a664b124f94223632289f7fb40aaf52b4fc8dc4b530d3517adb103f4faab9249c65d4e950a8643f158217cf05d67561d7a60a8bacf5d744b WHIRLPOOL d2e2e7099904bb15e81ab55e8aaf128de159a889a21804afa1b80d790ccf64c745fbbc830d837dda80333fc77ae6b349cf927113adc1b549a33da5daa01ae8f4
 EBUILD googleearth-7.0.3.8542.ebuild 6277 SHA256 97f6de2a3ae46a509b8696a9225c95aea3bea71043c4f710393f51c2961e624d SHA512 6d582e6e5cedc31a827df6a6df92ed1e980c9d7f18548a8d7d6b7ed4df171f2ac1290d62cba40933b37af3b6aac8baa0a94c81d9f3e5be0f9d6a4b442ee9b927 WHIRLPOOL 7f2394c0592009dcabe1e461cf84d47b5093c89b4fa4b587f42410c9fdc5ef89e858c7ea47ecb0f3bc72fa0fe5dfa3efa668a9eb3bfa9181c2cceb0c2897c639
-MISC ChangeLog 21176 SHA256 d7731251e149a414adc599e9e643436cf6b515abaa332878ac99ba42e381e4b8 SHA512 8baadfbfff32abd88e6d640c1575fee534d8e1349e87a0af52a6498273d1e2fc18ecc06ccc0153ba88350f541b97845e74ccf31926fbc90a7aa10e458b5301d8 WHIRLPOOL 78ddee0465279f38f3f1f0f110cdf236031d09dbdc0738ccabc7a892a433e04d00f093cb18d7198083050078826fb88b04a7673af265e90938a2b84cf009bf8f
-MISC metadata.xml 689 SHA256 b3e9cd73f0f098add65660ab5cc1478c008150b83f473644cb1f0ecad75b5e3f SHA512 3be912460c770ff080d778024ea9ff3854498bf60a04eb8df3689f3b92678d7346f544e960134f2a8aea4ac2059f114734110563b7545f93f7c63ff5aff368d7 WHIRLPOOL bf0533862116669580d150da6199428beb7099c6566b58c172329e380876fbbb470440a5aba9961b9acce1d0cace01f7bc8e524dc45af2c75d622c49191ac5b2
+EBUILD googleearth-7.1.1.1580.ebuild 5117 SHA256 11d6ba91e9b0d0abb8efea8dca1d1fd180b98bdedba28c77b16a39b7a015fc74 SHA512 4366af4eda64cc48c720106e24c96f1fe450e85e21b4bcc9fd105b2bd5d045ef5cf7fd4f4ae040d51496abeefa8e13cbe649b9b7976ad92fa958406fbd818039 WHIRLPOOL 64aae4870a1a77801492eece69f11c34e623d97d7dc40f286a68ff9455e84e25d28481ad6fd611e659fee02d1bef4d6688fea1caf8480ddf7db1be81898573f0
+MISC ChangeLog 21428 SHA256 40e187600fa18ab84c353976034a8af4410c7c29789d94bf0b8457651b93e548 SHA512 3a53433ae235eac72dc81a7fbe06e03695d0ca55a06a7162d853054a898d678885a5e3dc04dbab7ea4b9ab971957c17bc55f933abbbdb149c8298e47286b9c7e WHIRLPOOL c8462ed3fd89cbdb098e0508bc2cf1800e23e718b5ee9fc37f48bf06cd23080e38afbd9418a239a14c4013d26fbba779522f45732796573c24df752879d50ece
+MISC metadata.xml 747 SHA256 52f706cb40e4c3b26943c1b9ef69758f71aa4a9677fef5cd56d79970aabe1477 SHA512 a5b849bcb6ee3768dddf73add117c68b24155308fadb813285a79e4ed78bd1e7bdd1345322531343ad032e9b576ef78aec8ab0f4b7a9244348166eba398b718e WHIRLPOOL f4278ca52e2f6b4933ae7d65c902af8a360fed819ff8a0a226ae51e6930e985518faed50fbe6ca6cfadaaa85150776358ee33138691ceea4333fb7f04500c317
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRdDyAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDvycP/iVAwuGVVAo0e59zsYpXo0Sz
-HHhhNNdroUooo9KWZt0r4Q00y3s7OXhEFfmakiLF3RRhoNHi1Tc4ImxA+ljeEQ0F
-YevkW2UVoroIew9yCpeZUH7wR/OEsdR57AiddxJ1J7ym8/dN/YGoqLEq87QKhBkY
-d5q16LG8hDYOp5gdUl6Jmt29quOfjR4KBIaw0PjOf+hhzTmtWjMbOjf28Zps4Nk4
-QX6KNNEYavgls6/LeoQdhmcBypRHicvWWUN4kwCwmUDXtZDkbWaGR01WOye22nSA
-5vpR99gmd0ck32FqO8w2d2/SFGcyC5fyMA//qE7TLg6MNJhHWOOTLrht8ockUCiJ
-XC+R6xu1h975KUDYwMySIMFQkUvi1wrCoDl0fNpUsSxvo2ESSd03D/J+045+oN/o
-QTFW1kymy6lT+SfscZP9uB4aEdOufgjZ3U4T4x26GKaCTNTBbuMJkExcXnHJjTh+
-GHykEdRiXEsyOFOgEhoA0PYZLir4EImzq8u/otipbBNCfRZ1VOm6szbMkzHC87cD
-1MILQtekOts9EBHoIUzHGVpYeVR7aEU089aknQ3ojIzHYLVmKj+M5oLZq4/oGw4y
-cVppTBBFYJXdo8xqoFV4EgTYF7cqv2G1PMm+HwoQs6K4T4ryDYEHNWbFJSSumbYl
-swOfYM6HSzSwTeorXRbF
-=huBi
+iQEcBAEBCAAGBQJRmN41AAoJEFpvPKfnPDWzIAoH/RPSAV1VwfQgede4eqEOBqMW
+8Eahu3C9inf1gQ29nFXmVXHfLbtAd1Ny796Jhyo3Y6hVCvNjXNejQmm0HTSZbn25
+ky9sDEuAtEFpTplZc6JOCCzGQLePCa7ye7/9jsDRhqgYlMb1RgAUGXALX++9CBoQ
+74jqJYGQHOJkwFvk9r7lz+zB82ZGWMfCK8/aICmez2+7NCxAKv51KvD/dx7YQTtk
+3+eZQ10gOiwB6jlrVecGR4mYwQ8Kn0ontXIHMaVYx5zGddU+jTmX8S962aTJI/Kt
+FvZJ6UQSDYh2te5ucJYTGc9nFB27vUyJCNj4Clynmye2IZ2cANE4IeHDvwBKyjQ=
+=T8pG
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/files/googleearth-7.1.1.1580-desktopfile.patch b/sci-geosciences/googleearth/files/googleearth-7.1.1.1580-desktopfile.patch
new file mode 100644
index 000000000000..0de8b589b77e
--- /dev/null
+++ b/sci-geosciences/googleearth/files/googleearth-7.1.1.1580-desktopfile.patch
@@ -0,0 +1,17 @@
+--- google-earth.desktop
++++ google-earth.desktop
+@@ -3,10 +3,10 @@
+ Name=Google Earth
+ GenericName=3D planet viewer
+ Comment=Explore, search and discover the planet
+-Exec=/opt/google/earth/free/google-earth %f
++Exec=/opt/googleearth/googleearth %f
+ Terminal=false
+-MultipleArgs=false
++X-MultipleArgs=false
+ Icon=google-earth
+ Type=Application
+-Categories=Application;Network
+-MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole
++Categories=Network;
++MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole;
diff --git a/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild b/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild
new file mode 100644
index 000000000000..66562769687a
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild,v 1.1 2013/05/19 14:14:09 hasufell Exp $
+
+EAPI=5
+
+inherit pax-utils eutils unpacker fdo-mime gnome2-utils
+
+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
+			-> GoogleEarthLinux-${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 splitdebug"
+IUSE="bundled-libs"
+
+QA_PREBUILT="*"
+
+# TODO: find a way to unbundle libQt
+# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	sys-auth/nss-mdns
+	sys-devel/gcc[cxx]
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	virtual/ttf-fonts
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	!bundled-libs? (
+		dev-db/sqlite:3
+		dev-libs/expat
+		dev-libs/nss
+		sci-libs/gdal
+		sci-libs/proj
+	)"
+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!"
+}
+
+src_unpack() {
+	# default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
+	unpack_deb GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb
+
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs"
+		cd opt/google/earth/free || die
+		# sci-libs/gdal
+		rm -v libgdal.so.1 || die
+		# dev-db/sqlite
+		rm -v libsqlite3.so || die
+		# dev-libs/nss
+		rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \
+			libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \
+			libsoftokn3.so libssl3.so || die
+		# dev-libs/expat
+		rm -v libexpat.so.1 || die
+		# sci-libs/proj
+		rm -v libproj.so.0 || die
+		# dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
+#		rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die
+#		rm -rv plugins/imageformats || die
+	fi
+}
+
+src_prepare() {
+	# we have no ld-lsb.so.3 symlink
+	# thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
+	einfo "running patchelf"
+	patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
+
+	# Set RPATH for preserve-libs handling (bug #265372).
+	local x
+	for x in * ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" ||
+			die "patchelf failed on ${x}"
+	done
+	for x in plugins/imageformats/*.so ; do
+		[[ -f ${x} ]] || continue
+		patchelf --set-rpath /opt/${PN} "${x}" ||
+			die "patchelf failed on ${x}"
+	done
+
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+}
+
+src_install() {
+	make_wrapper ${PN} ./${PN} /opt/${PN} .
+
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}-mimetypes.xml" || die
+
+	domenu google-earth.desktop
+
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} product_logo_${size}.png google-earth.png
+	done
+
+	rm -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_*
+
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms +x /opt/${PN}/${PN}{,-bin}
+	cd "${ED}" || die
+	find . -type f -name "*.so.*" -exec fperms +x '{}' +
+
+	pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	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"
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
index 90226518ba9d..f0ae04f58e1a 100644
--- a/sci-geosciences/googleearth/metadata.xml
+++ b/sci-geosciences/googleearth/metadata.xml
@@ -5,6 +5,7 @@
 		<email>hasufell@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name='bundled-libs'>Use bundled libraries.</flag>
 		<flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
 		<flag name="mdns-bundled">Use bundled nss-mdns library instead of depending on sys-auth/nss-mdns. Enable this if you want to avoid the deptree.</flag>
 	    <flag name="system-qt">Use Qt4 libraries from portage instead of the bundled ones.</flag>