summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-06-08 18:43:46 +0200
committerThomas Sachau <tommy@gentoo.org>2010-06-08 18:43:46 +0200
commit191b8b639ac42fcec066ef422090e1ef0c63ab76 (patch)
treec354b8e18f0f6ef22f981822435730ceaf3caa24 /sci-geosciences/googleearth
parentcreated app-emulation/emul-linux-x86-opengl meta package (diff)
downloadmultilib-portage-191b8b639ac42fcec066ef422090e1ef0c63ab76.tar.gz
multilib-portage-191b8b639ac42fcec066ef422090e1ef0c63ab76.tar.bz2
multilib-portage-191b8b639ac42fcec066ef422090e1ef0c63ab76.zip
Sync googleearth
Diffstat (limited to 'sci-geosciences/googleearth')
-rw-r--r--sci-geosciences/googleearth/Manifest2
-rw-r--r--sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild (renamed from sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild)42
2 files changed, 26 insertions, 18 deletions
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 7545971cf..40bb9cf45 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -1,5 +1,5 @@
AUX decimal-separator.patch 310 RMD160 730861674fc8f07aa13ad5577840fcce34a3f9d2 SHA1 85552fc1988791f44c22ca355839d0f358076437 SHA256 0a5bf3024562484ff95ae369c956ee126d6ae59f201e65ef8e72695bda0946a0
DIST GoogleEarthLinux-5.1.3535.3218.bin 25932414 RMD160 46d7a763e835d657798f3cd198f1a7931d31b292 SHA1 3af3c817a587b6bfd6e0fb20de157751a3ea4fda SHA256 f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac
-EBUILD googleearth-5.1.3535.3218.ebuild 3509 RMD160 50d450252be576e87e1fc768f8271446ab4f8fd8 SHA1 7451f60b1e47dc895c6981df80e22487089fb46e SHA256 219ff7a568dfbc89a9ab70e0484bc1ba3ca900d551b344e1eb56ab0d14de3cac
+EBUILD googleearth-5.1.3535.3218-r1.ebuild 3689 RMD160 cae8f3c26dc667b0324151ab650689371aaddd3b SHA1 9d1305181ae007761a235ea04b4c0fbe035cdc39 SHA256 919585b72b9b5056cfac5b2d41d1322f95acf06b1087dcf4cad9c8900af3240d
MISC ChangeLog 11308 RMD160 e30393fcb117cb6600139b1ca7da1649043f4466 SHA1 4029078151dd5d754645fcd7c8349a77f4b196a0 SHA256 fcf64e71ec45086508f73c39ea8047ddc044844b72e706f6f577cbb3c9f5338b
MISC metadata.xml 626 RMD160 a86edde5c7fb06ad02761f159bc05239b2507521 SHA1 8bc7bd3f1767aea50d396a696a83ddbc660f3fbd SHA256 cbe80f8dd2f6cf2dc88c03bc2765a171f705502c6f1513cdd41b285aac87660c
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
index 8d4fdca94..1a4e1d1ed 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
@@ -1,6 +1,6 @@
# 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.3533.1731-r1.ebuild,v 1.3 2010/04/26 19:06:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.1 2010/06/07 14:48:17 caster Exp $
EAPI=2
@@ -13,9 +13,9 @@ HOMEPAGE="http://earth.google.com/"
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"
+LICENSE="googleearth GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RESTRICT="mirror strip"
IUSE="qt-bundled"
@@ -77,9 +77,27 @@ pkg_setup() {
src_unpack() {
unpack_makeself
+
+ cd "${WORKDIR}"/bin || die
+ unpack ./../${PN}-linux-x86.tar
+
+ mkdir "${WORKDIR}"/data && cd "${WORKDIR}"/data || die
+ unpack ./../${PN}-data.tar
+
+ cd "${WORKDIR}"/bin || die
+
+ if ! use qt-bundled; then
+ rm -v libQt{Core,Gui,Network,WebKit}.so.4 ../data/qt.conf || die
+ rm -frv ../data/plugins/imageformats || die
+ fi
+ rm -rvf libGLU.so.1 libcurl.so.4 libnss_mdns4_minimal.so.2 libgdal.so.1 || die
}
src_prepare() {
+ cd "${WORKDIR}"/bin || die
+ # bug #262780
+ epatch "${FILESDIR}/decimal-separator.patch"
+
# make the postinst script only create the files; it's installation
# are too complicated and inserting them ourselves is easier than
# hacking around it
@@ -87,7 +105,7 @@ src_prepare() {
-e 's:$SETUP_INSTALLPATH:1:' \
-e "s:^xdg-desktop-icon.*$::" \
-e "s:^xdg-desktop-menu.*$::" \
- -e "s:^xdg-mime.*$::" postinstall.sh
+ -e "s:^xdg-mime.*$::" "${WORKDIR}"/postinstall.sh || die
}
src_install() {
@@ -99,24 +117,14 @@ src_install() {
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"
+ cd bin || die
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 libnss_mdns4_minimal.so.2 libgdal.so.1 || die
-
+ cp -pPR "${WORKDIR}"/data/* "${D}"/opt/${PN} || die
fowners -R root:root /opt/${PN}
fperms -R a-x,a+X /opt/googleearth/resources
- scanelf -qXxzm ${D}opt/${PN}/${PN}-bin
+ scanelf -qXxzm "${D}"opt/${PN}/${PN}-bin
}
pkg_postinst() {