Version bump. Enables qt-bundled flag by default due to crashes on startup.

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

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 323e8be0ea8187f9ae9dbd67a4977d769cd30264..9bbe9ff2cfb6e6e9be2fb64299561e5ee02dabf6 100644 (file)
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2010/06/15 07:56:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.13 2010/06/15 08:55:42 caster Exp $
+
+*googleearth-5.2.1.1329_beta (15 Jun 2010)
+
+  15 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+  +googleearth-5.2.1.1329_beta.ebuild:
+  Version bump. Enables qt-bundled flag by default due to crashes on
+  startup.
 
   15 Jun 2010; Vlastimil Babka <caster@gentoo.org>
   -googleearth-4.2.205.5730.ebuild, -googleearth-4.3.7284.3916.ebuild,

diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 25901de31a3d9d42c1a710edadc856d6024c671b..99956a61f46d7139ffd03bcd0a8364cb26a424e6 100644 (file)
--- 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.3533.1731.bin 25989559 RMD160 4ec6fc65e9822dee7bdea0b1a0966dbd4b7b6b96 SHA1 e64f2840bf7161b9860c4d99e9de0c27f960e131 SHA256 6f477f1acac653ae218df0df998ef5c658bf08c8c554be1a92027eb1b80dbaeb
 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
 EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3
 EBUILD googleearth-5.1.3535.3218-r1.ebuild 3871 RMD160 7f0721a2558a48da6c33a84ffc90bc06e0d877a7 SHA1 bc91d588c56a99f1be79f05813246f2a065d7cad SHA256 0b6cd71f09d02ca14c603bf20cc92c21b5160b7b00d72f90f4fa195970dbd509
-MISC ChangeLog 13491 RMD160 d2145194e18b9bdb7247f023c8a42cb858b05ff9 SHA1 f48ce91c076015a8315b51965633f135590fa062 SHA256 7a04987c5244bd5fbefef27fc99dec35822a2dad3e30968bc4f5e4401e33895f
+EBUILD googleearth-5.2.1.1329_beta.ebuild 4403 RMD160 dccba7475803b26dd0759c3203f8dea4307d72d0 SHA1 dc08efa0361f08d7d16e7371e742f31d6d6b2cb6 SHA256 fcef047fa1a0d8424074682cfbec869e9579413894d17e5a916576336a55dafd
+MISC ChangeLog 13706 RMD160 902b3b8867e7cd69cbd57845527a67b215ddd727 SHA1 8cea5bf67a3595af5158b9a57d9df6c483f4d503 SHA256 f0d4e4fd14b338161d1534c5d0eec9d2c52be1e41406071ab91c0d0a81070a22
 MISC metadata.xml 613 RMD160 cfe7468be5f1fa85b0c0f36bc70e3fa33f0bcd29 SHA1 26dd871ce06415fb9323e1b91127ab81928538e6 SHA256 d9baa8e942136a47ef41fa76f025f3af6933f4fb534cb225fb553f8a6ca33382

diff --git a/sci-geosciences/googleearth/googleearth-5.2.1.1329_beta.ebuild b/sci-geosciences/googleearth/googleearth-5.2.1.1329_beta.ebuild
new file mode 100644 (file)
index 0000000..990ff65
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-5.2.1.1329_beta.ebuild
@@ -0,0 +1,162 @@
+# 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.1329_beta.ebuild,v 1.1 2010/06/15 08:55:42 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."
+}