3 files changed, 25 insertions, 32 deletions
diff --git a/desktop/cairo-compmgr/cairo-compmgr.SlackBuild b/desktop/cairo-compmgr/cairo-compmgr.SlackBuild
index 20eedd2e35..6f6fc95209 100644
--- a/desktop/cairo-compmgr/cairo-compmgr.SlackBuild
+++ b/desktop/cairo-compmgr/cairo-compmgr.SlackBuild
@@ -7,7 +7,7 @@
 
 PRGNAM=cairo-compmgr
 VERSION=${VERSION:-0.3.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -89,12 +89,6 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Mess with gconf crap.
-if [ "$WITH_GCONF" != YES ]; then
-  # I think we can safely remove this if you disabled gconf.
-  rm -f $PKG/usr/bin/ccm-schema-key-to-gconf
-fi
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -117,7 +111,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
-[ "$WITH_GCONF" = YES ] && cat $CWD/doinst-gconf.sh >> $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/cairo-compmgr/doinst-gconf.sh b/desktop/cairo-compmgr/doinst-gconf.sh
deleted file mode 100644
index 1d6889ea62..0000000000
--- a/desktop/cairo-compmgr/doinst-gconf.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null
-}
-
-schema_install ccm-screen.schemas
-schema_install ccm-shadow.schemas
-schema_install ccm-window-animation.schemas
-schema_install ccm-freeze.schemas
-schema_install ccm-vala-window-plugin.schemas
-schema_install ccm-fade.schemas
-schema_install ccm-menu-animation.schemas
-schema_install ccm-perf.schemas
-schema_install ccm-snapshot.schemas
-schema_install ccm-magnifier.schemas
-schema_install ccm-mosaic.schemas
-schema_install ccm-automate.schemas
-schema_install ccm-opacity.schemas
-schema_install ccm-decoration.schemas
-schema_install ccm-display.schemas
-
diff --git a/desktop/cairo-compmgr/doinst.sh b/desktop/cairo-compmgr/doinst.sh
index 9830478e8c..577be57705 100644
--- a/desktop/cairo-compmgr/doinst.sh
+++ b/desktop/cairo-compmgr/doinst.sh
@@ -1,3 +1,27 @@
+schema_install() {
+  SCHEMA="$1"
+  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+  chroot . gconftool-2 --makefile-install-rule \
+    /etc/gconf/schemas/$SCHEMA \
+    1>/dev/null
+}
+
+schema_install ccm-screen.schemas
+schema_install ccm-shadow.schemas
+schema_install ccm-window-animation.schemas
+schema_install ccm-freeze.schemas
+schema_install ccm-vala-window-plugin.schemas
+schema_install ccm-fade.schemas
+schema_install ccm-menu-animation.schemas
+schema_install ccm-perf.schemas
+schema_install ccm-snapshot.schemas
+schema_install ccm-magnifier.schemas
+schema_install ccm-mosaic.schemas
+schema_install ccm-automate.schemas
+schema_install ccm-opacity.schemas
+schema_install ccm-decoration.schemas
+schema_install ccm-display.schemas
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi