3 files changed, 90 insertions, 16 deletions

diff --git a/meta/classes/gnome.bbclass b/meta/classes/gnome.bbclass
index 3d68b12e9e..a19dd1703a 100644
--- a/meta/classes/gnome.bbclass
+++ b/meta/classes/gnome.bbclass
@@ -1,17 +1,3 @@
-def gnome_verdir(v):
-        import re
-        m = re.match("^([0-9]+)\.([0-9]+)", v)
-        return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
 
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"
-
-FILES_${PN} += "${datadir}/application-registry \
-    ${datadir}/mime-info \
-    ${datadir}/gnome-2.0"
-
-inherit autotools pkgconfig gconf
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+EXTRA_OECONF += "--enable-introspection=no"
diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass
new file mode 100644
index 0000000000..a4209a0289
--- /dev/null
+++ b/meta/classes/gnomebase.bbclass
@@ -0,0 +1,30 @@
+def gnome_verdir(v):
+        import re
+        m = re.match("^([0-9]+)\.([0-9]+)", v)
+        return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry  \
+        ${datadir}/mime-info \
+        ${datadir}/mime/packages \      
+        ${datadir}/mime/application \
+        ${datadir}/gnome-2.0 \
+        ${datadir}/polkit* \
+        ${datadir}/GConf \
+        ${datadir}/glib-2.0/schemas \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+        rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+        rm -rf ${D}${localstatedir}/scrollkeeper/*
+        rm -f ${D}${datadir}/applications/*.cache
+}
+
diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass
new file mode 100644
index 0000000000..2d17d9cd0d
--- /dev/null
+++ b/meta/classes/mime.bbclass
@@ -0,0 +1,58 @@
+DEPENDS += "shared-mime-info-native shared-mime-info"
+
+mime_postinst() {
+if [ "$1" = configure ]; then
+        UPDATEMIMEDB=`which update-mime-database`
+        if [ -x "$UPDATEMIMEDB" ] ; then
+                echo "Updating MIME database... this may take a while."
+                $UPDATEMIMEDB $D${datadir}/mime
+        else
+                echo "Missing update-mime-database, update of mime database failed!"
+                exit 1
+        fi
+fi
+}
+
+mime_postrm() {
+if [ "$1" = remove ] || [ "$1" = upgrade ]; then
+        UPDATEMIMEDB=`which update-mime-database`
+        if [ -x "$UPDATEMIMEDB" ] ; then
+                echo "Updating MIME database... this may take a while."
+                $UPDATEMIMEDB $D${datadir}/mime
+        else
+                echo "Missing update-mime-database, update of mime database failed!"
+                exit 1
+        fi
+fi
+}
+
+python populate_packages_append () {
+        import os.path, re
+        packages = d.getVar('PACKAGES', True).split()
+        pkgdest =  d.getVar('PKGDEST', True)
+
+        for pkg in packages:
+                mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg)
+                mimes = []
+                mime_re = re.compile(".*\.xml$")
+                if os.path.exists(mime_dir):
+                        for f in os.listdir(mime_dir):
+                                if mime_re.match(f):
+                                        mimes.append(f)
+                if mimes:
+                        bb.note("adding mime postinst and postrm scripts to %s" % pkg)
+                        postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
+                        if not postinst:
+                                postinst = '#!/bin/sh\n'
+                        postinst += d.getVar('mime_postinst', True)
+                        d.setVar('pkg_postinst_%s' % pkg, postinst)
+                        postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
+                        if not postrm:
+                                postrm = '#!/bin/sh\n'
+                        postrm += d.getVar('mime_postrm', True)
+                        d.setVar('pkg_postrm_%s' % pkg, postrm)
+                        bb.note("adding shared-mime-info-data dependency to %s" % pkg)
+                        rdepends = explode_deps(dgetVar('RDEPENDS_' + pkg, False) or d.getVar('RDEPENDS', False)) or ""
+                        rdepends.append("shared-mime-info-data")
+                        d.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends))
+}