Add some magic to the googleearth mime file to improve handling in gnome, thanks to Ed Catmur <ed@catmur.co.uk> in bug 141371

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 35 insertions, 10 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 328ebc873d28..dc0fd06989be 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2006/07/19 06:33:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.11 2006/07/23 15:12:12 genstef Exp $
+
+  23 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/mime-magic.patch, googleearth-4_beta.ebuild:
+  Add some magic to the googleearth mime file to improve handling in gnome,
+  thanks to Ed Catmur <ed@catmur.co.uk> in bug 141371
 
   19 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
   googleearth-4_beta.ebuild:
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index cb91eee5010e..33fc0c3bad2b 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -1,12 +1,16 @@
+AUX mime-magic.patch 585 RMD160 820d48ce8ce63dba1123fd7d207b12d489099041 SHA1 7c4bcfa22cbfd2e769dd7a6a2f4807dcb98b6695 SHA256 fe2cd0813aa1f2aac01f22398df97f2267071dee8435652127d60b01ed45706e
+MD5 e415e02a2404179e56741836c564a12c files/mime-magic.patch 585
+RMD160 820d48ce8ce63dba1123fd7d207b12d489099041 files/mime-magic.patch 585
+SHA256 fe2cd0813aa1f2aac01f22398df97f2267071dee8435652127d60b01ed45706e files/mime-magic.patch 585
 DIST GoogleEarthLinux.bin 17033653 RMD160 558ef65665e1a7e896c77f0358e0ca23dc192a93 SHA1 5ef0f6a9201a6c57e9438656192722bd22b35b6a SHA256 10898f018ee27df4407dd3e93651f384b59fa92b5fadb82288bd4ecbdf1bbd25
-EBUILD googleearth-4_beta.ebuild 2022 RMD160 cfba5fbe27e46095393a580f2e858e913a2d1a82 SHA1 18856b8268cd98b0a9e674286f289b1669c4b8db SHA256 1ae650e621acd3b0a8e3ce31a12d58e668b6c027c53686cf9725848046954cc4
-MD5 0ea745c4887792ff97e761905ef2d5f5 googleearth-4_beta.ebuild 2022
-RMD160 cfba5fbe27e46095393a580f2e858e913a2d1a82 googleearth-4_beta.ebuild 2022
-SHA256 1ae650e621acd3b0a8e3ce31a12d58e668b6c027c53686cf9725848046954cc4 googleearth-4_beta.ebuild 2022
-MISC ChangeLog 1974 RMD160 8ffba150a892d391f26056215d2b3066d3fd5bb1 SHA1 e08e8ded3c5bb7db3cda196e6957cb55bf2d8974 SHA256 a1ea476962dd0a7ef1168f06619333c5faec7733807fabee7e98cad147209f99
-MD5 8933d49b5db94387c6dc790d97af5043 ChangeLog 1974
-RMD160 8ffba150a892d391f26056215d2b3066d3fd5bb1 ChangeLog 1974
-SHA256 a1ea476962dd0a7ef1168f06619333c5faec7733807fabee7e98cad147209f99 ChangeLog 1974
+EBUILD googleearth-4_beta.ebuild 2120 RMD160 ac73ec465d63d895580a001dbcbe919522852055 SHA1 d90c5c5a1f15f2014d7bc3ccffb373d3315d4ba6 SHA256 9ff600b0ea9d9262da25990a3ce9566749871194b9f1819eb4693c44b2bad005
+MD5 8e153d767b888cb0914077ef33b527b7 googleearth-4_beta.ebuild 2120
+RMD160 ac73ec465d63d895580a001dbcbe919522852055 googleearth-4_beta.ebuild 2120
+SHA256 9ff600b0ea9d9262da25990a3ce9566749871194b9f1819eb4693c44b2bad005 googleearth-4_beta.ebuild 2120
+MISC ChangeLog 2212 RMD160 b1375148ea6bd33a67b9804e779cefb0cf10f216 SHA1 c3b12d3e889fa90faca31649b89d4a7449b170da SHA256 2204add9b2dc1326153158c4c245aa0ff963e1faa1c24d36f95850d0bc1d954e
+MD5 c0f051af77435c98b70cc0fe563d3955 ChangeLog 2212
+RMD160 b1375148ea6bd33a67b9804e779cefb0cf10f216 ChangeLog 2212
+SHA256 2204add9b2dc1326153158c4c245aa0ff963e1faa1c24d36f95850d0bc1d954e ChangeLog 2212
 MISC metadata.xml 304 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 SHA1 9776781765288eeb9d4009f8ace681f40d7750d5 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290
 MD5 b2b1706c8796732b917f1c2bbdfd39d4 metadata.xml 304
 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 metadata.xml 304
diff --git a/x11-misc/googleearth/files/mime-magic.patch b/x11-misc/googleearth/files/mime-magic.patch
new file mode 100644
index 000000000000..f45482e129e3
--- /dev/null
+++ b/x11-misc/googleearth/files/mime-magic.patch
@@ -0,0 +1,12 @@
+--- usr/share/mime/packages/googleearth-mimetypes.xml	2006-07-22 10:13:03.000000000 +0100
++++ usr/share/mime/packages/googleearth-mimetypes.xml	2006-07-22 10:41:14.584945382 +0100
+@@ -2,6 +2,9 @@
+ <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+   <mime-type type="application/vnd.google-earth.kml+xml">
+     <comment>Keyhole Markup Language data</comment>
++    <magic priority="60">
++      <match value="&lt;kml xmlns=&quot;http://earth.google.com/kml/2.0&quot;&gt;" type="string" offset="0:64"/>
++    </magic>
+     <glob pattern="*.kml"/>
+   </mime-type>
+ 
diff --git a/x11-misc/googleearth/googleearth-4_beta.ebuild b/x11-misc/googleearth/googleearth-4_beta.ebuild
index eac2fc9e9539..c3aa112582ad 100644
--- a/x11-misc/googleearth/googleearth-4_beta.ebuild
+++ b/x11-misc/googleearth/googleearth-4_beta.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2006/07/19 06:33:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-4_beta.ebuild,v 1.9 2006/07/23 15:12:12 genstef Exp $
 
 inherit eutils fdo-mime
 
@@ -67,6 +67,10 @@ src_install() {
 	cd ${D}/opt/${PN}
 	tar xf ${WORKDIR}/${PN}-data.tar
 
+	cd ${D}
+	# mime magic for gnome by Ed Catmur in bug 141371
+	epatch ${FILESDIR}/mime-magic.patch
+
 	# make sure we install with correct permissions
 	fowners -R root:root /opt/${PN}
 	fperms -R a-x,a+X /opt/googleearth/{xml,res{,ources}}