Version bump to resolve fetch failure (bug 413857, thanks Tina). Non-maint commit.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 23 insertions, 196 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index dbf96305d1bc..028f8e73dccc 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.30 2012/03/10 07:50:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.31 2012/05/05 11:03:09 xmw Exp $
+
+*googleearth-6.2.2.6613 (05 May 2012)
+
+  05 May 2012; Michael Weber <xmw@gentoo.org> -googleearth-6.2.1.6014.ebuild,
+  -googleearth-6.2.1.6014-r1.ebuild, +googleearth-6.2.2.6613.ebuild:
+  Version bump to resolve fetch failure (bug 413857, thanks Tina). Non-maint
+  commit.
 
   09 Mar 2012; Vlastimil Babka <caster@gentoo.org>
   googleearth-6.2.1.6014-r1.ebuild:
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 7e2c5e2ab680..73e58a5f3108 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX decimal-separator.patch 324 RMD160 88c5c41517d4195a1f6ad03f58762021fe9ff255 SHA1 82b6920a3ac9ffd4481fe31f60bc72e22e0d4093 SHA256 5c1ffe3cb7b7328245d92c627f8b8d963a9a2aab67c70b5387b151f78b04c051
 AUX googleearth-mimetypes.xml 638 RMD160 2af02c7144488d0364d883659644281f5671e57b SHA1 b80e6e2d4f0be664cf4678d9ad92a74a58ce0b2e SHA256 71e57a7370dc2c0eb6b85e2bbb5282ed7a7542e58f849a20282b1627cef9b2b9
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
@@ -5,13 +8,19 @@ DIST GoogleEarthLinux-5.1.3535.3218.bin 25932414 RMD160 46d7a763e835d657798f3cd1
 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
-DIST GoogleEarthLinux-6.2.1.6014_amd64.deb 25548980 RMD160 65686f688d9e8d6cfcda690507a327739ab6dc12 SHA1 605ef731b9053f34548642a2563aa55c55ed9fc7 SHA256 e046b56f632260d215db0118b1382cfde070d5985300d23d9ecc1ef8bd3891d9
-DIST GoogleEarthLnux-6.2.1.6014_i386.deb 25534464 RMD160 5212e0266f67d776236ebb175c191f8d680a1fc7 SHA1 708963d1a63e590ef85526400bc146cf6bf155f9 SHA256 b63006a20184c0aa0503acaa82bab65841163a0b48cc075a9523f774b83b6bd3
+DIST GoogleEarthLinux-6.2.2.6613_amd64.deb 25609162 RMD160 0ad2ced1c0647cc047b8547c7c46c68f311ea1e8 SHA1 fa1f410eaf94a14c8e47594dc0618b0bf7cfb8bb SHA256 a67021ed74fd1821ba0a63e141320ca0bcd78ab618dd368629e500d208d12525
+DIST GoogleEarthLnux-6.2.2.6613_i386.deb 25620810 RMD160 8548ff1caca350625362fdd7a711e8b1129b0703 SHA1 4f860b4b0ee36e97a93a97895821ad18e8ca7a1e SHA256 e309ce1493dec6abc742037b1e6822b08771827db59ee7e5d5da56cb40c92111
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 4326 RMD160 83a04fbe9bb9b611ff6824197648b6e5cd63a9ca SHA1 ad2a7f74037607c4331b8d23d19c64dceec3981b SHA256 cf7c2f3f014abade98f4429944e18f8a2a8a6d667b1e482aa55bbb89655d77c9
 EBUILD googleearth-5.2.1.1588.ebuild 5040 RMD160 32e94e8f6341816758a1bccf46d33862594ee3d3 SHA1 bf5e834dcc573859a4076d5fab5c7e283487d961 SHA256 a81ae8f81789d9415279eef67cfd89cff543a93fdf96bd20fa087d1ad37c1ca5
 EBUILD googleearth-6.0.2.2074.ebuild 5582 RMD160 cacbb1e42d0e4df6179f167aae17f36ed849bcd2 SHA1 fabab63df9aabd342cecc2a2ebed7e2a2e2b2ab1 SHA256 04b55a843f80d625120689598f95ff7f9ee7260f0b61d3055b3391b2602709f8
 EBUILD googleearth-6.0.3.2197.ebuild 5302 RMD160 928cb43e0fec5991b2dd4b2d6e3a7c1e66ba7417 SHA1 18e33e0e39cbeda748041feb70e60142e3cd4c77 SHA256 b2025b02d47bac34b7d96c8a7b3216be9d5af8b48dcb762e6c081d6b2f425ea0
-EBUILD googleearth-6.2.1.6014-r1.ebuild 5259 RMD160 926a92facca66c6fd5bb6aa1272030f3de2f8449 SHA1 3db15fa195e4c92c2be54c8a47d821e315a0f047 SHA256 8711193cbb28d0777cce75bd4eda4bff5e5d7de456dc23bb022d6e18b053c841
-EBUILD googleearth-6.2.1.6014.ebuild 6226 RMD160 ff7bd4e678f3b0c0f14022b320823a7662f0abce SHA1 ad291e80c4034a674ca7e533f30d84713430909e SHA256 e06a93941eddcef20de40e11610f95681c5b2a86dc6cd0d0194ef68668467e57
-MISC ChangeLog 17439 RMD160 28d33aeedfccb84b1eb1a3c99d942e5c2636095b SHA1 fa4c412706e5934cf4e05a81c4c27131ffccfcb9 SHA256 9b16c5b19041eee10560899465099176563dd6eebd8264e041c4f7371c4e5b58
+EBUILD googleearth-6.2.2.6613.ebuild 5253 RMD160 ab01dbaff058899b2ce8e3478f63d9482c7d51a7 SHA1 4a70ba8cd10d450fbc298ddb3e2bf57e81d9aef7 SHA256 1fb9a7bce973c3c90450d98f0a32e1ff505bb124c3353676a2c9d80ba62ff52d
+MISC ChangeLog 17710 RMD160 452ce2b84cd5c97a348cf323599f228e4842bd62 SHA1 17476e483ec0cd32d81d7692f6f03ce5d1273ce7 SHA256 dfaf124159453a28dc833ba80d86425951262ea6738e5944803144d286e4ef0f
 MISC metadata.xml 592 RMD160 293f66d3138e8538252d9c542d1548305be543d7 SHA1 9c6cfc1f4066fb84dd77bc109651dc6526080ad7 SHA256 aeb2f5a091efa0e2325a89bf8501ca993ce235cb47847f3a95be339efb01bbb8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+lCOsACgkQknrdDGLu8JBHlAD+IHeqo4AnrCKDREauidoC2W/i
+Jrf5iBJkBIIWuboHizUA/if4jRX+Kh6XlXcDIt12aEoR3/f+Fj5pV2MP64vpeSdy
+=j1t7
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild b/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild
deleted file mode 100644
index ed0ad8a45108..000000000000
--- a/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.1.6014.ebuild,v 1.1 2012/03/01 23:07:28 caster Exp $
-
-EAPI="4"
-
-inherit eutils unpacker 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="x86? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb
-			-> GoogleEarthLnux-${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 strip"
-IUSE="mdns-bundled +qt-bundled"
-
-GCC_NEEDED="4.2"
-
-RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=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}/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!"
-}
-
-QA_TEXTRELS="opt/googleearth/plugins/imageformats/libqjpeg.so
-opt/googleearth/libQtGui.so.4
-opt/googleearth/libwebbrowser.so
-opt/googleearth/libviewsync.so
-opt/googleearth/libspatial.so
-opt/googleearth/libsgutil.so
-opt/googleearth/libsearch.so
-opt/googleearth/libsearchmodule.so
-opt/googleearth/librender.so
-opt/googleearth/libnavigate.so
-opt/googleearth/libmoduleframework.so
-opt/googleearth/libmeasure.so
-opt/googleearth/liblayer.so
-opt/googleearth/libinput_plugin.so
-opt/googleearth/libIGGfx.so
-opt/googleearth/libgps.so
-opt/googleearth/libgooglesearch.so
-opt/googleearth/libgoogleearth_free.so
-opt/googleearth/libgoogleapi.so
-opt/googleearth/libgeobaseutils.so
-opt/googleearth/libgdata.so
-opt/googleearth/libflightsim.so
-opt/googleearth/libevll.so
-opt/googleearth/libcommon_webbrowser.so
-opt/googleearth/libcommon.so
-opt/googleearth/libcommon_platform.so
-opt/googleearth/libcollada.so
-opt/googleearth/libbasicingest.so
-opt/googleearth/libbase.so
-opt/googleearth/libauth.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() {
-	# default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
-	unpack_deb ${A}
-
-	cd opt/google/earth/free || die
-
-	if ! use qt-bundled; then
-		rm -v libQt{Core,Gui,Network,WebKit}.so.4 qt.conf || die
-		rm -frv 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() {
-	# bug #262780 is hopefully now solved upstream
-#	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 ${PN}-bin || die "patchelf failed"
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-
-	# install binaries and remove them
-	binaries="${PN} ${PN}-bin *.so *.so.*"
-	exeinto /opt/${PN}
-	doexe ${binaries} || die
-	rm ${binaries}
-
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}-mimetypes.xml" || die
-	sed "s#/opt/google/earth/free/google-earth/#/opt/${PN}/${PN}#" -i google-earth.desktop || die
-	domenu google-earth.desktop
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins product_logo_${size}.png google-earth.png
-	done
-	rm -rf product_logo_* xdg-mime xdg-settings google-earth google-earth.desktop || die
-
-	# just copy everything that's left
-	cp -pPR * "${D}"/opt/${PN} || die
-
-	# some files are executable and shouldn't
-	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):"
-	elog ""
-	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"
-}
diff --git a/sci-geosciences/googleearth/googleearth-6.2.1.6014-r1.ebuild b/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
index cdf0e713aeab..bffd2e5d4b63 100644
--- a/sci-geosciences/googleearth/googleearth-6.2.1.6014-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.1.6014-r1.ebuild,v 1.3 2012/03/10 07:50:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.1 2012/05/05 11:03:09 xmw Exp $
 
 EAPI="4"