Version bump, fixes bug #348911. Thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf to work around missing lsb symlinks. Update SRC_URI for 5.2.1. Mark 5.1 as fetch restricted as the distfile is gone.

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

5 files changed, 210 insertions, 13 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 18763fbc2984..c2e83cb0dac9 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,16 @@
 # 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.19 2010/09/13 14:38:55 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.20 2011/01/31 16:05:44 caster Exp $
+
+*googleearth-6.0.1.2032_beta (31 Jan 2011)
+
+  31 Jan 2011; Vlastimil Babka <caster@gentoo.org>
+  googleearth-5.1.3535.3218-r1.ebuild, googleearth-5.2.1.1588.ebuild,
+  +googleearth-6.0.1.2032_beta.ebuild:
+  Version bump, fixes bug #348911. Thanks to Nathan Phillip Brink
+  <ohnobinki@ohnopublishing.net> for suggesting patchelf to work around missing
+  lsb symlinks. Update SRC_URI for 5.2.1. Mark 5.1 as fetch restricted as the
+  distfile is gone.
 
   13 Sep 2010; Vlastimil Babka <caster@gentoo.org>
   -googleearth-5.2.1.1547_beta.ebuild, googleearth-5.2.1.1588.ebuild:
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 13547d11d380..263b91acc203 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.1588.bin 31406473 RMD160 181ed85cb057a2c2eca97f28c07bcda40a2fa0da SHA1 75a458be01c331ac6d4dcd29f91d562fc3dfc604 SHA256 2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30
-EBUILD googleearth-5.1.3535.3218-r1.ebuild 3869 RMD160 a9b5cf0f7f1d27517e8cd9eacbb3e2457226aff0 SHA1 04ec226d21497ad8e48f407c114868c881efdf61 SHA256 181f7fd6dfc95fb7410c4ca6b3605772281008fd4a83073ad0f1dcf6a652ece0
-EBUILD googleearth-5.2.1.1588.ebuild 4979 RMD160 9cc48638d93956ab8e5671ec3496c8da5cd480ee SHA1 be250d612a2e0bccf9e53aeae9ae2114e4e72176 SHA256 911b5503d7bdd85db9be534e6ca6d45e52f02dc88d2275a9fd1fb19249542768
-MISC ChangeLog 14866 RMD160 566a555cbc9bb3065e029a32344fb6e902dd3da1 SHA1 5ca17ff15f08990d7d5eb661514c4cdca9f48227 SHA256 061be1739d776c2e8ff41f45ff1ad653434bc231bb8222df7f0e7de846a19d4a
+DIST GoogleEarthLinux-6.0.1.2032_beta.bin 33589497 RMD160 5b7f2499a4ee6511348a7c658c2fc3be4987bdcf SHA1 784a9568f9c89682bb787a93644ce03052a0cfea SHA256 d52d39ee33957b0300bd63a78f8822eb80ce98f451bdbca903afe995cec86c95
+EBUILD googleearth-5.1.3535.3218-r1.ebuild 4275 RMD160 b65a8949faf8a33b0f9a3a7d3ebcef49aa1ee247 SHA1 05d5b08928e7d11434eeb43334a71e7114abdeef SHA256 fddfd51de530792d4c6dbce1a148a40c4cc852869d655bc3958e02dda590f603
+EBUILD googleearth-5.2.1.1588.ebuild 4989 RMD160 bd743836cf26222612c26724446b7d0b23bd43b5 SHA1 a6dbb59c3051f55cf97de118bd34476b05f835f1 SHA256 7a0f24411663cbc1d577c7008266dcaf61879ccde5485453afe5d0551d44de2c
+EBUILD googleearth-6.0.1.2032_beta.ebuild 5254 RMD160 edea7d14cd1c49dbcacd12bc92e4e65d33ad78b5 SHA1 f8e20ae27bb5c6192e928359a0ddd503d2cb736d SHA256 d6b8df5b342b1f13413f10fe8f49d0c15ffaf29c83561c6d7ed54bd598d66992
+MISC ChangeLog 15315 RMD160 c4db9c8a69548d8f7c6c7d2105b6d1b648c54d49 SHA1 8db151968998d5674372c57a85647ad9c12d7c54 SHA256 a37fdfc7df5136d4741deb560594ac7bf0c3ad378bd9a7f514141ed85378453a
 MISC metadata.xml 613 RMD160 cfe7468be5f1fa85b0c0f36bc70e3fa33f0bcd29 SHA1 26dd871ce06415fb9323e1b91127ab81928538e6 SHA256 d9baa8e942136a47ef41fa76f025f3af6933f4fb534cb225fb553f8a6ca33382
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
index fa9ce9d1e306..cb1f98dd098a 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.4 2010/06/20 16:41:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.5 2011/01/31 16:05:44 caster Exp $
 
 EAPI=2
 
@@ -10,13 +10,12 @@ 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/advanced/previous/GoogleEarthLinux.bin
-			-> GoogleEarthLinux-${PV}.bin"
+SRC_URI="GoogleEarthLinux-${PV}.bin"
 
 LICENSE="googleearth GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-RESTRICT="mirror strip"
+RESTRICT="fetch strip"
 IUSE="mdns-bundled qt-bundled"
 
 GCC_NEEDED="4.2"
@@ -147,3 +146,12 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
+
+pkg_nofetch() {
+	elog "This version is no longer available from Google and the license prevents mirroring."
+	elog "This ebuild is intended for users who already downloaded it previously and have problems with 5.2+."
+	elog "If you can get the distfile from e.g. another computer of yours,"
+	elog "copy the file ${SRC_URI} to ${DISTDIR}."
+	elog "Otherwise, you need to unmask 5.2 or higher version."
+#	elog "stabilization is tracked at https://bugs.gentoo.org/show_bug.cgi?id=320065"
+}
diff --git a/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild b/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild
index a5e9e9111c48..c85513d885d5 100644
--- a/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.1588.ebuild,v 1.2 2010/09/13 14:38:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild,v 1.3 2011/01/31 16:05:44 caster Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ 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
+SRC_URI="http://dl.google.com/earth/client/advanced/previous/GoogleEarthLinux.bin
 			-> GoogleEarthLinux-${PV}.bin"
 
 LICENSE="googleearth GPL-2"
diff --git a/sci-geosciences/googleearth/googleearth-6.0.1.2032_beta.ebuild b/sci-geosciences/googleearth/googleearth-6.0.1.2032_beta.ebuild
new file mode 100644
index 000000000000..ce9788748dcc
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-6.0.1.2032_beta.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.0.1.2032_beta.ebuild,v 1.1 2011/01/31 16:05:44 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"
+
+DEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+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/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
+opt/googleearth/libspatial.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"
+
+	# 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 googleearth-bin || die "patchelf failed"
+
+	# 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.*"
+}