1 files changed, 30 insertions, 72 deletions

diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 815d0278a444..5b82e2996cf1 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1,57 +1,51 @@
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
 bin/gswitchit-plugins-capplet
-etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml
-%%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
-%%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/charpick/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivemount-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivemount-applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml
+%%BATTERY%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
 %%BATTERY%%etc/gconf/schemas/battstat.schemas
+%%BATTERY%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/cdplayer.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/charpick.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/drivemount.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/geyes.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gkb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gswitchit.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gtik.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gweather.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/mailcheck.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/mini-commander.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/mixer.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/modemlights.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/multiload.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/stickynotes.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
 etc/sound/events/mailcheck.soundlist
 include/libgswitchit/gswitchit_plugin.h
@@ -2192,42 +2186,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%BATTERY%%@dirrm share/gnome/battstat_applet
 @dirrm libexec/gnome-applets
 @dirrm include/libgswitchit
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/drivemount-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/drivemount-applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/charpick/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/charpick
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
-%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
-%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults
-@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-eu.omf 2>/dev/null || /usr/bin/true
 %%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true