diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-02-04 23:32:37 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-02-04 23:32:37 +0000 |
commit | 302b073c8da5c505ad5258231d36aff8634ec599 (patch) | |
tree | a0313d96e5dac582603fbbf2da68fddc64bae589 /sci-geosciences/googleearth | |
parent | Migrate to distutils-r1. (diff) | |
download | historical-302b073c8da5c505ad5258231d36aff8634ec599.tar.gz historical-302b073c8da5c505ad5258231d36aff8634ec599.tar.bz2 historical-302b073c8da5c505ad5258231d36aff8634ec599.zip |
revbump to fix bug #455124
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'sci-geosciences/googleearth')
-rw-r--r-- | sci-geosciences/googleearth/ChangeLog | 8 | ||||
-rw-r--r-- | sci-geosciences/googleearth/Manifest | 19 | ||||
-rw-r--r-- | sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild | 190 |
3 files changed, 208 insertions, 9 deletions
diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog index 7a888ca50452..e5d457df4590 100644 --- a/sci-geosciences/googleearth/ChangeLog +++ b/sci-geosciences/googleearth/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-geosciences/googleearth # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.39 2013/02/02 13:26:49 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.40 2013/02/04 23:32:34 hasufell Exp $ + +*googleearth-7.0.2.8415-r1 (04 Feb 2013) + + 04 Feb 2013; Julian Ospald <hasufell@gentoo.org> + +googleearth-7.0.2.8415-r1.ebuild: + revbump to fix bug #455124 02 Feb 2013; Julian Ospald <hasufell@gentoo.org> googleearth-7.0.2.8415.ebuild: diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest index 1e4da81d3d59..df2d55cff893 100644 --- a/sci-geosciences/googleearth/Manifest +++ b/sci-geosciences/googleearth/Manifest @@ -11,24 +11,27 @@ DIST GoogleEarthLinux-6.0.2.2074.bin 33685323 SHA256 06cf414d783617a0f7bade21bcc DIST GoogleEarthLinux-6.0.3.2197.bin 33688483 SHA256 8c1cabb6a196e93224be05bd8a4786087813075f76e1734a17680c30a9ad972d DIST GoogleEarthLinux-6.2.2.6613_amd64.deb 25609162 SHA256 a67021ed74fd1821ba0a63e141320ca0bcd78ab618dd368629e500d208d12525 DIST GoogleEarthLinux-7.0.2.8415_amd64.deb 30832428 SHA256 878e8a23ada537ae5ab28221ec46a45c425bdd80ee68027f56510f039b6a6c87 SHA512 0ff0ef4065896ce24f23b97e3a5c0a93763956779bb1e01f7eaee30268eb6bb1d28d2b59099a3a426477701cfe227b0542637fda68a40ba941bc3bd4246a7ebb WHIRLPOOL b4f056c8ddd9d63a041bc5a194d251d9b20a1f8993a1f32bacd76a6721571d0a60d6083edd6a092bcdda6aa1fb17cb29469d40171089143930dd8a730c68ccba +DIST GoogleEarthLinux-7.0.2.8415_i386.deb 30809718 SHA256 a7c2fd63e5e9d25a4f3f599d3c4470a285db8bb7c5981db409a1ebb19ebdb6e1 SHA512 1bdbd14e017244f8ecf5b67f115bddd400c1ac5d0bcd1b9ae7e1d676f62e838c84b13f2aa410d0dad8084db6a72235e80b8d16754b3714f13341de11fea28119 WHIRLPOOL b53a364b01de459761a03ebfbae89704b02cef979fad9da1d2d8c438643d1f914d464e0297daa5a05e1a8004ec8bc052a32f90f8a85f4de7a7a9dab2bdd8d1a6 DIST GoogleEarthLnux-6.2.2.6613_i386.deb 25620810 SHA256 e309ce1493dec6abc742037b1e6822b08771827db59ee7e5d5da56cb40c92111 DIST GoogleEarthLnux-7.0.2.8415_i386.deb 30809718 SHA256 a7c2fd63e5e9d25a4f3f599d3c4470a285db8bb7c5981db409a1ebb19ebdb6e1 SHA512 1bdbd14e017244f8ecf5b67f115bddd400c1ac5d0bcd1b9ae7e1d676f62e838c84b13f2aa410d0dad8084db6a72235e80b8d16754b3714f13341de11fea28119 WHIRLPOOL b53a364b01de459761a03ebfbae89704b02cef979fad9da1d2d8c438643d1f914d464e0297daa5a05e1a8004ec8bc052a32f90f8a85f4de7a7a9dab2bdd8d1a6 +DIST googleearth-libexpat-2.1.0-novisibility.tar.xz 54812 SHA256 f300a3f76ef8350a9e681005c4d6ec5ba086e7f12acc7b83b68445e770dec6c9 SHA512 21f0510f391e242a2a87191ecb53f45bf837801b8e8e937dd50b6ff454b52d0dd4d31f32461add7604226d786a188a3a2a8dd86c86f9678c8d317b0d432f91e3 WHIRLPOOL 55440c3924735cf03b8c283c7f4787b735fa5dad62dfa753332b5c149ebe9a4734a24924a6a12b12a43c7292d544d0e971fd92d84ebe751fa439afffc54f1dae EBUILD googleearth-5.1.3535.3218-r1.ebuild 4338 SHA256 5940cef1d856f7a05d550aca73f557c2593194e793a98c9dda468266ea90fbd7 SHA512 662bc105c49db0f8838deda11e23e9d61e7fc9f7003dd62fbe22b939986c55a9043f504e93862e152d9e89af4b0bcb337d516c98e30177c645e7255ac23eafa5 WHIRLPOOL 85aac40d8101d288ad351646653aff0b6ae168605fcfb94766f3b406dd718934b2aba7494dab46e23cfffa30bce9cd2dc8d7276603f9c1a19c8f74928ba6a1a0 EBUILD googleearth-5.2.1.1588.ebuild 5050 SHA256 d255198952a233dd2ef0b3b38a94f917134e4ce45feeb7475432ac55bb4380fb SHA512 e2ac3c89a1927ab6b148443faf21dd470bcbfc12ba47f396df224ef7b1678925fd32de5460cb5ad5cc0895c7d835444c5cb3e3864fbb87d3a3a7c7b3c1d2583e WHIRLPOOL 463d2c5f7f38a7b98ff0f99327ac1905e6df2d65565ce2b832628da722b26e9cc9ae1a391b4a0419bc258b7abcd1761a65b683fe3e7eee9dc7b5ffa084765ba2 EBUILD googleearth-6.0.2.2074.ebuild 5594 SHA256 be46e5b760b61cdb03c2eb619fd3136e8dcee2c65e805ba96cf3b3723116fed1 SHA512 c571bc7598e8d6723d48ab09aab969ac37449db37c3ca264905b45840169a3ba5115882735a73fe96b21e62b06ccc40364d0640d0130947e227f9296c27bbd96 WHIRLPOOL d8f216b7028e4a5ec8ecb3cdf15db01e515e3bb64e1db79f0935fc660c650343b0a287c067cfd0d88087bedf6a3ee5e90e5efc0e1585d7f8f40aaa3569a806b9 EBUILD googleearth-6.0.3.2197.ebuild 5314 SHA256 7343f140a32d51a96e9dddbf4e0988aefac78275a74804077b03510e21a79ea0 SHA512 fd174bf1f7e588a6f8db8b364968733d2ec10409a059b7b51119179f6e3154beaeee1de94fd1909d2305d5e8fe5e03fb093bc35ae6990eb2a920f6b3be2306c3 WHIRLPOOL 3502b7a9527a21ab0f1948e92924c76325e1318042fa310aa7cb013827992cd23389d5edb0931d35833a7d1416018775d68c79313a7dacfd14bafb6cd4d150c9 EBUILD googleearth-6.2.2.6613.ebuild 5731 SHA256 34909ff86643d41e9f0dac51ca0526b2fbd4d444afc831097cf192950fb9f37e SHA512 c5fba34a570acb7ae5497fd0cde8f56d3982b7f87189d644a7ec7bf2eaeee15ef0b0d0a2f7bdb08f2d83804937174f87b19b77bac92016ad8f78fc45b6e026a0 WHIRLPOOL d92f9c3434a3a725fe7a6185dd651511a4342330f4dfe70b431f69204bf26a5870c537e16c4be0586bc957f294ce865bc4763d1d9bef624490f48a51ce7d63c0 +EBUILD googleearth-7.0.2.8415-r1.ebuild 5990 SHA256 20d5a7d228e2edb0fc6949433d4fbb674300642790561177ce5b6d8b404d7892 SHA512 d5367514d05d8752636d5d07b08ac6d431b4223a0d23b9472a6de9cf39ebed9587e71d98efba5e3ee576ba980b0e7ca9d3455b847edaea0a3b71668a09057189 WHIRLPOOL 093619b1371ff8dabf70d2281971ea7107c2eb52bf8ffcfd9f72b759d0f24e68913a98d2cd8f3fb47dfdb05dbb4d34719349c6e9f6a3886f8f332411a04bef67 EBUILD googleearth-7.0.2.8415.ebuild 5952 SHA256 6ecadef876fbdb5246f5e8f193afb8534b7e444b0f9b436ed7b5f96053bad367 SHA512 09f204bd0b1b58ed3ab976d719190cb6f9b3da9461b18844b67f716c8601ca63246e6e327ad7f88fbd181c1d411390becfe049556eb068f2121a71bd318fa41a WHIRLPOOL 348e69483e3cb17647bd36af2ea043f533852444a3942fcee207f0d7fc31db2aea843fc57054b27dcef09ff2eabd0cbb9f3a88bac5753895b4951c4b5c92faee -MISC ChangeLog 19278 SHA256 a44d34df15c2f55f32d87c60935170a7d80b5c594df2f21c143b507d8d2383dc SHA512 f17195041de534192875a59787800e79d5d952d67ce5cb1684632fd63d23a5364fe784833c72c786b48dfee0373ffcff765163119e7c4ae803151fb96436b7e8 WHIRLPOOL 634337e82d8e8f1cdf3767d4041987e6d6b5137b3864193a57bc2a9a6d32b7f05167df62f4ed9ef36ffec3f3db770803680fdc7583b9f32d40341c060204df8b +MISC ChangeLog 19438 SHA256 0feac00abda4c6d24982424c8c10236fc6ad3a87d7d9d3549bbd258f3ee70b97 SHA512 7357501134cc7c4d29b81e0eb68ed2ea2e3a57fd95d841fd04de0a46a53444fce5eb0eec809b6eb11f5da88c1daea931504d16bd1083adf81cad75896862d7f0 WHIRLPOOL e518cb1503f0abb4c5844cbcc1563ebe931e1d7a6724e05c73f495c426ce3c65d5e58699c717e0b3372763fcbfa00a3cc88fcac2c04be77caa1c0ddc3d553f7d MISC metadata.xml 510 SHA256 8aaa0e9692e1fe5ef4bdd5bc6d2c14b100dae6fff3069f7adb627cca24785bde SHA512 81e651d27920ee69442be682745713e0435dae42567a2f841bc580839db2a83afc485b66ccd8590c97f3bf483c52ad7851ff6baf76c4e6ba7abc9659bc1928ff WHIRLPOOL f8e83d036d1d14adfb303dc751c7e079bfea704a0f579f0244923a08780a9867ee7c9722acd81e68af9d941fe4960e9c3d626a629594fffe798d4c116932bef3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRDRQbAAoJEFpvPKfnPDWzM9sH/jNUpESeyQ5EWdvTi7s6trCQ -egBIScJvK9FiyWM7Aw4HGCMWNpfhnIm1e1BIEFoVbx6ev70PUt+R4u/aFQsyPzTf -zN8kOVmllPDCF8m0nSJr+/o4CtG9JiSn08xR0tCmU+9GcodE21+7yq1v3FX5+F44 -MXD+IdyycQ3QUKHzwLDGYdacBWrYuofD0xd7AI/sfWprdn7FlEYW8NOT5GHSx0JB -C2LO7YhTC7tkv5/nlC7L9k9+jcq57UYofSbQdErcUATYEAEu7DT9A9C7fbOOkm8j -ofz0s9hW+9f5gVPbKa8CU4V6Vix1eXq3SpylbGQHcy8rlBCu8q2gDDEJG5fmR+Q= -=76PG +iQEcBAEBCAAGBQJREEUVAAoJEFpvPKfnPDWzU34H/0vKd5y6K1fWplcb2S42wbZJ +bUUiWVUp/zJYlgRG4CuVKBCqFs8YW61R7ivFaI28OiA8zHsdDGyT6N5s8dA+4Lmq +6DRI7joeGeLbsqmJRG8HJYLbIDy2j5T+5I82nCFAJgKp6CEUd9Sw8hsbLuXTxFXE +nYjxGrq99FDtz+f2DpCil+plihrQ8rcEVOCEwEBoRCSWKsMKXDIHwCImqjQ8pWRz +PURttyP+07h00kLLF2rdRPV05+bvSZrFqLUvL4ZZt3NIbwDp4cLXyi2Q3ZF8V0PB +NL8llDb+WNnEIX4gPnrpY4hs1BPSHC/jQCNRw3Lof5SamgUOCI3S33/A6IYTZA0= +=9T0n -----END PGP SIGNATURE----- diff --git a/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild new file mode 100644 index 000000000000..bd745fc81371 --- /dev/null +++ b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.1 2013/02/04 23:32:34 hasufell Exp $ + +EAPI=5 + +inherit eutils unpacker fdo-mime versionator gnome2-utils 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 + -> GoogleEarthLinux-${PV}_i386.deb ) + amd64? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb + -> GoogleEarthLinux-${PV}_amd64.deb ) + http://dev.gentoo.org/~hasufell/distfiles/googleearth-libexpat-2.1.0-novisibility.tar.xz" +LICENSE="googleearth GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="mirror strip" +IUSE="mdns-bundled +qt-bundled" + +GCC_NEEDED="4.2" +QA_PREBUILT="*" + +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:4 + >=x11-libs/qt-gui-4.5.3:4 + >=x11-libs/qt-webkit-4.5.3:4 + ) + 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!" +} + +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 GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb + + cd opt/google/earth/free || die + + unpack googleearth-libexpat-2.1.0-novisibility.tar.xz + + if ! use qt-bundled; then + rm -v libQt{Core,Gui,Network,WebKit}.so.4 qt.conf || die + rm -rv 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" + + # Set RPATH for preserve-libs handling (bug #265372). + local x + for x in * ; do + # Use \x7fELF header to separate ELF executables and libraries + [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue + patchelf --set-rpath '$ORIGIN' "${x}" || + die "patchelf failed on ${x}" + done + for x in plugins/imageformats/*.so ; do + [[ -f ${x} ]] || continue + patchelf --set-rpath /opt/${PN} "${x}" || + die "patchelf failed on ${x}" + done + + epatch "${FILESDIR}"/${P}-desktopfile.patch +} + +src_install() { + make_wrapper ${PN} ./${PN} /opt/${PN} . + + # install binaries and remove them + binaries="${PN} ${PN}-bin *.so *.so.*" + exeinto /opt/${PN} + doexe ${binaries} + rm ${binaries} || die + + insinto /usr/share/mime/packages + doins "${FILESDIR}/${PN}-mimetypes.xml" || die + + domenu google-earth.desktop + + for size in 16 22 24 32 48 64 128 256 ; do + newicon -s ${size} product_logo_${size}.png google-earth.png + done + + rm -r 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_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + 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" + + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} |