Unpack the unpacked tarballs in src_unpack using unpack. Should fix bug #320395. Apply patch in src_prepare.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 22 insertions, 11 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/Manifest b/sci-geosciences/googleearth/Manifest
index 079e3528bd8a..e5a59be92671 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -9,6 +9,6 @@ EBUILD googleearth-4.2.205.5730.ebuild 2061 RMD160 cc75ccf1886e5f55e6f523a6defa2
 EBUILD googleearth-4.3.7284.3916.ebuild 2147 RMD160 78c1b7c4c8c59097d8a8058df9f149c530512d8d SHA1 9d088ab4f4faf42be813ad0db9d597b38472f15a SHA256 44163550eda61ec3528b892f2e6c017fae1f4bcec81c909db3883bb5ce8b3f16
 EBUILD googleearth-5.0.11733.9347.ebuild 2530 RMD160 00d41a87cd831a78d08e888c706c18c73b0dfa88 SHA1 ebc64b053aa0ae76451a317214986bf4384f81b3 SHA256 57b67c2f630e40011128d69e53c98e2c8144ded973ab7ee483b20309abc434e4
 EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3
-EBUILD googleearth-5.1.3535.3218.ebuild 3661 RMD160 3bdbb46f62266cb3566cd07e3365b65c02f2efd9 SHA1 40e4a5aa958948373fe3a7248b1e1b6d88302698 SHA256 7aea2f88b9f73f25f612095d06035cc20878c89458d8aafd877774089c9651d7
-MISC ChangeLog 12446 RMD160 297580de8e78773351c2343ddd55926a12fa58f1 SHA1 d9ea2bba36bc2029e9e7adf2fd333bf43c3cadd6 SHA256 4e566dee3c2320a53ca9991db3ed00b607b80d1bca9218179c356a83b8674fec
+EBUILD googleearth-5.1.3535.3218.ebuild 3805 RMD160 e26e4ebe12a0543332af1a33c247402643220941 SHA1 da5bb13fa7af60d06b113caa413e72e768610842 SHA256 47a50af6f38986a260cabe03b2a0e80dfb893368bbeefdd70b46212a4c8078b6
+MISC ChangeLog 12647 RMD160 4450b1d014659f190ddd1ffd2637cdeb8657c143 SHA1 47d93b5cd5831d265892317df3ea2daa1298f9a7 SHA256 d62cdfebf4431bb4472c07707e505e7524b62ac946bc16d960e53ca25abc5ecc
 MISC metadata.xml 781 RMD160 2e83a40de89567fbe455fc38e371e33f5516bed8 SHA1 e53e1ca79ff89f723a882a3813af4916ae307ef5 SHA256 21a5f5931406461b48ab291298c654a7e25d81ee0e47e8ab1d4b5cad82698c73
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