Урезан состав пакетов CMC. Добавлены бинарные пакеты.

В CMC удалена поддержка wireless.

profiles/templates/3.2/6_ac_update_sync/world/0-ini

@@ -1,4 +1,4 @@
 # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 68
+world = 69

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

@@ -25,4 +25,5 @@ app-office/abiword
 app-office/gnumeric
 app-office/scribus
 app-office/texmaker
+app-text/xournal
 #in#

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

@@ -17,4 +17,5 @@ media-gfx/digikam
 media-gfx/blender
 media-gfx/darktable
 media-gfx/inkscape
+media-gfx/pinta
 #in#

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

@@ -51,6 +51,7 @@ www-client/links
 #in#
 
 #?in(os_linux_pkglist, CLDX+)!=#
+mail-client/geary
 mail-client/sylpheed
 mail-client/thunderbird
 net-misc/dropbox

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, CLDX, CDS, CDS+, CMC)!=#
+#?in(os_linux_pkglist, CLD, CLDX, CDS, CDS+)!=#
 net-dns/bind-tools
 net-firewall/shorewall
 net-misc/ntp

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

@@ -124,18 +124,25 @@ sys-process/iotop
 #in#
 
 #?in(os_linux_pkglist, CLDX+)!=#
+app-laptop/tpb
+app-laptop/tp_smapi
+app-misc/anki
 app-misc/screen
+app-mobilephone/wammu
 app-portage/cpuinfo2cpuflags
+app-text/xournal
 dev-lang/mono
 dev-python/ipython
 dev-util/android-tools
+dev-util/geany-plugins
+media-gfx/cellwriter
 #in#
 
 #?in(os_linux_pkglist, CDS+)!=#
+app-misc/screenfetch
 dev-vcs/bzr
 dev-vcs/cvs
 dev-vcs/mercurial
 dev-vcs/subversion
+net-misc/aria2
 #in#
-
-

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

@@ -1,12 +1,12 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDX, CLDX+, CLSM, CLS, CMC)!=#
+#?in(os_linux_pkglist, CLD, CLDX, CLDX+, CLSM, CLS)!=#
 sys-firmware/b43-firmware
 net-wireless/wireless-tools
 net-wireless/wpa_supplicant
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDX, CLSM, CLS, CMC)!=#
+#?in(os_linux_pkglist, CLD, CLDX, CLSM, CLS)!=#
 net-wireless/broadcom-sta
 #in#
 

profiles/templates/3.2/6_ac_update_sync/world/update/69

@@ -0,0 +1,30 @@
+# Calculate format=world name=world ini(overlay-distros.world)<69
+
+#-ini(overlay-distros.world,69)-#
+
+#?in(os_linux_pkglist, CMC)!=#
+!net-dns/bind-tools
+!net-firewall/shorewall
+!net-misc/ntp
+!net-misc/vconfig
+!net-wireless/broadcom-sta
+!net-wireless/wireless-tools
+!net-wireless/wpa_supplicant
+!sys-firmware/b43-firmware
+#in#
+
+#?in(os_linux_pkglist, CDS+)!=#
+app-misc/screenfetch
+net-misc/aria2
+#in#
+
+#?in(os_linux_pkglist, CLDX+)!=#
+app-laptop/tpb
+app-laptop/tp_smapi
+app-misc/anki
+app-mobilephone/wammu
+dev-util/geany-plugins
+mail-client/geary
+media-gfx/cellwriter
+media-gfx/pinta
+#in#