commit: f2699c5c3ed279c944584589473d73e07f441267 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 18:44:48 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 18:56:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2699c5c
sci-geosciences/googleearth: Remove last-rited pkg Closes: https://bugs.gentoo.org/624966 profiles/package.mask | 4 - sci-geosciences/googleearth/Manifest | 2 - .../files/googleearth-7-desktopfile.patch | 17 -- .../googleearth/files/googleearth-mimetypes.xml | 21 --- .../googleearth/googleearth-7.1.8.3036.ebuild | 174 --------------------- sci-geosciences/googleearth/metadata.xml | 10 -- 6 files changed, 228 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 003c486bfba..6a34e2aacb6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -416,10 +416,6 @@ dev-libs/DFB++ # (#601358). Removal in a month. x11-misc/tinymount -# Pacho Ramos <[email protected]> (26 Jul 2017) -# EOL, severely broken, impossible to bump (#624966). Removal in a month. -sci-geosciences/googleearth - # Kent Fredric <[email protected]> (21 Jul 2017) # Masked due to serious regression that introduces widespread data # corruption when storing data in blobs. Masked, because any code diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest deleted file mode 100644 index 17391443425..00000000000 --- a/sci-geosciences/googleearth/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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/files/googleearth-7-desktopfile.patch b/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch deleted file mode 100644 index 0de8b589b77..00000000000 --- a/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- google-earth.desktop -+++ google-earth.desktop -@@ -3,10 +3,10 @@ - Name=Google Earth - GenericName=3D planet viewer - Comment=Explore, search and discover the planet --Exec=/opt/google/earth/free/google-earth %f -+Exec=/opt/googleearth/googleearth %f - Terminal=false --MultipleArgs=false -+X-MultipleArgs=false - Icon=google-earth - Type=Application --Categories=Application;Network --MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole -+Categories=Network; -+MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole; diff --git a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml deleted file mode 100644 index 3ecfa97cdae..00000000000 --- a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.google-earth.kml+xml"> - <comment>Keyhole Markup Language data</comment> - <glob pattern="*.kml"/> - </mime-type> - - <mime-type type="application/vnd.google-earth.kmz"> - <comment>Keyhole Markup Language archive</comment> - <glob pattern="*.kmz"/> - </mime-type> - - <mime-type type="application/keyhole"> - <comment>Keyhole Markup Language data</comment> - </mime-type> - - <mime-type type="application/earthviewer"> - <comment>Keyhole Markup Language data</comment> - </mime-type> -</mime-info> - diff --git a/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild b/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild deleted file mode 100644 index 74329abbc43..00000000000 --- a/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 <[email protected]> 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/metadata.xml b/sci-geosciences/googleearth/metadata.xml deleted file mode 100644 index 813f0412313..00000000000 --- a/sci-geosciences/googleearth/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <use> - <flag name="bundled-libs">Use bundled libraries.</flag> - </use> -</pkgmetadata>
