В CLSK добавлены пакеты из CLD

profiles/templates/3.2/6_ac_update_sync/world/create/CLSK

@@ -7,7 +7,10 @@ kde-apps/gwenview
 kde-apps/kcalc
 kde-apps/kcron
 kde-apps/kde-l10n
+kde-apps/kdepim-l10n
+kde-apps/kmail
 kde-apps/konsole
+kde-apps/kopete
 kde-apps/kwrite
 kde-apps/spectacle
 kde-plasma/plasma-meta

profiles/templates/3.2/6_ac_update_sync/world/create/applications

@@ -1,14 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=#
 app-office/libreoffice
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLSK, CLD+, CLDX+)!=#
-app-text/fbreader
-#in#
-
-#?in(os_linux_pkglist, CLD, CLD+)!=#
 kde-misc/openofficeorg-thumbnail
 #in#
 
@@ -36,6 +32,7 @@ app-office/gnumeric
 app-office/lyx
 app-office/scribus
 app-office/texmaker
+app-text/fbreader
 app-text/kchmviewer
 app-text/keepnote
 app-text/mupdf

profiles/templates/3.2/6_ac_update_sync/world/create/graphics

@@ -1,10 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+)!=#
 media-gfx/imagemagick
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 media-gfx/gimp
 #in#
 

profiles/templates/3.2/6_ac_update_sync/world/create/multimedia

@@ -1,6 +1,6 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 media-video/smplayer
 #in#
 
@@ -9,13 +9,16 @@ media-sound/clementine
 media-video/gtk-recordmydesktop
 #in#
 
+#?in(os_linux_pkglist, CLD, CLSK, CLD+)!=#
+media-sound/amarok
+media-video/qt-recordmydesktop
+#in#
+
 #?in(os_linux_pkglist, CLD, CLD+)!=#
 app-cdr/k3b
-media-sound/amarok
 media-video/dvdauthor
 media-video/dvgrab
 media-video/kffmpegthumbnailer
-media-video/qt-recordmydesktop
 #in#
 
 #?in(os_linux_pkglist, CLDX, CLDX+)!=#

profiles/templates/3.2/6_ac_update_sync/world/create/netapps

@@ -1,10 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLSK, CLDX+)!=#
 app-text/wgetpaste
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CLDX+)!=#
 net-analyzer/nmap
 net-analyzer/traceroute
 net-misc/whois
@@ -14,7 +14,7 @@ net-misc/whois
 www-client/qupzilla
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 x11-misc/x11vnc
 #in#
 
@@ -22,10 +22,6 @@ x11-misc/x11vnc
 net-irc/konversation
 #in#
 
-#?in(os_linux_pkglist, CLD, CLD+)!=#
-net-p2p/ktorrent
-#in#
-
 #?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=#
 mail-client/claws-mail
 #in#
@@ -40,6 +36,14 @@ x11-plugins/pidgin-libnotify
 x11-plugins/purple-plugin_pack
 #in#
 
+#?in(os_linux_pkglist, CLD, CLD+)!=#
+net-p2p/ktorrent
+#in#
+
+#?in(os_linux_pkglist, CLSK, CLDX+)!=#
+net-p2p/qbittorrent
+#in#
+
 #?in(os_linux_pkglist, CDS, CDS+)!=#
 net-analyzer/fail2ban
 net-analyzer/iptraf-ng
@@ -85,7 +89,6 @@ net-misc/modem-manager-gui
 net-misc/yandex-disk
 net-p2p/amule
 #net-p2p/mldonkey
-net-p2p/qbittorrent
 net-p2p/rtorrent
 net-p2p/transmission
 net-voip/ekiga

profiles/templates/3.2/6_ac_update_sync/world/create/network

@@ -1,6 +1,6 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CDS+)!=#
 net-dialup/pptpclient
 net-dialup/rp-pppoe
 net-dialup/xl2tpd
@@ -10,7 +10,7 @@ net-misc/ntp
 net-misc/vconfig
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=#
 net-misc/networkmanager
 net-misc/networkmanager-l2tp
 net-misc/networkmanager-openvpn

profiles/templates/3.2/6_ac_update_sync/world/create/printer

@@ -1,11 +1,11 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 net-print/cups
 net-print/hplip
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 media-gfx/xsane
 net-print/cnijfilter
 net-print/gutenprint

profiles/templates/3.2/6_ac_update_sync/world/create/tools

@@ -26,7 +26,7 @@ app-admin/sudo
 sys-apps/memtest86+
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLSK, CDS+)!=#
 app-admin/hddtemp
 app-cdr/cdrtools
 app-cdr/dvd+rw-tools
@@ -48,15 +48,15 @@ sys-process/htop
 sys-process/lsof
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLDX+, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CLDX+, CDS+)!=#
 sys-power/powertop
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CDS+)!=#
 app-admin/testdisk
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CDS+)!=#
 app-portage/gentoolkit-dev
 sys-apps/hdparm
 sys-apps/pcmciautils
@@ -81,11 +81,11 @@ www-plugins/adobe-flash
 sys-devel/prelink
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=#
 sys-apps/keyexec
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 app-arch/p7zip
 app-arch/rar
 app-arch/unzip
@@ -94,7 +94,7 @@ sys-apps/usb_modeswitch
 x11-libs/gksu
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDO, CMC, CLD+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDO, CMC, CLSK, CLD+)!=#
 sys-power/upower-pm-utils
 #in#
 

profiles/templates/3.2/6_ac_update_sync/world/create/wireless

@@ -8,7 +8,7 @@ sys-firmware/ipw2100-firmware
 sys-firmware/ipw2200-firmware
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK)!=#
 net-wireless/broadcom-sta
 #in#