committing changes in /etc after emerge run

Package changes:
+gnome-base/gconf-2.32.4

diff --git a/.etckeeper b/.etckeeper
index fcb7ca9b391a59f388264906c6352494f384711b..0ba845d99832107f161937bef344801c99b8bd59 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -294,6 +294,7 @@ maybe chmod 0644 './env.d/20php5.3'
 maybe chmod 0644 './env.d/30gnupg'
 maybe chmod 0644 './env.d/30xdg-data-local'
 maybe chmod 0644 './env.d/37fontconfig'
+maybe chmod 0644 './env.d/50gconf'
 maybe chmod 0644 './env.d/50gtk2'
 maybe chmod 0644 './env.d/50guile'
 maybe chmod 0644 './env.d/50ncurses'
@@ -425,6 +426,15 @@ maybe chmod 0644 './freshclam.conf'
 maybe chmod 0644 './fstab'
 maybe chmod 0644 './gai.conf'
 maybe chmod 0755 './gconf'
+maybe chmod 0755 './gconf/2'
+maybe chmod 0644 './gconf/2/evoldap.conf'
+maybe chmod 0644 './gconf/2/path'
+maybe chmod 0755 './gconf/gconf.xml.defaults'
+maybe chmod 0644 './gconf/gconf.xml.defaults/.keep_gnome-base_gconf-2'
+maybe chmod 0755 './gconf/gconf.xml.mandatory'
+maybe chmod 0644 './gconf/gconf.xml.mandatory/.keep_gnome-base_gconf-2'
+maybe chmod 0755 './gconf/gconf.xml.system'
+maybe chmod 0644 './gconf/gconf.xml.system/.keep_gnome-base_gconf-2'
 maybe chmod 0755 './gconf/schemas'
 maybe chmod 0644 './gentoo-release'
 maybe chmod 0644 './gitconfig'
@@ -950,6 +960,9 @@ maybe chmod 0644 './vim/vimrc'
 maybe chmod 0644 './vim/vimrc.local'
 maybe chmod 0644 './wgetrc'
 maybe chmod 0644 './whois.conf'
+maybe chmod 0755 './xdg'
+maybe chmod 0755 './xdg/autostart'
+maybe chmod 0644 './xdg/autostart/gsettings-data-convert.desktop'
 maybe chmod 0755 './xinetd.d'
 maybe chmod 0644 './xinetd.d/cvspserver'
 maybe chmod 0644 './xinetd.d/rsyncd'

diff --git a/env.d/50gconf b/env.d/50gconf
new file mode 100644 (file)
index 0000000..3ee3da3
--- /dev/null
+++ b/env.d/50gconf
@@ -0,0 +1,2 @@
+CONFIG_PROTECT_MASK="/etc/gconf"
+GSETTINGS_BACKEND="gconf"

diff --git a/gconf/2/evoldap.conf b/gconf/2/evoldap.conf
new file mode 100644 (file)
index 0000000..41b2950
--- /dev/null
+++ b/gconf/2/evoldap.conf
@@ -0,0 +1,87 @@
+<evoldap>
+  <server>
+    <host></host> <!-- e.g. ldap.blaa.com -->
+    <port></port> <!-- defaults to 389 -->
+    <base_dn></base_dn> <!-- e.g. ou=people,dc=blaa,dc=com -->
+  </server>
+
+  <!--
+     The values of the following keys:
+       - /apps/evolution/mail/accounts
+       - /apps/evolution/addressbook/sources
+       - /apps/evolution/calendar/sources
+       - /apps/evolution/tasks/sources
+     will be constructed by applying each LDAP entry which matches
+     the "filter" attribute on the <template> tag to the template
+     template corresponding to the key.
+
+     If the filter returns multiple values, the value of the GConf
+     key will be a multiple element list.
+
+     Valid variables:
+       1) $(USER) - the username
+       2) $(EVOLUTION_UID) - mystical magical per-account UID string
+       3) $(LDAP_ATTR_foo) - the value of the "foo" attribute on the
+                             LDAP entry which matches the filter
+    -->
+
+  <template filter="(&amp;(uid=$(USER))(objectClass=inetOrgPerson)(objectClass=evolutionMailAccount)(objectClass=evolutionAddressbookSource)(objectClass=evolutionCalendarSource)(objectClass=evolutionTasksSource))">
+
+    <!-- /apps/evolution/mail/accounts -->
+    <account_template>
+      <account name="$(LDAP_ATTR_mail)" uid="$(EVOLUTION_UID)" enabled="true">
+        <identity>
+          <name>$(LDAP_ATTR_cn)</name>
+          <addr-spec>$(LDAP_ATTR_mail)</addr-spec>
+          <reply-to></reply-to>
+          <organization></organization>
+          <signature uid=""/>
+        </identity>
+        <source save-passwd="false" keep-on-server="false" auto-check="false" auto-check-timeout="10">
+          <url>$(LDAP_ATTR_evolutionMailSourceURI)</url>
+        </source>
+        <transport save-passwd="false">
+          <url>$(LDAP_ATTR_evolutionMailTransportURI)</url>
+        </transport>
+        <drafts-folder></drafts-folder>
+        <sent-folder></sent-folder>
+        <auto-cc always="false">
+          <recipients></recipients>
+        </auto-cc>
+        <auto-bcc always="false">
+          <recipients></recipients>
+        </auto-bcc>
+        <pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false">
+          <key-id></key-id>
+        </pgp>
+        <smime sign-default="false" encrypt-default="false" encrypt-to-self="false">
+          <sign-key-id></sign-key-id>
+          <encrypt-key-id></encrypt-key-id>
+        </smime>
+      </account>
+    </account_template>
+
+    <!-- /apps/evolution/addressbook/sources -->
+    <addressbook_template>
+      <group uid="$(EVOLUTION_UID)" name="Addressbook" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Addressbook" relative_uri="" uri="$(LDAP_ATTR_evolutionAddressbookURI)"/>
+      </group>
+    </addressbook_template>
+
+    <!-- /apps/evolution/calendar/sources -->
+    <calendar_template> 
+      <group uid="$(EVOLUTION_UID)" name="Calendar" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Calendar" relative_uri="" uri="$(LDAP_ATTR_evolutionCalendarURI)"/>
+      </group>p
+    </calendar_template>
+
+   <!-- /apps/evolution/tasks/sources -->
+   <tasks_template>
+      <group uid="$(EVOLUTION_UID)" name="Tasks" base_uri="" readonly="no">
+        <source uid="$(EVOLUTION_UID)" name="Tasks" relative_uri="" uri="$(LDAP_ATTR_evolutionTasksURI)"/>
+      </group>
+    </tasks_template>
+
+  </template>
+
+</evoldap>

diff --git a/gconf/2/path b/gconf/2/path
new file mode 100644 (file)
index 0000000..1601065
--- /dev/null
+++ b/gconf/2/path
@@ -0,0 +1,35 @@
+# This file stores the addresses of config sources for GConf
+# When a value is stored or requested, the sources are scanned from top to 
+# bottom, and the first one to have a value for the key (or the first one 
+# to be writeable) is used to load/store the data.
+
+# See the GConf manual for details
+
+# Look first in systemwide mandatory settings directory
+xml:readonly:/etc/gconf/gconf.xml.mandatory
+
+# To read in any mandatory settings that the Sys Admin may have created
+# prior to a desktop system upgrade. The SysAdmin can stick read-only system
+# wide sources in this file.
+include /etc/gconf/2/local-mandatory.path
+
+# Now see where users want us to look - basically the user can stick arbitrary 
+# sources in a ~/.gconf.path file and they're inserted here
+include "$(HOME)/.gconf.path"
+
+# Give users a default storage location, ~/.gconf
+xml:readwrite:$(HOME)/.gconf
+
+# Location for system-wide settings that are set by the defaults mechanism
+xml:readonly:/etc/gconf/gconf.xml.system
+
+# To read in any defaults settings that the Sys Admin may have created
+# prior to a desktop system upgrade. The SysAdmin can stick default values
+# system-wide in this file.
+include /etc/gconf/2/local-defaults.path
+
+# Finally, look at the systemwide defaults
+xml:readonly:/etc/gconf/gconf.xml.defaults
+
+
+

diff --git a/gconf/gconf.xml.defaults/.keep_gnome-base_gconf-2 b/gconf/gconf.xml.defaults/.keep_gnome-base_gconf-2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gconf/gconf.xml.mandatory/.keep_gnome-base_gconf-2 b/gconf/gconf.xml.mandatory/.keep_gnome-base_gconf-2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gconf/gconf.xml.system/.keep_gnome-base_gconf-2 b/gconf/gconf.xml.system/.keep_gnome-base_gconf-2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xdg/autostart/gsettings-data-convert.desktop b/xdg/autostart/gsettings-data-convert.desktop
new file mode 100644 (file)
index 0000000..8d9b38a
--- /dev/null
+++ b/xdg/autostart/gsettings-data-convert.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Version=1.0
+Name=GSettings Data Conversion
+Name[de]=GSettings-Datenumwandlung
+Name[en_GB]=GSettings Data Conversion
+Name[ru]=Преобразование данных GSettings
+Name[vi]=Chuyển đổi dữ liệu GSettings
+Comment=Migrates user settings from GConf to dconf
+Comment[de]=Migriert Benutzereinstellungen von GConf zu dconf
+Comment[en_GB]=Migrates user settings from GConf to dconf
+Comment[ru]=Переносит настройки пользователя из GConf в dconf
+Comment[vi]=Chuyển thiết lập người dùng từ GConf sang dconf
+Exec=gsettings-data-convert
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Initialization