Merge branch 'develop' of git.calculate.ru:calculate/distros into develop

profiles/CLD/amd64/make.defaults

@@ -1,3 +1,4 @@
+ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLD/x86_64"
 
 #PORTAGE_BINHOST="http://5.255.226.146/calculate/CLD/grp/x86_64"

profiles/CLD/package.keywords

@@ -258,6 +258,7 @@
 <kde-base/libkdcraw-4.14.7 amd64 x86
 <kde-base/libkdeedu-4.14.7 amd64 x86
 <kde-base/libkdegames-4.14.7 amd64 x86
+<kde-base/libkgreeter-4.14.7 amd64 x86
 <kde-base/libkexiv2-4.14.7 amd64 x86
 <kde-base/libkipi-4.14.7 amd64 x86
 <kde-base/libkmahjongg-4.14.7 amd64 x86

profiles/CLDX/amd64/make.defaults

@@ -1,3 +1,4 @@
+ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
 
 #PORTAGE_BINHOST="http://5.255.226.146/calculate/CLDX/grp/x86_64"

profiles/CLS/amd64/make.defaults

@@ -1,3 +1,4 @@
+ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLS/x86_64"
 
 #PORTAGE_BINHOST="http://5.255.226.146/calculate/CLS/grp/x86_64"

profiles/CMC/package.use

@@ -6,6 +6,7 @@ sys-fs/eudev gudev
 
 # Removed unnecessary dependence
 dev-vcs/git -tk -perl
+media-libs/libprojectm -video_cards_nvidia
 net-dialup/rp-pppoe -X
 net-fs/samba -winbind
 net-misc/dhcp minimal

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 = 30
+world = 32

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

@@ -2,7 +2,7 @@
 
 #?in(os_linux_pkglist, CLD, CLDX)!=#
 media-gfx/xsane
-net-print/cndrvcups-capt
+net-print/cndrvcups-lb
 net-print/cnijfilter
 net-print/cups
 net-print/gutenprint

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

@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(overlay-distros.world)<32
+
+#-ini(overlay-distros.world,32)-#
+
+#?in(os_linux_pkglist, CLD, CLDX)!=#
+!net-print/cndrvcups-capt
+!net-print/cndrvcups-lb
+#in#