Merge branch 'master' of git.calculate.ru:calculate-templates

desktop/desktop/20-kde-4.3-4.4/.kde4/share/config/kxkbrc

@@ -1,4 +1,9 @@
 # Calculate format=kde
 #Раскладка клавиатуры
 [Layout]
+#?os_locale_xkb==us#
+Options=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#

desktop/desktop/20-kde-4.3/.kde4/share/config/kxkbrc

@@ -5,7 +5,12 @@ DisplayNames=#-os_locale_xkbname-#
 IndicatorOnly=false
 LayoutList=#-os_locale_xkb-#
 Model=pc104
+#?os_locale_xkb==us#
+Options=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#
 ResetOldOptions=true
 ShowFlag=true
 ShowSingle=false

desktop/desktop/20-kde-4.4/.kde4/share/config/kxkbrc

@@ -5,7 +5,12 @@ DisplayNames=#-os_locale_xkbname-#
 IndicatorOnly=false
 LayoutList=#-os_locale_xkb-#
 Model=pc104
+#?os_locale_xkb==us#
+Options=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#
 ResetOldOptions=true
 ShowFlag=true
 ShowSingle=false

desktop/desktop/30-gnome-2.26/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml

@@ -2,14 +2,18 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="options" type="list" ltype="string">
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp	grp:caps_toggle</stringvalue>
 		</li>
+#os_locale_xkb#
 		<li type="string">
 			<stringvalue>terminate	terminate:ctrl_alt_bksp</stringvalue>
 		</li>
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp_led	grp_led:scroll</stringvalue>
 		</li>
+#os_locale_xkb#
 	</entry>
 </gconf>

desktop/desktop/30-gnome-2.30/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml

@@ -2,14 +2,18 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="options" type="list" ltype="string">
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp	grp:caps_toggle</stringvalue>
 		</li>
+#os_locale_xkb#
 		<li type="string">
 			<stringvalue>terminate	terminate:ctrl_alt_bksp</stringvalue>
 		</li>
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp_led	grp_led:scroll</stringvalue>
 		</li>
+#os_locale_xkb#
 	</entry>
 </gconf>

desktop/desktop/40-cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc

@@ -1,3 +1,16 @@
 # Calculate format=procmail
+display_type=1
+group_policy=2
+default_group=0
+never_modify_config=false
+model=pc104
+layouts=#-os_locale_xkbname-#
+variants=,
+#?os_locale_xkb==us#
+options=terminate:ctrl_alt_bksp
+toggle_option=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
 toggle_option=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#

desktop/desktop/40-xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc

@@ -6,5 +6,11 @@ never_modify_config=false
 model=pc104
 layouts=#-os_locale_xkbname-#
 variants=,
+#?os_locale_xkb==us#
+options=terminate:ctrl_alt_bksp
+toggle_option=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
 toggle_option=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#

desktop/desktop/80-patch-2.1.16/.kde4/share/config/kxkbrc

@@ -1,4 +1,9 @@
 # Calculate format=kde
-#Раскладка клавиатуры
+# Keyboard layout
 [Layout]
+#?os_locale_xkb==us#
+Options=terminate:ctrl_alt_bksp
+#os_locale_xkb#
+#?os_locale_xkb!=us#
 Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
+#os_locale_xkb#

desktop/desktop/80-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml

@@ -2,14 +2,18 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="options" type="list" ltype="string">
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp	grp:caps_toggle</stringvalue>
 		</li>
+#os_locale_xkb#
 		<li type="string">
 			<stringvalue>terminate	terminate:ctrl_alt_bksp</stringvalue>
 		</li>
+#?os_locale_xkb!=us#
 		<li type="string">
 			<stringvalue>grp_led	grp_led:scroll</stringvalue>
 		</li>
+#os_locale_xkb#
 	</entry>
 </gconf>

install/merge/hal/10osvendor/10-x11-input.fdi

@@ -8,12 +8,14 @@
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
              string="Linux">
         <merge key="input.x11_driver" type="string">evdev</merge>
-	<merge key="input.xkb.rules" type="string">xorg</merge>
-	<merge key="input.xkb.layout" type="string">#-os_install_locale_xkbname-#</merge>
-	<merge key="input.xkb.model" type="string">pc104</merge>
-	<merge key="input.xkb.options" type="string">grp:caps_toggle</merge>
-	<append key="input.xkb.options" type="string">,grp:switch</append>
-	<append key="input.xkb.options" type="string">,grp_led:caps</append>
+        <merge key="input.xkb.rules" type="string">xorg</merge>
+        <merge key="input.xkb.layout" type="string">#-os_install_locale_xkbname-#</merge>
+        <merge key="input.xkb.model" type="string">pc104</merge>
+#?os_locale_xkb!=us#
+        <merge key="input.xkb.options" type="string">grp:caps_toggle</merge>
+        <append key="input.xkb.options" type="string">,grp:switch</append>
+        <append key="input.xkb.options" type="string">,grp_led:caps</append>
+#os_locale_xkb#
       </match>
     </match>
 

install/merge/prelink/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate belong()!=&&pkg(sys-devel/prelink)!= name=etc
+

install/merge/prelink/conf.d/prelink

@@ -0,0 +1,2 @@
+# Calculate comment=# format=procmail
+PRELINKING="yes"

install/merge/prelink/cron.daily/prelink

@@ -0,0 +1,3 @@
+# Calculate format=patch
+<reg>\n(\[ -n "\$\(find `ldd /sbin/init .*/sbin/telinit u)</reg>
+<text>\n#\1</text>