git-svn-id: http://svn.calculate.ru/calculate/trunk@2328 c91db197-33c1-4113-bf15-f8a5c547ca64

install/builder/profile/0builder/etc/portage/package.keywords/default

@@ -13,7 +13,8 @@ x11-drivers/xf86-video-ati #-unmask-#
 x11-drivers/xf86-video-intel #-unmask-#
 x11-drivers/xf86-video-nv #-unmask-#
 x11-drivers/nvidia-drivers #-unmask-#
-#?calculate!=CLS#
+
+#?calculate!=CLS&calculate!=CLSG#
 dev-db/postgresql-base #-unmask-#
 media-video/mplayer #-unmask-#
 net-nds/openldap #-unmask-#

install/builder/profile/0builder/etc/portage/package.keywords/desktop?system=desktop

@@ -1,7 +1,6 @@
 #-title-#
 
-net-misc/wicd #-unmask-#
+#?calculate!=CLS&calculate!=CLSG#
-#?calculate!=CLS#
 =app-office/openoffice-3.0.1 #-unmask-#
 dev-db/pgadmin3 #-unmask-#
 media-gfx/gimp #-unmask-#

install/builder/profile/0builder/etc/portage/package.mask/default

@@ -9,11 +9,13 @@
 <net-wireless/madwifi-ng-tools-0.9.4.4030.20090529
 <sys-apps/sysvinit-2.86-r11
 <sys-fs/udev-133
-#?calculate!=CLS#
+
+#?calculate!=CLS&calculate!=CLSG#
 <net-nds/openldap-2.4.0
 =net-print/foomatic-db-3.0.20060720
 #calculate#
-#?calculate!=CLS&calculate!=CDS#
+
+#?calculate!=CLS&calculate!=CLSG&calculate!=CDS#
 <app-crypt/qca-2.0.0
 <dev-db/mysql-5.0.76
 #calculate#

install/builder/profile/0builder/etc/portage/profile/virtuals

@@ -1,6 +1,6 @@
 #-title-#
 
-#?calculate!=CLS#
+#?calculate!=CLS&calculate!=CLSG#
 virtual/aspell-dict	app-dicts/aspell
 virtual/bittorrent	net-p2p/ktorrent
 virtual/imapd		net-mail/dovecot
@@ -9,7 +9,7 @@ virtual/linux-sources	sys-kernel/calculate-sources
 virtual/logger		app-admin/syslog-ng
 virtual/ooo		app-office/openoffice
 #calculate#
-#?system=server&calculate!=CLS#
+#?system=server#
 virtual/mta		mail-mta/postfix
 #system#