* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-03-25 22:52 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2016-03-25 22:52 UTC (permalink / raw
To: gentoo-commits
commit: def13df348a121f7c470cb3dc44f333ab7dbac59
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 22:50:19 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 22:51:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def13df3
sci-geosciences/googleearth: bump version
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xCA3E7BF67F979BE5
sci-geosciences/googleearth/Manifest | 22 +++
.../googleearth/googleearth-7.1.4.1529.ebuild | 171 +++++++++++++++++++++
2 files changed, 193 insertions(+)
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 70bc61f..ee3d875 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,2 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST GoogleEarthLinux-7.1.2.2041_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
DIST GoogleEarthLinux-7.1.2.2041_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
+DIST GoogleEarthLinux-7.1.4.1529_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
+DIST GoogleEarthLinux-7.1.4.1529_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJW9cCkAAoJEJ1Z0/aIkeRfFOcQALSkfj9sXYD2gBN6jsiNU4E4
+pdmft6lZfsBAekqmahGpu0jMtX1OQTMYUDTWJm4YcjMTw9vCF1Vw0Zl32OSJSv0y
+whb84UlQbxn5XK5YHpr9swYzrAaKdW2nley5HhM8+MtEsjmqgrr4OeSUaRh8CsCI
+b9UtG8x6QCQsP44OZ2A36ouC5K4JwyxyW+el6nRTH6AlZqDOcD60wDfv0fhCPYIE
+ogUR6jriixChgYmh9CnJNnI0VfTo0IjXDd4Wm5ikSwzu6lneIeZ8cUK8LqEUwy6d
+LwoJb2D4Q4MaqNlU3o/KcdQQfmS0HlT+fFy6lMud9iBS6a4NULnQCBwamdpSnQ+H
+NiGVB0ME8wq8T8emS/N0Ko7ASyQCVLg40DUiCBeInCU3R6QPUgwJDDbqQNkbDdKU
+BL4dJ8JRR04MLCpkomTftp6ZvpFh9AQCUCH+lzp0H0mAYsrDLrv78zIKxH+xNXYu
+3HC8ikgxAm+YdJlDwVeG3tSe+pNfbvtVDUGjfD2iW3S2of48NEVIy8nvql6iK7PT
+CEzP7ADJfzaCUVTpmeMlEgN2R309VU+J0AWtyTkKauR1JhXpnWCE/rTyRuIbdTX6
+SCRPb/T1e3bu3prDUs7qkyDbW5xmC8DdzN3iv4zrpgiSGx4PsOlO7x/1up+PYL2z
+eLacr1lVQ19Emvdu4/hn
+=9RX2
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
new file mode 100644
index 0000000..d1d5f7f
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
@@ -0,0 +1,171 @@
+# 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 <ohnobinki@ohnopublishing.net> 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
+ patchelf --set-rpath '$ORIGIN' "${x}" ||
+ die "patchelf failed on ${x}"
+ done
+ 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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-03-25 22:52 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2016-03-25 22:52 UTC (permalink / raw
To: gentoo-commits
commit: a643c2b5aa5e4dc56fe091080688aa806c8a66b5
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 22:51:34 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 22:51:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a643c2b5
sci-geosciences/googleearth: remove old version
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xCA3E7BF67F979BE5
sci-geosciences/googleearth/Manifest | 28 ++--
.../googleearth/googleearth-7.1.2.2041.ebuild | 171 ---------------------
2 files changed, 13 insertions(+), 186 deletions(-)
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index ee3d875..39ed28b 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,24 +1,22 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST GoogleEarthLinux-7.1.2.2041_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
-DIST GoogleEarthLinux-7.1.2.2041_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
DIST GoogleEarthLinux-7.1.4.1529_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
DIST GoogleEarthLinux-7.1.4.1529_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJW9cCkAAoJEJ1Z0/aIkeRfFOcQALSkfj9sXYD2gBN6jsiNU4E4
-pdmft6lZfsBAekqmahGpu0jMtX1OQTMYUDTWJm4YcjMTw9vCF1Vw0Zl32OSJSv0y
-whb84UlQbxn5XK5YHpr9swYzrAaKdW2nley5HhM8+MtEsjmqgrr4OeSUaRh8CsCI
-b9UtG8x6QCQsP44OZ2A36ouC5K4JwyxyW+el6nRTH6AlZqDOcD60wDfv0fhCPYIE
-ogUR6jriixChgYmh9CnJNnI0VfTo0IjXDd4Wm5ikSwzu6lneIeZ8cUK8LqEUwy6d
-LwoJb2D4Q4MaqNlU3o/KcdQQfmS0HlT+fFy6lMud9iBS6a4NULnQCBwamdpSnQ+H
-NiGVB0ME8wq8T8emS/N0Ko7ASyQCVLg40DUiCBeInCU3R6QPUgwJDDbqQNkbDdKU
-BL4dJ8JRR04MLCpkomTftp6ZvpFh9AQCUCH+lzp0H0mAYsrDLrv78zIKxH+xNXYu
-3HC8ikgxAm+YdJlDwVeG3tSe+pNfbvtVDUGjfD2iW3S2of48NEVIy8nvql6iK7PT
-CEzP7ADJfzaCUVTpmeMlEgN2R309VU+J0AWtyTkKauR1JhXpnWCE/rTyRuIbdTX6
-SCRPb/T1e3bu3prDUs7qkyDbW5xmC8DdzN3iv4zrpgiSGx4PsOlO7x/1up+PYL2z
-eLacr1lVQ19Emvdu4/hn
-=9RX2
+iQIcBAEBCAAGBQJW9cD0AAoJEJ1Z0/aIkeRfUiAQAI33VHWz7jU/E8kJYPOIOPqS
+sGdgFlj9sE+0iQ9yBhoBhpJQJRla+r5xz7UebdmyrSoNSF+wM/peFV18eR94UVhj
+YUA0seCOuNd+mhqTVmn9Qd2F4BszyWfIeLHMykNybx7X4yZtIjT9YVk3Rp3bSxK0
++eMumztBDZ63fZ1ZT/jR+VanDPBidhkVzs4/KfORQFatlyltm3v3E93S4JY0MvHS
+KyMXdM46LiYI2c8S/0xbVyShOMNJY/6ib3mkkcoiu8ZyItyb+mdZOjDFYuv1bDiy
+CrkTPpoA3tPvlWfvjC0mMz2QKWlGBoYab5nfbpD5IwhX51hqMlgTHaX+ZSBhC2E/
+yWbg9D3wS1p0Z05KX/wiQwUOavN5APIDeLva2cnO7ATHVOIkU8vprRd7Qz9To+fL
+Q6GfndGUodvCBgoVmtDIlA/bDoVC4kxB8MA3Be/GDPNoKlfi+spWZ2HLb7v/bfxv
+qz9w/972CPVeTgvais/Zxp4qOF0KYt9sGZpmRp+IqfXDrugvU+5/yTnRwgrWYGt6
+FKntr35aP2zxlPAr8O3EdaeKCkX/gURgmcK/Yz/uEDVrInv1Te/faKOH2BNRWKaS
+jSVETAzS6ZK8Tdb5QVoEC8waXC89rN1sGkDgp+93ILDf2wkr5Yd0XmSShRuTslcn
+f12ua6Q9qz5q7EMuNeOa
+=VZU/
-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild b/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild
deleted file mode 100644
index 8582a15..0000000
--- a/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 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 <ohnobinki@ohnopublishing.net> 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
- patchelf --set-rpath '$ORIGIN' "${x}" ||
- die "patchelf failed on ${x}"
- done
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-03-25 23:29 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-03-25 23:29 UTC (permalink / raw
To: gentoo-commits
commit: f874ee0f82734a55a032a1f426c28aa0a2183352
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 23:13:15 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 23:15:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f874ee0f
sci-geosciences/googleearth: Regenerate Manifest file.
Package-Manager: portage-2.2.26
sci-geosciences/googleearth/Manifest | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 39ed28b..eaae017 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST GoogleEarthLinux-7.1.4.1529_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
DIST GoogleEarthLinux-7.1.4.1529_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJW9cD0AAoJEJ1Z0/aIkeRfUiAQAI33VHWz7jU/E8kJYPOIOPqS
-sGdgFlj9sE+0iQ9yBhoBhpJQJRla+r5xz7UebdmyrSoNSF+wM/peFV18eR94UVhj
-YUA0seCOuNd+mhqTVmn9Qd2F4BszyWfIeLHMykNybx7X4yZtIjT9YVk3Rp3bSxK0
-+eMumztBDZ63fZ1ZT/jR+VanDPBidhkVzs4/KfORQFatlyltm3v3E93S4JY0MvHS
-KyMXdM46LiYI2c8S/0xbVyShOMNJY/6ib3mkkcoiu8ZyItyb+mdZOjDFYuv1bDiy
-CrkTPpoA3tPvlWfvjC0mMz2QKWlGBoYab5nfbpD5IwhX51hqMlgTHaX+ZSBhC2E/
-yWbg9D3wS1p0Z05KX/wiQwUOavN5APIDeLva2cnO7ATHVOIkU8vprRd7Qz9To+fL
-Q6GfndGUodvCBgoVmtDIlA/bDoVC4kxB8MA3Be/GDPNoKlfi+spWZ2HLb7v/bfxv
-qz9w/972CPVeTgvais/Zxp4qOF0KYt9sGZpmRp+IqfXDrugvU+5/yTnRwgrWYGt6
-FKntr35aP2zxlPAr8O3EdaeKCkX/gURgmcK/Yz/uEDVrInv1Te/faKOH2BNRWKaS
-jSVETAzS6ZK8Tdb5QVoEC8waXC89rN1sGkDgp+93ILDf2wkr5Yd0XmSShRuTslcn
-f12ua6Q9qz5q7EMuNeOa
-=VZU/
------END PGP SIGNATURE-----
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-03-27 13:17 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2016-03-27 13:17 UTC (permalink / raw
To: gentoo-commits
commit: a5e4f2c99a1dd64d1f55abba881f012ae4bb1cf2
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 13:16:07 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 13:16:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e4f2c9
sci-geosciences/googleearth: Stick to version 0.8 of patchelf. Fixes #578282
Package-Manager: portage-2.2.28
sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
index d1d5f7f..7abcf15 100644
--- a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
sci-libs/gdal
sci-libs/proj
)"
-DEPEND="dev-util/patchelf"
+DEPEND="~dev-util/patchelf-0.8"
S=${WORKDIR}/opt/google/earth/free
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-03-27 14:32 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2016-03-27 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 56f6cf615ddf40ef0a08a17554e028c483ae7c17
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 14:31:26 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 14:32:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f6cf61
sci-geosciences/googleearth: Better fix for #578282
Thanks to Klaus Kusche
Package-Manager: portage-2.2.28
sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
index 7abcf15..7024eaa 100644
--- a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
sci-libs/gdal
sci-libs/proj
)"
-DEPEND="~dev-util/patchelf-0.8"
+DEPEND="dev-util/patchelf"
S=${WORKDIR}/opt/google/earth/free
@@ -88,6 +88,7 @@ src_unpack() {
}
src_prepare() {
+
# we have no ld-lsb.so.3 symlink
# thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
einfo "running patchelf"
@@ -98,9 +99,12 @@ src_prepare() {
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}" ||
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2016-11-10 15:27 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2016-11-10 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 40ab0292c78cef9a4d1ab7290410cf65d4438734
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 00:40:39 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 15:26:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ab0292
sci-geosciences/googleearth: bump version
Package-Manager: portage-2.3.2
sci-geosciences/googleearth/Manifest | 4 ++--
.../{googleearth-7.1.4.1529.ebuild => googleearth-7.1.7.2606.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index eaae017..66d29ec 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,2 +1,2 @@
-DIST GoogleEarthLinux-7.1.4.1529_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
-DIST GoogleEarthLinux-7.1.4.1529_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
+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
diff --git a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild b/sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild
similarity index 100%
rename from sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
rename to sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/
@ 2017-02-05 17:37 Marc Schiffbauer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Schiffbauer @ 2017-02-05 17:37 UTC (permalink / raw
To: gentoo-commits
commit: ac548532d5f78c728b2b18e5b8481c04d0f591bc
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 17:37:07 2017 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 17:37:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac548532
sci-geosciences/googleearth: bump version, fixes #608222
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-geosciences/googleearth/Manifest | 4 ++--
.../{googleearth-7.1.7.2606.ebuild => googleearth-7.1.8.3036.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 66d29ec..1739144 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.8.3036.ebuild
similarity index 99%
rename from sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild
rename to sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild
index 7024eaa..518db59 100644
--- a/sci-geosciences/googleearth/googleearth-7.1.7.2606.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-05 17:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-25 23:29 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/googleearth/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-02-05 17:37 Marc Schiffbauer
2016-11-10 15:27 Marc Schiffbauer
2016-03-27 14:32 Marc Schiffbauer
2016-03-27 13:17 Marc Schiffbauer
2016-03-25 22:52 Marc Schiffbauer
2016-03-25 22:52 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox