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

desktop/desktop/60-xscreensaver-5.10/.Xdefaults

@@ -0,0 +1,22 @@
+# Calculate format=raw
+! xscreensaver ---------------------------------------------------------------
+
+!font settings
+#?pkg(media-fonts/droid)!=#
+xscreensaver.Dialog.headingFont:        -*-droid sans-bold-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.bodyFont:           -*-droid sans-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.labelFont:          -*-droid sans-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.unameFont:          -*-droid sans-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.buttonFont:         -*-droid sans-bold-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.dateFont:           -*-droid sans-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.passwd.passwdFont:         -*-droid sans-bold-r-*-*-10-*-*-*-*-*-*-*
+#pkg#
+#?pkg(media-fonts/droid)==#
+xscreensaver.Dialog.headingFont:        -*-verdana-bold-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.bodyFont:           -*-verdana-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.labelFont:          -*-verdana-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.unameFont:          -*-verdana-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.Dialog.buttonFont:         -*-verdana-bold-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.dateFont:           -*-verdana-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.passwd.passwdFont:         -*-verdana-bold-r-*-*-10-*-*-*-*-*-*-*
+#pkg#

install/1merge/lm_sensors/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate path=/etc name=runlevels belong()!=&&cl_chroot_status==off&&pkg(sys-apps/lm_sensors)!=&&pkg(sys-apps/calculate-install)>=2.2.6
-

install/1merge/lm_sensors/default/lm_sensors

@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/lm_sensors symbolic