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

Change.log

@@ -38,7 +38,7 @@ CHANGE LOG
 * Исправлено определение более одной видеокарты.
 * Добавлен перенос настроек сети wicd manager.
 * Удалена поддержка установки Calculate Linux версии 9.6 и ниже.
-* Добавлена поддержка сборки CLSG - Calculate Linux Scratch GNOME.
+* Добавлена поддержка сборки CLS - Calculate Linux Scratch.
 
 1.0.4
 * Добавлен метод распознавания laptop через hal

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

@@ -1,6 +1,6 @@
 #-title-#
 
-#?calculate!=CLSG#
+#?calculate!=CLS#
 app-misc/mc #-unmask-#
 dev-db/postgresql-base #-unmask-#
 media-gfx/splashutils #-unmask-#

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

@@ -3,7 +3,7 @@
 net-misc/wicd #-unmask-#
 www-client/mozilla-firefox #-unmask-#
 
-#?calculate!=CLSG#
+#?calculate!=CLS#
 app-office/openoffice #-unmask-#
 dev-db/pgadmin3 #-unmask-#
 media-gfx/gimp #-unmask-#

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

@@ -2,7 +2,7 @@
 
 >#-themes-#
 
-#?calculate!=CLSG#
+#?calculate!=CLS#
 <net-nds/openldap-2.4.0
 <sys-boot/grub-0.97-r9
 <=sys-kernel/calckernel-3.4.9
@@ -17,7 +17,7 @@
 =x11-proto/xf86driproto-2.0.3
 #calculate#
 
-#?calculate!=CLSG&calculate!=CDS#
+#?calculate!=CLS&calculate!=CDS#
 <app-crypt/qca-2.0.0
 <dev-db/mysql-5.0.76
 <kde-misc/kdnssd-avahi-0.1.2-r1

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

@@ -1,6 +1,6 @@
 #-title-#
 
-#?calculate!=CLSG#
+#?calculate!=CLS#
 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!=CLSG#
+#?system=server&calculate!=CLS#
 virtual/mta		mail-mta/postfix
 #system#
 

install/builder/use/WM_and_Speciality

@@ -15,12 +15,8 @@ gtk		#Adds support for x11-libs/gtk+ (The GIMP Toolkit)
 -qt4		#Adds support for the Qt GUI/Application Toolkit version 4.x
 #calculate#
 
-#?calculate=CLSG#
-gnome		#Adds GNOME support
+#?calculate=CLS#
 gtk		#Adds support for x11-libs/gtk+ (The GIMP Toolkit)
--eds		#Enables support for Evolution-Data-Server(eds)
--kde		#Adds support for kde-base/kde (K Desktop Enviroment)
-qt3		#Adds support for the Qt GUI/Application Toolkit version 3.x
 qt4		#Adds support for the Qt GUI/Application Toolkit version 4.x
 #calculate#