From ac548532d5f78c728b2b18e5b8481c04d0f591bc Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Sun, 5 Feb 2017 18:37:07 +0100 Subject: sci-geosciences/googleearth: bump version, fixes #608222 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- sci-geosciences/googleearth/Manifest | 4 +- .../googleearth/googleearth-7.1.7.2606.ebuild | 175 --------------------- .../googleearth/googleearth-7.1.8.3036.ebuild | 175 +++++++++++++++++++++ 3 files changed, 177 insertions(+), 177 deletions(-) delete mode 100644 sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild create mode 100644 sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild (limited to 'sci-geosciences') diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest index 66d29eca301d..173914434251 100644 --- a/sci-geosciences/googleearth/Manifest +++ b/sci-geosciences/googleearth/Manifest @@ -1,2 +1,2 @@ -DIST GoogleEarthLinux-7.1.7.2606_amd64.deb 45674860 SHA256 af7a43df5b80456121d767948bd822e69178edc75e0b28ee38c4599db2122d29 SHA512 34ae17b4448e2dda0405cc495d548e10ac18cddc1641d51ef431c868808dc35e33552187bdfad57c8dfddc34a520668ed8e45d10256b137f7ef7fe822ebaae06 WHIRLPOOL 1f139ed9cb318dd24270fe42de5749364f0eea451d78969143ab69a02664c599cd3a7bf7399edfb43d8e8a1761bd282974b95f571b55543b7570082023787851 -DIST GoogleEarthLinux-7.1.7.2606_i386.deb 44520698 SHA256 7bd9af6dfd648d908235dc070e9ea39a4b1b04e6c4590d753ea43ee2ac99806d SHA512 4a640df0ce49d3686c957fdadf28ae0e235d08698b856139f95126486553b96940468bd16f31c438ea5d2cbcbc5aae700a7aa89c8b0afdfc5d93c90c4f5ce98c WHIRLPOOL 83815d69a2a4c60d45dc61c7349b768900ac53a38c9796592c9dced277f4b864301488ae5a757402336fe09c96e40b770870116163ac893bcb8ceee853c25cd4 +DIST GoogleEarthLinux-7.1.8.3036_amd64.deb 45349754 SHA256 6612d107d271b7210399c23a631e88cf424bbd6744bedc265f855a5decbd9637 SHA512 4dd8c29247a85df903ef0e4552081f6b25abae5020ce3ce59277fa1ab566fa429a0e674674e844bf12fa9747a1becff3ad124f1325755771359ffadcbed1e9e2 WHIRLPOOL 6378a6a29e46ce8bfd937b45733bfe1530659a3374a8146e1d5dbb9e90b6afb4fe7989198c54034596735991b953acef4ad9ad65130635b318168cb79a5d0c00 +DIST GoogleEarthLinux-7.1.8.3036_i386.deb 44160280 SHA256 82028d65869f6f1e40e4e09764ea7db020ca467651722c6113eccd21735fcd3e SHA512 e28fa3bbd84fb5dc09c8a2e318274bebb04e6b272ca9d2df8a36835700ed20a33682d84d249fde8d7235bfaeff6c89cd5325518528931e4cff2117cca842add3 WHIRLPOOL 487ecba9ff8528515f66c96f01b5aad621065c672516eabe6f21de3a0f2c2273b44da3ccd75b0684469d4155023630c7e3cdf8da8b128c00939fa1350ecf12af diff --git a/sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild b/sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild deleted file mode 100644 index 7024eaaec9fb..000000000000 --- a/sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit pax-utils eutils unpacker fdo-mime gnome2-utils - -DESCRIPTION="A 3D interface to the planet" -HOMEPAGE="https://earth.google.com/" -# no upstream versioning, version determined from help/about -# incorrect digest means upstream bumped and thus needs version bump -SRC_URI="x86? ( https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb - -> GoogleEarthLinux-${PV}_i386.deb ) - amd64? ( https://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 splitdebug" -IUSE="+bundled-libs" - -QA_PREBUILT="*" - -# TODO: find a way to unbundle libQt -# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii - -RDEPEND=" - dev-libs/glib:2 - dev-libs/nspr - media-libs/fontconfig - media-libs/freetype - net-misc/curl - sys-devel/gcc[cxx] - sys-libs/zlib - virtual/glu - virtual/opengl - virtual/ttf-fonts - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXau - x11-libs/libXdmcp - !bundled-libs? ( - dev-db/sqlite:3 - dev-libs/expat - dev-libs/nss - sci-libs/gdal - sci-libs/proj - )" -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 https://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!" -} - -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 - - if ! use bundled-libs ; then - einfo "removing bundled libs" - cd opt/google/earth/free || die - # sci-libs/gdal - rm -v libgdal.so.1 || die - # dev-db/sqlite - rm -v libsqlite3.so || die - # dev-libs/nss - rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \ - libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \ - libsoftokn3.so libssl3.so || die - # dev-libs/expat - rm -v libexpat.so.1 || die - # sci-libs/proj - rm -v libproj.so.0 || die - # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 -# rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die -# rm -rv plugins/imageformats || die - fi -} - -src_prepare() { - - # we have no ld-lsb.so.3 symlink - # thanks to Nathan Phillip Brink for suggesting patchelf - einfo "running patchelf" - patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").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 - fperms u+w "${x}" - patchelf --set-rpath '$ORIGIN' "${x}" || - die "patchelf failed on ${x}" - done - # prepare file permissions so that >patchelf-0.8 can work on the files - fperms u+w plugins/*.so plugins/imageformats/*.so - for x in plugins/*.so ; do - [[ -f ${x} ]] || 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 '$ORIGIN/../..' "${x}" || - die "patchelf failed on ${x}" - done - - epatch "${FILESDIR}"/${PN}-${PV%%.*}-desktopfile.patch -} - -src_install() { - make_wrapper ${PN} ./${PN} /opt/${PN} . - - 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 -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_* - - insinto /opt/${PN} - doins -r * - - fperms +x /opt/${PN}/${PN}{,-bin} - cd "${ED}" || die - find . -type f -name "*.so.*" -exec fperms +x '{}' + - - pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf" - elog "with the following options:" - elog "lastTip = 4" - elog "enableTips = false" - elog "" - elog "In addition, the use of free video drivers may cause 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 -} diff --git a/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild b/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild new file mode 100644 index 000000000000..518db59913af --- /dev/null +++ b/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit pax-utils eutils unpacker fdo-mime gnome2-utils + +DESCRIPTION="A 3D interface to the planet" +HOMEPAGE="https://earth.google.com/" +# no upstream versioning, version determined from help/about +# incorrect digest means upstream bumped and thus needs version bump +SRC_URI="x86? ( https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb + -> GoogleEarthLinux-${PV}_i386.deb ) + amd64? ( https://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 splitdebug" +IUSE="+bundled-libs" + +QA_PREBUILT="*" + +# TODO: find a way to unbundle libQt +# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii + +RDEPEND=" + dev-libs/glib:2 + dev-libs/nspr + media-libs/fontconfig + media-libs/freetype + net-misc/curl + sys-devel/gcc[cxx] + sys-libs/zlib + virtual/glu + virtual/opengl + virtual/ttf-fonts + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXau + x11-libs/libXdmcp + !bundled-libs? ( + dev-db/sqlite:3 + dev-libs/expat + dev-libs/nss + sci-libs/gdal + sci-libs/proj + )" +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 https://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!" +} + +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 + + if ! use bundled-libs ; then + einfo "removing bundled libs" + cd opt/google/earth/free || die + # sci-libs/gdal + rm -v libgdal.so.1 || die + # dev-db/sqlite + rm -v libsqlite3.so || die + # dev-libs/nss + rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \ + libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \ + libsoftokn3.so libssl3.so || die + # dev-libs/expat + rm -v libexpat.so.1 || die + # sci-libs/proj + rm -v libproj.so.0 || die + # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 +# rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die +# rm -rv plugins/imageformats || die + fi +} + +src_prepare() { + + # we have no ld-lsb.so.3 symlink + # thanks to Nathan Phillip Brink for suggesting patchelf + einfo "running patchelf" + patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").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 + fperms u+w "${x}" + patchelf --set-rpath '$ORIGIN' "${x}" || + die "patchelf failed on ${x}" + done + # prepare file permissions so that >patchelf-0.8 can work on the files + fperms u+w plugins/*.so plugins/imageformats/*.so + for x in plugins/*.so ; do + [[ -f ${x} ]] || 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 '$ORIGIN/../..' "${x}" || + die "patchelf failed on ${x}" + done + + epatch "${FILESDIR}"/${PN}-${PV%%.*}-desktopfile.patch +} + +src_install() { + make_wrapper ${PN} ./${PN} /opt/${PN} . + + 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 -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_* + + insinto /opt/${PN} + doins -r * + + fperms +x /opt/${PN}/${PN}{,-bin} + cd "${ED}" || die + find . -type f -name "*.so.*" -exec fperms +x '{}' + + + pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf" + elog "with the following options:" + elog "lastTip = 4" + elog "enableTips = false" + elog "" + elog "In addition, the use of free video drivers may cause 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 +} -- cgit v1.2.3-65-gdbad