summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-05-21 07:24:34 +0000
committerVlastimil Babka <caster@gentoo.org>2010-05-21 07:24:34 +0000
commit03263286cdc9957cd6a59bafbc2c9ab5db75ac5b (patch)
tree3d4ade6f2523dbcfdcaef1fe3f76adcdf2cfbaf7 /sci-geosciences/googleearth
parentVersion bump. (diff)
downloadgentoo-2-03263286cdc9957cd6a59bafbc2c9ab5db75ac5b.tar.gz
gentoo-2-03263286cdc9957cd6a59bafbc2c9ab5db75ac5b.tar.bz2
gentoo-2-03263286cdc9957cd6a59bafbc2c9ab5db75ac5b.zip
Unpack the unpacked tarballs in src_unpack using unpack. Should fix bug #320395. Apply patch in src_prepare.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/googleearth')
-rw-r--r--sci-geosciences/googleearth/ChangeLog7
-rw-r--r--sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild22
2 files changed, 20 insertions, 9 deletions
diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index ab6ce1ab7c25..0c31cdb405d2 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.7 2010/05/20 12:05:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.8 2010/05/21 07:24:34 caster Exp $
+
+ 21 May 2010; Vlastimil Babka <caster@gentoo.org>
+ googleearth-5.1.3535.3218.ebuild:
+ Unpack the unpacked tarballs in src_unpack using unpack. Should fix bug
+ #320395. Apply patch in src_prepare.
20 May 2010; Vlastimil Babka <caster@gentoo.org>
googleearth-5.1.3535.3218.ebuild:
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
index 3d2e64fe6926..dc88ed3a11d5 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.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.3535.3218.ebuild,v 1.4 2010/05/20 12:05:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v 1.5 2010/05/21 07:24:34 caster Exp $
EAPI=2
@@ -86,9 +86,19 @@ 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
}
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
@@ -96,7 +106,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() {
@@ -108,15 +118,11 @@ 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
+ cp -pPR "${WORKDIR}"/data/* "${D}"/opt/${PN} || die
if ! use qt-bundled; then
rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die