mime type updates for gnome

Package-Manager: portage-2.0.51-r13

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 8adcc8723a1fbebf1bde33efaf835104aff7fd73..0c0337ed857dda72931490d28c11812468d2c915 100644 (file)
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.93 2005/01/16 22:59:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.94 2005/01/17 07:09:38 suka Exp $
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  As everyone is now on Gnome 2.8: remove old mime stuff, add fdo-mime refresh
 
   16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/1.1.3/hardened-link.patch, +files/1.1.3/pthreadlink-fix.patch,

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index ad6b9b8fd62423c888e27aefda6250da438e2b69..91ca2a5bbbf000ddc392f20467e46d22c20d7e16 100644 (file)
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
-MD5 7f0d46430d8cf57682f3c5b0c1c4a4c5 openoffice-ximian-1.3.7.ebuild 17275
-MD5 70594205a7c08fe16fd50daf2797fbab ChangeLog 22950
+MD5 3002af33de2a362d2233f8b2c57fa644 openoffice-ximian-1.3.7.ebuild 17096
+MD5 cbd180dc56e0d310261efc2caa3db93b ChangeLog 23117
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502

diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
index dc88564813e85d216fca8c14464d5a89925e6858..b91b581cf120f147cb221af80a588961eae28eb6 100644 (file)
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.5 2005/01/16 22:59:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.6 2005/01/17 07:09:38 suka Exp $
 
 # Notes:
 #
@@ -24,7 +24,7 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit eutils fdo-mime flag-o-matic toolchain-funcs
 
 IUSE="curl gnome hardened java kde nptl zlib"
 
@@ -542,15 +542,6 @@ src_install() {
        insinto /usr/share/applications
        doins *.desktop
 
-       einfo "Installing mime info (need \"gnome\" or \"kde\" in USE)..."
-       if use gnome
-       then
-               insinto /usr/share/application-registry
-               doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
-               insinto /usr/share/mime-info
-               doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
-       fi
-
        if use kde
        then
                insinto /usr/share/mimelnk/application
@@ -581,6 +572,11 @@ src_install() {
 
 pkg_postinst() {
 
+       if use gnome; then
+               fdo-mime_desktop_database_update
+               fdo-mime_mime_database_update
+       fi
+
        einfo " To start Ximian-OpenOffice.org, run:"
        einfo
        einfo " $ xooffice"