Ignore QA checks and RESTRICT=strip, thanks to Jon Hood <squinky86@gentoo.org> and Jakub Moc <jakub@gentoo.org> in bug 136610 and use google scripts for the .desktop files, no revbump

Package-Manager: portage-2.1

3 files changed, 34 insertions, 24 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 93907fc902da..9607b4c740b1 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/googleearth
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.2 2006/06/13 05:50:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.3 2006/06/13 16:29:45 genstef Exp $
+
+  13 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  googleearth-4_beta.ebuild:
+  Ignore QA checks and RESTRICT=strip, thanks to Jon Hood
+  <squinky86@gentoo.org> and Jakub Moc <jakub@gentoo.org> in bug 136610 and
+  use google scripts for the .desktop files, no revbump
 
   13 Jun 2006; Olivier Crête <tester@gentoo.org> googleearth-4_beta.ebuild:
   Added ~amd64 keyword and deps, fixed digest
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index d1836ce4b758..11509ae1f4f4 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST GoogleEarthLinux.bin 16984110 RMD160 dca35f2d992d2cdda95117ae67991e4949b54198 SHA1 c02fd47c0ad0e7ff08b8f34834336d9b207b3f50 SHA256 a4b5a6fbbcc5bac2faf5e13b3f138c012e395fd33e52f0619088115141c80cfb
-EBUILD googleearth-4_beta.ebuild 1329 RMD160 44bfa398e7fed9e27733df9421e49200ee1fe54c SHA1 efe6684d9c0428e5e0aeb590cb86573518de7ee6 SHA256 670fc8f6c341257a15e672eeefb2642dc035795374a2a839bcbb9e86cada1512
-MD5 d468fb1d9f9b5c3a5dd7c66a426fc5ef googleearth-4_beta.ebuild 1329
-RMD160 44bfa398e7fed9e27733df9421e49200ee1fe54c googleearth-4_beta.ebuild 1329
-SHA256 670fc8f6c341257a15e672eeefb2642dc035795374a2a839bcbb9e86cada1512 googleearth-4_beta.ebuild 1329
-MISC ChangeLog 579 RMD160 c64e1536c5166f6b1405b64f1dbea5b1442a4c89 SHA1 06fa2c7121291ea6616ae3d7308e751a924a3784 SHA256 53473819ae669860bea525250ec8a26f723f22362058f96bbee38d6eb3c45a93
-MD5 afdfc7545366a22250bda628c1766fd3 ChangeLog 579
-RMD160 c64e1536c5166f6b1405b64f1dbea5b1442a4c89 ChangeLog 579
-SHA256 53473819ae669860bea525250ec8a26f723f22362058f96bbee38d6eb3c45a93 ChangeLog 579
+EBUILD googleearth-4_beta.ebuild 1849 RMD160 14a247d773e6903f39b19289edfc4fa21dd68e3d SHA1 cf25157b865d56cc9f24d65082293728db4df5e2 SHA256 69ee694131cb0a7d66d3946fea0cdc2c8e484d9ef10aba72eb8e8f2c4307f947
+MD5 44bf585df02fa733b9414a55d33b518d googleearth-4_beta.ebuild 1849
+RMD160 14a247d773e6903f39b19289edfc4fa21dd68e3d googleearth-4_beta.ebuild 1849
+SHA256 69ee694131cb0a7d66d3946fea0cdc2c8e484d9ef10aba72eb8e8f2c4307f947 googleearth-4_beta.ebuild 1849
+MISC ChangeLog 853 RMD160 4818d3d3c2aeaf0585b4a4ea966c0e7803e4e9fa SHA1 be686f1d5b79cfd81123f17f5c7017116e31ed11 SHA256 42c008d7e3c4b2019ab527a4623780f4be3ac9d3f8eca69169c8c8370f2bdd54
+MD5 7d2c98067e5d4f4b98b39090d3e0c3c3 ChangeLog 853
+RMD160 4818d3d3c2aeaf0585b4a4ea966c0e7803e4e9fa ChangeLog 853
+SHA256 42c008d7e3c4b2019ab527a4623780f4be3ac9d3f8eca69169c8c8370f2bdd54 ChangeLog 853
 MISC metadata.xml 304 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 SHA1 9776781765288eeb9d4009f8ace681f40d7750d5 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290
 MD5 b2b1706c8796732b917f1c2bbdfd39d4 metadata.xml 304
 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 metadata.xml 304
@@ -17,10 +14,3 @@ SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290 metadata
 MD5 072aa6b4521cf5ded9490f0650570994 files/digest-googleearth-4_beta 247
 RMD160 de6f0655f9ed4281c00a042c39d6e476da66253b files/digest-googleearth-4_beta 247
 SHA256 d270b37eb6ac65ebed89bf1e83d1eb8dd48ab96a370b832b678f42ad782ec170 files/digest-googleearth-4_beta 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEjlJ4oGcCqvCmTSIRApSQAKCHP9wJHhvAYQCeIt5y4wGn2bxLfQCdGd9C
-e2A1t5FO2f9IqOEbdigDleg=
-=xdsa
------END PGP SIGNATURE-----
diff --git a/x11-misc/googleearth/googleearth-4_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
index da24cd879801..f2532de62005 100644
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-4_beta.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.3 2006/06/13 05:50:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.4 2006/06/13 16:29:45 genstef Exp $
 
-inherit eutils
+inherit eutils fdo-mime
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="http://earth.google.com/"
@@ -11,7 +11,8 @@ SRC_URI="http://dl.google.com/earth/GE4/GoogleEarthLinux.bin"
 LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-RESTRICT="mirror"
+RESTRICT="mirror strip"
+QA_EXECSTACK_x86="opt/googleearth/libcrypto.so.0.9.8"
 IUSE=""
 
 RDEPEND="x86? (
@@ -32,19 +33,27 @@ RDEPEND="x86? (
 	|| (
 		>=app-emulation/emul-linux-x86-xlibs-7.0
 		>=media-video/nvidia-glx-1.0.6629-r3
-		>=x11-drivers/ati-drivers-8.8.25-r1 ) )"
+		>=x11-drivers/ati-drivers-8.8.25-r1 ) )
+	media-fonts/ttf-bitstream-vera"
 
 S=${WORKDIR}
 
 src_unpack() {
 	unpack_makeself
+	# make the postinst scripts behave
+	sed -i -e 's:$SETUP_INSTALLPATH/::' -e "s: --user: --system:" \
+		-e 's:$SETUP_INSTALLPATH:1:' postinstall.sh
+	sed -i -e "s:/usr:${D}/usr:g" -e "s:^detectDE$::" \
+		-e 's:-x $x/update-mime:-d nonexis:' \
+		-e 's:-x $x/update-desktop:-d nonexis:' linux/xdg/xdg-m{ime,enu}
 }
 
 src_install() {
 	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
 
+	dodir /usr/share/{appl{ications,nk},gnome/apps,mime/packages}
+	./postinstall.sh
 	doicon ${PN}-icon.png
-	make_desktop_entry ${PN} "Google Earth" ${PN}-icon.png
 
 	dodoc README.linux
 
@@ -56,3 +65,8 @@ src_install() {
 	cd ${D}/opt/${PN}
 	tar xpf ${WORKDIR}/${PN}-data.tar
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}