7.1.1.1888 version bump.

Package-Manager: portage-2.2.0/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 184 insertions, 12 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index ed39a950e3c9..7d59e622c4b1 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,11 @@
 # 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.54 2013/08/06 13:25:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.55 2013/08/18 22:38:13 zmedico Exp $
+
+*googleearth-7.1.1.1888 (18 Aug 2013)
+
+  18 Aug 2013; Zac Medico <zmedico@gentoo.org> +googleearth-7.1.1.1888.ebuild:
+  7.1.1.1888 version bump.
 
   06 Aug 2013; Ulrich Müller <ulm@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 8e26f8ad869f..7879a0f1764e 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -21,6 +21,8 @@ DIST GoogleEarthLinux-7.1.1.1580_amd64.deb 46423542 SHA256 bb134e6c67e6019b6c566
 DIST GoogleEarthLinux-7.1.1.1580_i386.deb 45551694 SHA256 5ed826f0903ed8426126f9f33824bbe2a46e77902e4c4ef037818c580bc505d4 SHA512 760fe2321d781ab9de50a680f33ca60b0fee341bbad3b5aaba62df29194727cb186bcbbeb2897488c24130f22c2df37cb0664a0813548892dd8ef79d27963652 WHIRLPOOL 4688a884dad3be74f8e00a089cddadfadf050ddea616237f11b79a7aeffc3b82bec1b6a7449863ddedc404dffd4f58159edd13967e16a3b999185638eaace3b9
 DIST GoogleEarthLinux-7.1.1.1871_amd64.deb 46448898 SHA256 9a55bc2c55a5f0fc7ecb8e9e7b78fd379559d1864dc2b093da315c3a0cbe7c32 SHA512 24f5924b92840a29da576c4121fc26e90bb576a8f921ad9078f65e04b86d090b0427330fb97399737ee2282ef78bd064392a1e14ca7309c37627fe02370233a7 WHIRLPOOL 4fa3be9a9336da068308e8d09756df030f734815b201a592d86d531b5c115e1126e3d52ec5cb2f7c9ff2930dde94004b124352e33cefba3cf2cb9a12da17f611
 DIST GoogleEarthLinux-7.1.1.1871_i386.deb 45567164 SHA256 d0bec49e0d129693b0f376f62db13bd92d1770d77bec4285cc88b465dd6c6c4a SHA512 13e8ac476d4a56fe3332babab5554d53b67062f31bfedf88d0c5e0ccca3f62b73d3fd369d0c274ff29cb5d30e10585ffd9ead4e2ad2896a5905a1dff2fd8c7fa WHIRLPOOL 15b0c95b7a638728f26ce86c4df30310145da61f7ddbd7a791a04b40f83d1336050a967ca6c7150b7f502812d96d51fb9fe36f7543632f907bdec5bbeb259ff3
+DIST GoogleEarthLinux-7.1.1.1888_amd64.deb 46428510 SHA256 920ff73bb39e1eb1ac0e8260f2ac15f4f4ff3def39a4b15bd4d18a7ece210274 SHA512 0bb1b35201652604b5f6c1a7f6e9f6ce9ea225e615c8a509cc35ba1def968b6a2bbd0ce99a9205c40fb8a938e68b850533e1a96066934ee6e72f9e9b61926167 WHIRLPOOL 4fc68ca5316560b844455e1d098c5c700b638d51e466d9cc9687be396dad13e03668882343c04632bfa9419b415cea4ce01d8796481fa665f9a65f7160501ba2
+DIST GoogleEarthLinux-7.1.1.1888_i386.deb 45541972 SHA256 e9231ade9e6d0750b320650c49396342674da9f2510b1f04b587584a7e3847b7 SHA512 fb4ca197045bfd0bbe642b69bbbd6f37e8d09c146312fe3b7f6e90eb7a78bb418e9c3be39908a5cfef1c7d1f382ac3bdd4e2dad049bb2777af9a7334bdee70e7 WHIRLPOOL 52f76c01002d18ee6afb59b5b53a8ac72ca92670f3ffbaa3bc6935d14acb1f8c8ac62a5c390cbed545cdda3ae02c7d37f601966dea125485dabe67da1a259632
 DIST GoogleEarthLnux-6.2.2.6613_i386.deb 25620810 SHA256 e309ce1493dec6abc742037b1e6822b08771827db59ee7e5d5da56cb40c92111 SHA512 2ac3b5d9eac0b8019635c9999b30eb9c27f0b31b54ba7386e5cb7ac27261cdfb41746179e7cf85632615b2957ce17929a155be21b811b205842c69ffc46fe3c4 WHIRLPOOL f08fc80dfcd549949f48d4c714c08be010b0151a046377527420de6fe0329ae0c5d01e3686a41958981e26c6267b5f8801126ad5d21c3784be2de97d15ec4501
 DIST googleearth-libexpat-2.1.0-novisibility.tar.xz 54812 SHA256 f300a3f76ef8350a9e681005c4d6ec5ba086e7f12acc7b83b68445e770dec6c9 SHA512 21f0510f391e242a2a87191ecb53f45bf837801b8e8e937dd50b6ff454b52d0dd4d31f32461add7604226d786a188a3a2a8dd86c86f9678c8d317b0d432f91e3 WHIRLPOOL 55440c3924735cf03b8c283c7f4787b735fa5dad62dfa753332b5c149ebe9a4734a24924a6a12b12a43c7292d544d0e971fd92d84ebe751fa439afffc54f1dae
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 4639 SHA256 09fa63a7bea6e04f379eb695247ef35ad740a7f097d37048b3bb66323f2ae299 SHA512 0bc33d35cd87383748731726c3439c273295554bb0afc2b4ffb2d3205d30d9fc261510d78f1854b857ef2c10394c660b2d3ed11b3fe2b510439d82c8aa92baa5 WHIRLPOOL 7520f6b383465dd8e2130d9b6bdaaf2e16db57b4927ec03ea43763f937fd624bf10ad89a326ba27a09382632f23b323af7161980f7ad321519eafec69e87e111
@@ -33,19 +35,13 @@ EBUILD googleearth-7.0.2.8415.ebuild 6251 SHA256 33ccf8298a027c50dc6f07920f7d640
 EBUILD googleearth-7.0.3.8542.ebuild 6229 SHA256 de6fae2adfc852117e53bb1566d5c57a295883f51fb4301082d64b58dc73c4b3 SHA512 ade16f7337e5b2ebc502aae6eeb31055da84f0ffe24c6f1e739983b16e47ed2f3ba86bbdb664f3e04fa65a6b4c984d74d7a5b76b1c2526d2a98965e62fceb1dd WHIRLPOOL 6cbfdeadc39fbf7144da9a9e662fed0aa30365602ceb514eb08970ae9206fbe00ab12aafddc348c64a165f67cb8a8c61974faa259ae9482a8e2cc5d44a1cb356
 EBUILD googleearth-7.1.1.1580.ebuild 5098 SHA256 648c83fb6daba27cf9faf165086ce69afa9ccf469932d30ada4fe73926fae27b SHA512 3ac5a55a3e0cfeae901f0ab1ae7a859312f973d95eaacc2f4c2be0679eecf09aba36d518500ac6a92ac49708bbfeea3bcf19afed51be56f39807f3879f0f2e28 WHIRLPOOL 2cdd9ba1c9e5048a4ec7e895d1864c0deb3285e0bf405d3636d9f0c89043dd3e7c564b1c518c6bbf1bc7c639ec1c6533ab339e055a34324895c2fbfffc316862
 EBUILD googleearth-7.1.1.1871.ebuild 5099 SHA256 402aa157e101a19c52a6343f78bd0bfd062ffe84140aed7d0a5728d82495fb68 SHA512 b295bda4c9c72390468d52f6ec14948c79a44169c3c2834da3c9abfed4c9712c0585b1e0813a31755e3dd97c8a6601ce9a5e0755b1d58de7d315bdda0d02d140 WHIRLPOOL 8745350bddacef1a7a5acdd9352c69620b7e7acf8e391aebc41df155f8512eafc1f468e4b26b7f39469f8a2aa3df938cec8702f21a1fd7efcf18ecf56e20e210
-MISC ChangeLog 22207 SHA256 c8185361b0b2d2c271b4b668ad0b74b2332ef70c4500e3c079f83e897a225f12 SHA512 4cf5b963434a65a829b4f2d0af0d4f18816fca632fd82aeb4b383a430517285f22e65865b3833cedf93abd643db33332ecbb64678c34f7e02696b57b9be2e472 WHIRLPOOL 94bb14b1caf818548372e02b5030751dad876e761e7c789f9c86547c17d46fdd8d1b9858f14075d2e2eaf44dfcd301e17672626061991ccdd4546c925bf67b3b
+EBUILD googleearth-7.1.1.1888.ebuild 5259 SHA256 4f60bfd30f088466458084951459595862b1c51a45a09f8f502fc9dc441167c9 SHA512 536e1ce84213d96e283f422eb0c5c2715b6120aed8de6294e96521a873b339097855373fdbca3ee132b504898b21559ae019b3050760a94efe6863217129152f WHIRLPOOL 9a9f029e3b7ff2446e226ab64db825841ab21883a75669dee41fa44c68fef3cbf6b5cdebb0b61812453c21c62619f754f50b6664c67ec99fbad368c07ae654a3
+MISC ChangeLog 22357 SHA256 7c72f2d40dcf8c8f899d52f13ac7ea0ae14b83027888d83eb6f54ac066d3cef7 SHA512 0cd25e2783f67ca7e5db94a156c08ec92f162e322ee6cd2d00310797ff3fe3ba0d026962d64722f8db030c615c5db2e4bbc527601e8076988e636380728a0b68 WHIRLPOOL 11a508fdef03f12bd3e0c67acdd950ee4b5d00252602e5721e0755c1f3f3f4d1e3ea8901baf58bbecb5f1d699dc9c8b0e1772108a85180e6412ef6976630f161
 MISC metadata.xml 746 SHA256 9dfe6e55085abd2e932cc48548423ce758f1a5cc0deedbcd639a4e6ee9eac426 SHA512 3efbd613632394e8a67f945be66ef8825441fddba5af1c22ed4b53b92a77253fac0ba67c2d6552dddf0ae6d21f4597df555bb96f8361bbb780a1d17168490f18 WHIRLPOOL 9de016c0ec5289ec7f9638d3c70fe34da1c1182049c799d29773ddd936ba386db3685949b9221551b0d3313499ab2f81b45d6a2565f345c3fca5cbaf3faa5086
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSAPm8AAoJEJQzkH1pP7W4o7YL+wTzek0iXcKWNirVSzshFzAn
-uXzWLEZg+gItgLuvbAGCKERVDiAvBmTgM1727L7CR7NgHNKhv96Wn/4OkTZqABXQ
-TZLkvkbwAZsdxM5GFpwt+MLnzKoiR6OREkVQ05R4NgN3A7tabY1HQpkGCI3J0O+M
-JE8Rq96B3PKZOelXh49JX/BzSpSYMVan9Wv/d1fTitpebgwvBZLeeIJeIb6tHVbz
-gA5CzucQKwD3SJE0bCEL0i3FfdT/BrGkXXLYl4dNNxTw0JLwfcdNoX0h68H2M9NC
-zH/rimLhBWwholl50BMUHJpguDA1/WoLIEkb73DvwQJgLJxdMeAbuSGLeVfqWdif
-62q+Yqa/CzvSwRU1qNSJUSRynuHUQPsceW8TdeNHTotf1sgs8V8udDBj4i+2/hXW
-Zg7yqqu8acveUO9Sb8mg1siZUz01lea/3aDd3JCowa2ZdYZdz5n59yiYSs4enmcT
-tr+9YXpoii9LxO4oFjA+1FB9vgkyC3CHMMwqK9qlrQ==
-=Eb2H
+iEYEAREIAAYFAlIRTNYACgkQ/ejvha5XGaP/MQCfXjISWk2k/EzD8qW7eLi2iEcD
++eIAoOh5H01UskYV/KYsHQoixxqcueOH
+=qS8V
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-7.1.1.1888.ebuild b/sci-geosciences/googleearth/googleearth-7.1.1.1888.ebuild
new file mode 100644
index 000000000000..758a2df6702f
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-7.1.1.1888.ebuild
@@ -0,0 +1,171 @@
+# 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.1888.ebuild,v 1.1 2013/08/18 22:38:13 zmedico 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-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/*.so ; do
+		[[ -f ${x} ]] || 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 '$ORIGIN/../..' "${x}" ||
+			die "patchelf failed on ${x}"
+	done
+
+	epatch "${FILESDIR}"/${PN}-${PV%.*}.1871-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
+}