Version bump, bug #320065. Progress on lib unbundling thanks to tommy, bug #212373.

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

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 59d554550495d59fd45c37ef20fb16f8cd0c0c46..6b95e36c338c0882079847ef4895b617444bacc3 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.3 2010/04/26 19:06:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.4 2010/05/16 23:07:07 caster Exp $
+
+*googleearth-5.1.3535.3218 (16 May 2010)
+
+  16 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +googleearth-5.1.3535.3218.ebuild:
+  Version bump, bug #320065. Progress on lib unbundling thanks to tommy, bug
+  #212373.
 
   26 Apr 2010; Markus Meier <maekke@gentoo.org>
   googleearth-5.1.3533.1731-r1.ebuild:

diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 2df98b9600227af420a0515ca746de00174cd0e2..cc9f1254fa84dd2cc73e18248bba5f48e4b7b619 100644 (file)
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX decimal-separator.patch 310 RMD160 730861674fc8f07aa13ad5577840fcce34a3f9d2 SHA1 85552fc1988791f44c22ca355839d0f358076437 SHA256 0a5bf3024562484ff95ae369c956ee126d6ae59f201e65ef8e72695bda0946a0
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 DIST GoogleEarthLinux-4.3.7284.3916.bin 20554977 RMD160 de8f92a45b72d37ba66bc33dd20b2bd59df79fad SHA1 35b883f75ca0da4cc4b5888d345ed5ec2a53123e SHA256 aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
 DIST GoogleEarthLinux-5.0.11733.9347.bin 25606194 RMD160 ba61c88c38eefad655cf0de4b17f033640783a2c SHA1 4aa2b565523dc6ee9592a0f96760297fc06f762c SHA256 fde44633607cb762810e14e8fe7c9755a1c9b04c10fbb712c2ab899274716b9a
 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.bin 23048189 RMD160 bf8994f6aa9f4204510023ac629c331789e3969b SHA1 25b4b546625423b2e570ff8aae5ee7eff49a1b97 SHA256 da7d22cb13cc5f047dea6ae241bb33c5ac1789a9f601e09dcb025fe574df4516
 EBUILD googleearth-4.2.205.5730.ebuild 2061 RMD160 cc75ccf1886e5f55e6f523a6defa240f2268d7e5 SHA1 ed22fc343087d37420f9fc9d238dabb4eeffa6d7 SHA256 850dd6c0e18ef86152f166d53cccfa298b4b338dfc20a71cd2ff01e190e28992
 EBUILD googleearth-4.3.7284.3916.ebuild 2147 RMD160 78c1b7c4c8c59097d8a8058df9f149c530512d8d SHA1 9d088ab4f4faf42be813ad0db9d597b38472f15a SHA256 44163550eda61ec3528b892f2e6c017fae1f4bcec81c909db3883bb5ce8b3f16
 EBUILD googleearth-5.0.11733.9347.ebuild 2530 RMD160 00d41a87cd831a78d08e888c706c18c73b0dfa88 SHA1 ebc64b053aa0ae76451a317214986bf4384f81b3 SHA256 57b67c2f630e40011128d69e53c98e2c8144ded973ab7ee483b20309abc434e4
 EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3
-MISC ChangeLog 11308 RMD160 e30393fcb117cb6600139b1ca7da1649043f4466 SHA1 4029078151dd5d754645fcd7c8349a77f4b196a0 SHA256 fcf64e71ec45086508f73c39ea8047ddc044844b72e706f6f577cbb3c9f5338b
+EBUILD googleearth-5.1.3535.3218.ebuild 3739 RMD160 fec64c34a7f65ad724eadcf6ccd5e7fe34b5da9d SHA1 375c6593fd7465b1ee664c53351bb251df0de4a1 SHA256 7e161cf99ec9f59dee998b11c82514a61d59d64325e621f6482d578d8743bae0
+MISC ChangeLog 11527 RMD160 21ef4a5800ec60bfa464525cff0a4a417589a5b8 SHA1 1b27b31e20b75f87298057ccc973bfe00063638b SHA256 2d97c6b4e8f42981f87885b1dcd02e1c531425636fa6fc672e0e47791d3c0602
 MISC metadata.xml 626 RMD160 a86edde5c7fb06ad02761f159bc05239b2507521 SHA1 8bc7bd3f1767aea50d396a696a83ddbc660f3fbd SHA256 cbe80f8dd2f6cf2dc88c03bc2765a171f705502c6f1513cdd41b285aac87660c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvV5AgACgkQkKaRLQcq0GKmHACcCUA9mydMYSre08aN3mrhRiEH
-DzEAoLKZ3Nq/fATJemWbMLtpf9aJWpNO
-=4+i/
------END PGP SIGNATURE-----

diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
new file mode 100644 (file)
index 0000000..59bc32a
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
@@ -0,0 +1,141 @@
+# 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.1.3535.3218.ebuild,v 1.1 2010/05/16 23:07: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 MIT SGI-B-1.1 openssl as-is ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
+IUSE="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
+       )
+       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/libgps.so
+opt/googleearth/libgooglesearch.so
+opt/googleearth/libevll.so
+opt/googleearth/librender.so
+opt/googleearth/libinput_plugin.so
+opt/googleearth/libflightsim.so
+opt/googleearth/libcollada.so
+opt/googleearth/libminizip.so
+opt/googleearth/libauth.so
+opt/googleearth/libbasicingest.so
+opt/googleearth/libmeasure.so
+opt/googleearth/libgoogleearth_lib.so
+opt/googleearth/libmoduleframework.so
+"
+
+QA_DT_HASH="opt/${PN}/.*"
+
+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
+}
+
+src_prepare() {
+       # 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.*$::" postinstall.sh
+}
+
+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
+       tar xf "${WORKDIR}"/${PN}-linux-x86.tar || die
+       # bug #262780
+       epatch "${FILESDIR}/decimal-separator.patch"
+       exeinto /opt/${PN}
+       doexe * || die
+
+       cd "${D}"/opt/${PN}
+       tar xf "${WORKDIR}"/${PN}-data.tar || die
+
+       if ! use qt-bundled; then
+               rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die
+       fi
+       rm -rvf libGLU.so.1 libcurl.so.4
+       if use amd64; then
+               # provided by emul-baselibs for amd64
+               # on x86 need to sort out collision between mDNSresponder and nss-mdns first
+               rm -rvf libnss_mdns4_minimal.so.2 || die
+       fi
+       if use x86; then
+               # no 32 bit libs for gdal
+               rm -rvf libgdal.so.1 || die
+       fi
+
+       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
+}