Version bump, bug #368405.

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

4 files changed, 201 insertions, 7 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index c897ac59b416..da6f808b502a 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.23 2011/04/22 13:03:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.24 2011/05/24 16:29:44 caster Exp $
+
+*googleearth-6.0.3.2197 (24 May 2011)
+
+  24 May 2011; Vlastimil Babka <caster@gentoo.org>
+  googleearth-6.0.2.2074.ebuild, +googleearth-6.0.3.2197.ebuild:
+  Version bump, bug #368405.
 
   22 Apr 2011; Vlastimil Babka <caster@gentoo.org>
   -googleearth-6.0.1.2032_beta.ebuild:
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 67cdfee51f2f..95809570f867 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -3,8 +3,10 @@ AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6
 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
 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.2.2074.ebuild 5254 RMD160 4a43592fb673cc51cde96619be114380d5ac44b3 SHA1 bd16707fa3f57847e1a129b88c86ca84e6396646 SHA256 8ff4fc142f96893890a0da3b38de8bb853d67d99886c088a1ebc0ec365b647b0
-MISC ChangeLog 15922 RMD160 3e67b51d61a7c0fde68eb7c80848c2c7d9f0aacf SHA1 95c3c70a01561a7aabdbd0d18b11e1aa26a141aa SHA256 b625eee872a8533d3901a82a972217ad8824b8b720e57c6cb70e6e813f15ad8b
+EBUILD googleearth-6.0.2.2074.ebuild 5532 RMD160 f6d244d274fcdfde0537c000a8a54ffcfdc497b7 SHA1 1becbad9f30a916daae77d40c60d1a4ede230fa0 SHA256 62b3c685142e7a6224703a6bd19386c8e31c0dfda499af27319b990ef23e890a
+EBUILD googleearth-6.0.3.2197.ebuild 5251 RMD160 bb8ec2d9259b0384ca85baf55007f9e291a8319b SHA1 40750971ded741c53c40a03dce172a3cfe343a2c SHA256 f33ef625b319bc4e37aea6df58e0356f5544d83e81b28a3cf42cc8f671b673c0
+MISC ChangeLog 16107 RMD160 90ea320ac7b56f26eeffd1442cebbdb7a53a77fb SHA1 76e6b4e4f8533ec26d1876c9121aa640fd103d37 SHA256 dda472b44372d4e66998780d99e24b1e44eface4a76efe18ba0b45986ed1d2a4
 MISC metadata.xml 613 RMD160 cfe7468be5f1fa85b0c0f36bc70e3fa33f0bcd29 SHA1 26dd871ce06415fb9323e1b91127ab81928538e6 SHA256 d9baa8e942136a47ef41fa76f025f3af6933f4fb534cb225fb553f8a6ca33382
diff --git a/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild b/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild
index b01c14941f1f..2d3691f44dc1 100644
--- a/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild
+++ b/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild
@@ -1,6 +1,6 @@
 # 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.2.2074.ebuild,v 1.2 2011/04/03 09:57:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild,v 1.3 2011/05/24 16:29: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/current/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"
@@ -60,6 +59,14 @@ DEPEND="dev-util/patchelf"
 S="${WORKDIR}"
 
 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 newer versions."
+	elog "If you can get the distfile from e.g. another computer of yours,"
+	elog "copy the file ${SRC_URI} to ${DISTDIR}."
+}
+
+
+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!)."
diff --git a/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild b/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild
new file mode 100644
index 000000000000..259a462a917d
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild
@@ -0,0 +1,179 @@
+# 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.3.2197.ebuild,v 1.1 2011/05/24 16:29: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
+"
+
+QA_DT_HASH="opt/googleearth/.*"
+
+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 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, disabling tips is reported to help (bug #354281)."
+}