Version bump, fixes bug #333487.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 173 insertions, 2 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 1e2a01c60a14..d7aebc45ad0b 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.16 2010/08/03 11:26:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.17 2010/08/22 17:26:07 caster Exp $
+
+*googleearth-5.2.1.1547_beta (22 Aug 2010)
+
+  22 Aug 2010; Vlastimil Babka <caster@gentoo.org>
+  +googleearth-5.2.1.1547_beta.ebuild:
+  Version bump, fixes bug #333487.
 
   03 Aug 2010; Vlastimil Babka <caster@gentoo.org>
   -googleearth-5.1.3533.1731-r1.ebuild, googleearth-5.2.1.1329_beta.ebuild:
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index d735cbb7d5ae..6b1bdb500c78 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -2,7 +2,9 @@ AUX decimal-separator.patch 324 RMD160 88c5c41517d4195a1f6ad03f58762021fe9ff255
 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.1329_beta.bin 31388873 RMD160 bdcff2860eb590f223277cbfa14e49fa2cdee2d0 SHA1 1a72482a675ec65fcf5c24833a580485d17d46de SHA256 97dc80a6cdadfd356ba2ec2b5cad6e6d08303da47e95274621270e74ed1ae3c6
+DIST GoogleEarthLinux-5.2.1.1547_beta.bin 31399370 RMD160 37ad0c000a50d1fc953c9570d75aac6b8673aa40 SHA1 8a11f50131901d647f82ff7c1eb075b076bf9463 SHA256 dbe73f8deaaeb9e4354594c13693bb0290160745ba7e68b708dbadb80250ff11
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 3869 RMD160 a9b5cf0f7f1d27517e8cd9eacbb3e2457226aff0 SHA1 04ec226d21497ad8e48f407c114868c881efdf61 SHA256 181f7fd6dfc95fb7410c4ca6b3605772281008fd4a83073ad0f1dcf6a652ece0
 EBUILD googleearth-5.2.1.1329_beta.ebuild 4523 RMD160 75258894c58054c95ea94f651621de0568e0a3e9 SHA1 8565b6183f3d9b0a0664ccb8b5d2d32bbfbb92e2 SHA256 638b20b178ebec92a040c8ce6feb7516234df0fc0a1adbf3617d20f62312bdae
-MISC ChangeLog 14213 RMD160 6edd1b17dea7662dcc00ab525a376bf2889992aa SHA1 41ffe81e4cf4e75cb72645431be9ad29578f7a6b SHA256 5c7a3aff5b56c7f8ffdcbfd50943f6dca0e624a753e17eef6b81f346e8546036
+EBUILD googleearth-5.2.1.1547_beta.ebuild 4523 RMD160 b60470dd4a66db87f7825394dffb3e0f1b7630c7 SHA1 ca29cdf330bee96ec427a84f339b8aad3272986b SHA256 eaad578fe37275aa168a0a34545f6099fd78c6b72d21cedcba2fbac9bf388e66
+MISC ChangeLog 14383 RMD160 7a6441678d86ca99a477d0421cdecba240f8f437 SHA1 d8681989b686093aa7bebbf954010753c5b60394 SHA256 d89a8f65805a89553c843c20db1ee8e1b0d64016e13e8a6cdc423dfe84d65696
 MISC metadata.xml 613 RMD160 cfe7468be5f1fa85b0c0f36bc70e3fa33f0bcd29 SHA1 26dd871ce06415fb9323e1b91127ab81928538e6 SHA256 d9baa8e942136a47ef41fa76f025f3af6933f4fb534cb225fb553f8a6ca33382
diff --git a/sci-geosciences/googleearth/googleearth-5.2.1.1547_beta.ebuild b/sci-geosciences/googleearth/googleearth-5.2.1.1547_beta.ebuild
new file mode 100644
index 000000000000..d0a1d867b902
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-5.2.1.1547_beta.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1547_beta.ebuild,v 1.1 2010/08/22 17:26:07 caster Exp $
+
+EAPI=2
+
+inherit eutils 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="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
+			-> GoogleEarthLinux-${PV}.bin"
+
+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}[-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"
+
+S="${WORKDIR}"
+
+QA_TEXTRELS="opt/googleearth/libflightsim.so
+opt/googleearth/libwebbrowser.so
+opt/googleearth/libinput_plugin.so
+opt/googleearth/libIGGfx.so
+opt/googleearth/liblayer.so
+opt/googleearth/libbase.so
+opt/googleearth/libevll.so
+opt/googleearth/libmoduleframework.so
+opt/googleearth/libcommon_webbrowser.so
+opt/googleearth/libbasicingest.so
+opt/googleearth/libsgutil.so
+opt/googleearth/libnavigate.so
+opt/googleearth/librender.so
+opt/googleearth/libauth.so
+opt/googleearth/libgeobaseutils.so
+opt/googleearth/libcommon.so
+opt/googleearth/libQtGui.so.4
+opt/googleearth/libcommon_platform.so
+opt/googleearth/libgoogleearth_free.so
+opt/googleearth/libcollada.so
+opt/googleearth/libviewsync.so
+opt/googleearth/libgps.so
+opt/googleearth/libgooglesearch.so
+opt/googleearth/plugins/imageformats/libqjpeg.so
+opt/googleearth/libmeasure.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() {
+	unpack_makeself
+
+	cd "${WORKDIR}"/bin || die
+	unpack ./../${PN}-linux-x86.tar
+
+	mkdir "${WORKDIR}"/data && cd "${WORKDIR}"/data || die
+	unpack ./../${PN}-data.tar
+
+	cd "${WORKDIR}"/bin || die
+
+	if ! use qt-bundled; then
+		rm -v libQt{Core,Gui,Network,WebKit}.so.4 ../data/qt.conf || die
+		rm -frv ../data/plugins/imageformats || die
+	fi
+	rm -v libGLU.so.1 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() {
+	cd "${WORKDIR}"/bin || die
+	# bug #262780
+	epatch "${FILESDIR}/decimal-separator.patch"
+
+	# 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.*$::" "${WORKDIR}"/postinstall.sh || die
+}
+
+src_install() {
+	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
+	./postinstall.sh
+	insinto /usr/share/mime/packages
+	doins ${PN}-mimetypes.xml || die
+	domenu Google-${PN}.desktop || die
+	doicon ${PN}-icon.png || die
+	dodoc README.linux || die
+
+	cd bin || die
+	exeinto /opt/${PN}
+	doexe * || die
+
+	cp -pPR "${WORKDIR}"/data/* "${D}"/opt/${PN} || die
+	fowners -R root:root /opt/${PN}
+	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, put this version in your package.mask and revert to the stable 5.1.*"
+}