From 8197dbd1004c61df97c15af37912cc5c61c18a22 Mon Sep 17 00:00:00 2001
From: atratsevskiy <atratsevskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Thu, 18 Jun 2009 19:44:09 +0000
Subject: [PATCH] git-svn-id: http://svn.calculate.ru/calculate/trunk@1786
 c91db197-33c1-4113-bf15-f8a5c547ca64

---
 install/builder/packages/base?system=desktop/desktop   | 10 ++++++++--
 .../packages/base?system=desktop/desktop_decoration    |  5 ++++-
 .../packages/base?system=desktop/desktop_laptop        | 10 ++++------
 .../builder/packages/base?system=desktop/desktop_net   |  8 ++++++--
 .../packages/base?system=desktop/desktop_nettools      |  5 ++++-
 .../builder/packages/base?system=desktop/desktop_video |  3 ++-
 install/builder/packages/base?system=desktop/desktop_x |  3 ++-
 install/builder/packages/desktop?calculate=CLD/desktop |  1 -
 8 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/install/builder/packages/base?system=desktop/desktop b/install/builder/packages/base?system=desktop/desktop
index 256305c..e599827 100644
--- a/install/builder/packages/base?system=desktop/desktop
+++ b/install/builder/packages/base?system=desktop/desktop
@@ -2,11 +2,17 @@
 # Основные программы рабочей станции
 #------------------------------------------------------------------------------
 
+sys-devel/prelink
+x11-base/xorg-x11
+
+#?calculate!=CLSG#
 sys-apps/calculate-client
 sys-apps/keyexec #запуск rdesktop с пользовательским паролем
 sys-apps/keyutils #управление ключами ядра
 sys-auth/pam_keystore #сохранение пароля пользователя в ключах ядра
-sys-devel/prelink
 x11-apps/xev #настройка дополнительных клавиш на клавиатуре
-x11-base/xorg-x11
+#calculate#
 
+#?calculate=CLDX?calculate=CLSG#
+app-portage/porthole #а GTK+-based frontend to Portage
+#calculate#
diff --git a/install/builder/packages/base?system=desktop/desktop_decoration b/install/builder/packages/base?system=desktop/desktop_decoration
index bb5db99..8cec04a 100644
--- a/install/builder/packages/base?system=desktop/desktop_decoration
+++ b/install/builder/packages/base?system=desktop/desktop_decoration
@@ -3,6 +3,9 @@
 #------------------------------------------------------------------------------
 
 media-fonts/corefonts
-media-fonts/droid
 media-gfx/splashutils
 
+#?calculate!=CLSG#
+media-fonts/droid
+#calculate#
+
diff --git a/install/builder/packages/base?system=desktop/desktop_laptop b/install/builder/packages/base?system=desktop/desktop_laptop
index 90f10b5..5826ecb 100644
--- a/install/builder/packages/base?system=desktop/desktop_laptop
+++ b/install/builder/packages/base?system=desktop/desktop_laptop
@@ -2,15 +2,13 @@
 # Ноутбук
 #------------------------------------------------------------------------------
 
-#?unmask=~x86#
-	app-laptop/fnfx #поддержка дополнительных клавиш Toshiba
-	sys-auth/thinkfinger #сканер отпечатков пальцев
-#unmask#
-
 net-dialup/slmodem #софтовый модем
+
+#?calculate!=CLSG#
 x11-misc/xbindkeys #настройка дополнительных клавиш посредством xorg
+sys-auth/thinkfinger #сканер отпечатков пальцев
 sys-power/acpi
 sys-power/acpid
 sys-power/cpufreqd
 sys-power/powernowd
-
+#calculate#
diff --git a/install/builder/packages/base?system=desktop/desktop_net b/install/builder/packages/base?system=desktop/desktop_net
index e1e8851..4773de4 100644
--- a/install/builder/packages/base?system=desktop/desktop_net
+++ b/install/builder/packages/base?system=desktop/desktop_net
@@ -3,8 +3,12 @@
 #------------------------------------------------------------------------------
 
 net-irc/xchat
+
+#?calculate!=CLSG#
 net-misc/rdesktop
-#?march=x86_64#
+www-plugins/adobe-flash
+#calculate#
+
+#?march=x86_64&calculate!=CLSG#
 www-plugins/nspluginwrapper
 #march#
-www-plugins/adobe-flash
diff --git a/install/builder/packages/base?system=desktop/desktop_nettools b/install/builder/packages/base?system=desktop/desktop_nettools
index 1670df5..f36586b 100644
--- a/install/builder/packages/base?system=desktop/desktop_nettools
+++ b/install/builder/packages/base?system=desktop/desktop_nettools
@@ -2,8 +2,11 @@
 # Различные сетевые утилиты
 #------------------------------------------------------------------------------
 
-net-dns/bind-tools
 net-misc/dhcpcd
+
+#?calculate!=CLSG#
+net-dns/bind-tools
 sys-auth/nss_ldap #авторизация в ldap-сервере
 sys-auth/pam_ldap #-..-
+#calculate#
 
diff --git a/install/builder/packages/base?system=desktop/desktop_video b/install/builder/packages/base?system=desktop/desktop_video
index 9184ca0..5a5e941 100644
--- a/install/builder/packages/base?system=desktop/desktop_video
+++ b/install/builder/packages/base?system=desktop/desktop_video
@@ -2,5 +2,6 @@
 # Программы для воспроизведения видео-файлов
 #------------------------------------------------------------------------------
 
+#?calculate!=CLSG#
 media-video/mplayer
-
+#calculate#
diff --git a/install/builder/packages/base?system=desktop/desktop_x b/install/builder/packages/base?system=desktop/desktop_x
index baf96d3..52a1707 100644
--- a/install/builder/packages/base?system=desktop/desktop_x
+++ b/install/builder/packages/base?system=desktop/desktop_x
@@ -2,5 +2,6 @@
 # Утилиты Xorg
 #------------------------------------------------------------------------------
 
+#?calculate!=CLSG#
 x11-apps/xdpyinfo #display information utility for X
-
+#calculate#
diff --git a/install/builder/packages/desktop?calculate=CLD/desktop b/install/builder/packages/desktop?calculate=CLD/desktop
index d90463b..d684a6f 100644
--- a/install/builder/packages/desktop?calculate=CLD/desktop
+++ b/install/builder/packages/desktop?calculate=CLD/desktop
@@ -4,7 +4,6 @@
 
 app-cdr/k3b
 app-editors/vim
-app-portage/porthole #а GTK+-based frontend to Portage
 dev-tcltk/expect
 #sys-auth/pam_mount #монтирование сетевых дисков с поддержкой криптографии