From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 19 Nov 2015 18:40:42 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b0512fd9e8d9ba07b4ee8143723ded6842008992;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index ed9b14c2..69809f97 100644
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2114,39 +2114,40 @@
 	<dir name="desktop">
 		<dir name="ibus">
 			<dir name="panel">
-				<entry name="xkb-icon-rgba" mtime="1435361038" schema="/schemas/desktop/ibus/panel/xkb-icon-rgba"/>
-				<entry name="follow-input-cursor-when-always-shown" mtime="1435361038" schema="/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown"/>
-				<entry name="auto-hide-timeout" mtime="1435361038" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
-				<entry name="custom_font" mtime="1435361038" schema="/schemas/desktop/ibus/panel/custom_font"/>
-				<entry name="use_custom_font" mtime="1435361038" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
-				<entry name="show_im_name" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show_im_name"/>
-				<entry name="show_icon_on_systray" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
-				<entry name="lookup_table_orientation" mtime="1435361038" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
-				<entry name="y" mtime="1435361038" schema="/schemas/desktop/ibus/panel/y"/>
-				<entry name="x" mtime="1435361038" schema="/schemas/desktop/ibus/panel/x"/>
-				<entry name="show" mtime="1435361038" schema="/schemas/desktop/ibus/panel/show"/>
+				<entry name="property-icon-delay-time" mtime="1447958425" schema="/schemas/desktop/ibus/panel/property-icon-delay-time"/>
+				<entry name="xkb-icon-rgba" mtime="1447958425" schema="/schemas/desktop/ibus/panel/xkb-icon-rgba"/>
+				<entry name="follow-input-cursor-when-always-shown" mtime="1447958425" schema="/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown"/>
+				<entry name="auto-hide-timeout" mtime="1447958425" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
+				<entry name="custom_font" mtime="1447958425" schema="/schemas/desktop/ibus/panel/custom_font"/>
+				<entry name="use_custom_font" mtime="1447958425" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
+				<entry name="show_im_name" mtime="1447958425" schema="/schemas/desktop/ibus/panel/show_im_name"/>
+				<entry name="show_icon_on_systray" mtime="1447958425" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
+				<entry name="lookup_table_orientation" mtime="1447958425" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
+				<entry name="y" mtime="1447958425" schema="/schemas/desktop/ibus/panel/y"/>
+				<entry name="x" mtime="1447958425" schema="/schemas/desktop/ibus/panel/x"/>
+				<entry name="show" mtime="1447958425" schema="/schemas/desktop/ibus/panel/show"/>
 			</dir>
 			<dir name="general">
-				<entry name="use-xmodmap" mtime="1435361038" schema="/schemas/desktop/ibus/general/use-xmodmap"/>
-				<entry name="xkb-latin-layouts" mtime="1435361038" schema="/schemas/desktop/ibus/general/xkb-latin-layouts"/>
-				<entry name="version" mtime="1435361038" schema="/schemas/desktop/ibus/general/version"/>
-				<entry name="dconf_preserve_name_prefixes" mtime="1435361038" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
-				<entry name="enable_by_default" mtime="1435361038" schema="/schemas/desktop/ibus/general/enable_by_default"/>
-				<entry name="use_global_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/use_global_engine"/>
-				<entry name="embed_preedit_text" mtime="1435361038" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
-				<entry name="use_system_keyboard_layout" mtime="1435361038" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
-				<entry name="switcher-delay-time" mtime="1435361038" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
-				<entry name="engines_order" mtime="1435361038" schema="/schemas/desktop/ibus/general/engines_order"/>
-				<entry name="preload_engines" mtime="1435361038" schema="/schemas/desktop/ibus/general/preload_engines"/>
+				<entry name="use-xmodmap" mtime="1447958425" schema="/schemas/desktop/ibus/general/use-xmodmap"/>
+				<entry name="xkb-latin-layouts" mtime="1447958425" schema="/schemas/desktop/ibus/general/xkb-latin-layouts"/>
+				<entry name="version" mtime="1447958425" schema="/schemas/desktop/ibus/general/version"/>
+				<entry name="dconf_preserve_name_prefixes" mtime="1447958425" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
+				<entry name="enable_by_default" mtime="1447958425" schema="/schemas/desktop/ibus/general/enable_by_default"/>
+				<entry name="use_global_engine" mtime="1447958425" schema="/schemas/desktop/ibus/general/use_global_engine"/>
+				<entry name="embed_preedit_text" mtime="1447958425" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
+				<entry name="use_system_keyboard_layout" mtime="1447958425" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
+				<entry name="switcher-delay-time" mtime="1447958425" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
+				<entry name="engines_order" mtime="1447958425" schema="/schemas/desktop/ibus/general/engines_order"/>
+				<entry name="preload_engines" mtime="1447958425" schema="/schemas/desktop/ibus/general/preload_engines"/>
 				<dir name="hotkey">
-					<entry name="previous_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
-					<entry name="prev_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
-					<entry name="next_engine_in_menu" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
-					<entry name="next_engine" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
-					<entry name="disable_unconditional" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
-					<entry name="enable_unconditional" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
-					<entry name="triggers" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
-					<entry name="trigger" mtime="1435361038" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
+					<entry name="previous_engine" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
+					<entry name="prev_engine" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
+					<entry name="next_engine_in_menu" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
+					<entry name="next_engine" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
+					<entry name="disable_unconditional" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
+					<entry name="enable_unconditional" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
+					<entry name="triggers" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
+					<entry name="trigger" mtime="1447958425" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
 				</dir>
 			</dir>
 		</dir>
@@ -16529,7 +16530,18 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 		<dir name="desktop">
 			<dir name="ibus">
 				<dir name="panel">
-					<entry name="xkb-icon-rgba" mtime="1435361038" type="schema" stype="string" owner="ibus">
+					<entry name="property-icon-delay-time" mtime="1447958425" type="schema" stype="int" owner="ibus">
+						<local_schema locale="C" short_desc="The milliseconds to show the panel icon for a property">
+							<default type="int" value="500"/>
+							<longdesc>The milliseconds to show the panel icon from the
+                engine icon to a property icon whenever engines are
+                switched if the property is specified by the value of
+                icon-prop-key in IBusEngineDesc.
+                If the value is 0, no delay time and the property icon
+                is shown immediately.</longdesc>
+						</local_schema>
+					</entry>
+					<entry name="xkb-icon-rgba" mtime="1447958425" type="schema" stype="string" owner="ibus">
 						<local_schema locale="C" short_desc="RGBA value of XKB icon">
 							<default type="string">
 								<stringvalue>#415099</stringvalue>
@@ -16546,7 +16558,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                   of the alpha.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="follow-input-cursor-when-always-shown" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="follow-input-cursor-when-always-shown" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Follow the input cursor in case the panel is always shown">
 							<default type="bool" value="false"/>
 							<longdesc>If true, the panel follows the input cursor in case the
@@ -16554,14 +16566,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                 a fixed location.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="auto-hide-timeout" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="auto-hide-timeout" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="The milliseconds to show property panel">
 							<default type="int" value="10000"/>
 							<longdesc>The milliseconds to show property panel after focus-in or
                 properties are changed.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="custom_font" mtime="1435361038" type="schema" stype="string" owner="ibus">
+					<entry name="custom_font" mtime="1447958425" type="schema" stype="string" owner="ibus">
 						<local_schema locale="C" short_desc="Custom font">
 							<default type="string">
 								<stringvalue>Sans 10</stringvalue>
@@ -16569,41 +16581,41 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 							<longdesc>Custom font name for language panel</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="use_custom_font" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="use_custom_font" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Use custom font">
 							<default type="bool" value="false"/>
 							<longdesc>Use custom font name for language panel</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_im_name" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="show_im_name" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Show input method name">
 							<default type="bool" value="false"/>
 							<longdesc>Show input method name on language bar</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_icon_on_systray" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="show_icon_on_systray" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Show icon on system tray">
 							<default type="bool" value="true"/>
 							<longdesc>Show icon on system tray</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="lookup_table_orientation" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="lookup_table_orientation" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="Orientation of lookup table">
 							<default type="int" value="1"/>
 							<longdesc>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="y" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="y" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="Language panel position">
 							<default type="int" value="-1"/>
 						</local_schema>
 					</entry>
-					<entry name="x" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="x" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="Language panel position">
 							<default type="int" value="-1"/>
 						</local_schema>
 					</entry>
-					<entry name="show" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="show" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="Auto hide">
 							<default type="int" value="0"/>
 							<longdesc>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</longdesc>
@@ -16611,14 +16623,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 					</entry>
 				</dir>
 				<dir name="general">
-					<entry name="use-xmodmap" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="use-xmodmap" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Use xmodmap">
 							<default type="bool" value="true"/>
 							<longdesc>Run xmodmap if .xmodmap or .Xmodmap exists when
                 ibus engines are switched.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="xkb-latin-layouts" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+					<entry name="xkb-latin-layouts" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 						<local_schema locale="C" short_desc="Latin layouts which have no ASCII">
 							<default type="list" ltype="string">
 								<li type="string">
@@ -16663,7 +16675,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
            </longdesc>
 						</local_schema>
 					</entry>
-					<entry name="version" mtime="1435361038" type="schema" stype="string" owner="ibus">
+					<entry name="version" mtime="1447958425" type="schema" stype="string" owner="ibus">
 						<local_schema locale="C" short_desc="Saved version number">
 							<default type="string">
 								<stringvalue></stringvalue>
@@ -16674,7 +16686,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
 						</local_schema>
 					</entry>
-					<entry name="dconf_preserve_name_prefixes" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+					<entry name="dconf_preserve_name_prefixes" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 						<local_schema locale="C" short_desc="DConf preserve name prefixes">
 							<default type="list" ltype="string">
 								<li type="string">
@@ -16690,32 +16702,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 							<longdesc>Prefixes of DConf keys to stop name conversion</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="enable_by_default" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="enable_by_default" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Enable input method by default">
 							<default type="bool" value="false"/>
 							<longdesc>Enable input method by default when the application gets input
             focus</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="use_global_engine" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="use_global_engine" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Use global input method">
 							<default type="bool" value="true"/>
 							<longdesc>Share the same input method among all applications</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="embed_preedit_text" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="embed_preedit_text" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Embed Preedit Text">
 							<default type="bool" value="true"/>
 							<longdesc>Embed Preedit Text in Application Window</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="use_system_keyboard_layout" mtime="1435361038" type="schema" stype="bool" owner="ibus">
+					<entry name="use_system_keyboard_layout" mtime="1447958425" type="schema" stype="bool" owner="ibus">
 						<local_schema locale="C" short_desc="Use system keyboard layout">
 							<default type="bool" value="false"/>
 							<longdesc>Use system keyboard (XKB) layout</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="switcher-delay-time" mtime="1435361038" type="schema" stype="int" owner="ibus">
+					<entry name="switcher-delay-time" mtime="1447958425" type="schema" stype="int" owner="ibus">
 						<local_schema locale="C" short_desc="Popup delay milliseconds for IME switcher window">
 							<default type="int" value="400"/>
 							<longdesc>Set popup delay milliseconds to show IME switcher window.
@@ -16726,14 +16738,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
 						</local_schema>
 					</entry>
-					<entry name="engines_order" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+					<entry name="engines_order" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 						<local_schema locale="C" short_desc="Engines order">
 							<default type="list" ltype="string">
 							</default>
 							<longdesc>Saved engines order in input method list</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="preload_engines" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+					<entry name="preload_engines" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 						<local_schema locale="C" short_desc="Preload engines">
 							<default type="list" ltype="string">
 							</default>
@@ -16741,21 +16753,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 						</local_schema>
 					</entry>
 					<dir name="hotkey">
-						<entry name="previous_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="previous_engine" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Prev engine shortcut keys">
 								<default type="list" ltype="string">
 								</default>
 								<longdesc>The shortcut keys for switching to the previous input method</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="prev_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="prev_engine" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Prev engine shortcut keys">
 								<default type="list" ltype="string">
 								</default>
 								<longdesc>The shortcut keys for switching to the previous input method</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="next_engine_in_menu" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="next_engine_in_menu" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Next engine shortcut keys">
 								<default type="list" ltype="string">
 									<li type="string">
@@ -16765,7 +16777,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 								<longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="next_engine" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="next_engine" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Next engine shortcut keys">
 								<default type="list" ltype="string">
 									<li type="string">
@@ -16775,21 +16787,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 								<longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="disable_unconditional" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="disable_unconditional" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Disable shortcut keys">
 								<default type="list" ltype="string">
 								</default>
 								<longdesc>The shortcut keys for turning input method off</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="enable_unconditional" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="enable_unconditional" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Enable shortcut keys">
 								<default type="list" ltype="string">
 								</default>
 								<longdesc>The shortcut keys for turning input method on</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="triggers" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="triggers" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Trigger shortcut keys for gtk_accelerator_parse">
 								<default type="list" ltype="string">
 									<li type="string">
@@ -16799,7 +16811,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 								<longdesc>The shortcut keys for turning input method on or off</longdesc>
 							</local_schema>
 						</entry>
-						<entry name="trigger" mtime="1435361038" type="schema" stype="list" owner="ibus" list_type="string">
+						<entry name="trigger" mtime="1447958425" type="schema" stype="list" owner="ibus" list_type="string">
 							<local_schema locale="C" short_desc="Trigger shortcut keys">
 								<default type="list" ltype="string">
 									<li type="string">