diff --git a/profiles/calculate/desktop/CLDX/amd64/binary/package.unmask b/profiles/calculate/desktop/CLDX/amd64/binary/package.unmask
index e155657cd..80c145d57 100644
--- a/profiles/calculate/desktop/CLDX/amd64/binary/package.unmask
+++ b/profiles/calculate/desktop/CLDX/amd64/binary/package.unmask
@@ -150,7 +150,7 @@
 =app-text/sgml-common-0.6.3-r5
 =app-text/stardict-3.0.1-r2
 =app-text/wgetpaste-2.18
-=app-vim/colorschemes-20110506
+=app-vim/colorschemes-20110506-r1
 =app-vim/gentoo-syntax-20101212
 =app-vim/vimcommander-80
 =dev-cpp/atkmm-2.22.5
@@ -466,7 +466,7 @@
 =net-dns/libidn-1.22
 =net-fs/fusesmb-0.8.7
 =net-fs/nfs-utils-1.2.3-r1
-=net-fs/samba-3.5.8-r1
+=net-fs/samba-3.5.9
 =net-ftp/filezilla-3.3.4.1
 =net-im/pidgin-2.9.0
 =net-im/skype-2.2.0.35-r1
@@ -521,7 +521,7 @@
 =net-print/foomatic-db-engine-4.0.7
 =net-print/foomatic-filters-4.0.7
 =net-print/gutenprint-5.2.6
-=net-print/hplip-3.11.5-r1
+=net-print/hplip-3.11.5
 =net-print/hplip-plugin-3.11.5
 =net-print/samsung-unified-linux-driver-1.01
 =net-wireless/b43-firmware-4.174.64.19
@@ -596,7 +596,7 @@
 =sys-apps/openrc-0.8.3-r1
 =sys-apps/pciutils-3.1.7
 =sys-apps/pcmciautils-014-r1
-=sys-apps/portage-2.2.0_alpha46
+=sys-apps/portage-2.2.0_alpha47
 =sys-apps/preload-0.6.4-r2
 =sys-apps/pv-1.2.0
 =sys-apps/rescan-scsi-bus-1.29
diff --git a/profiles/calculate/desktop/CLDX/amd64/binary/package.use b/profiles/calculate/desktop/CLDX/amd64/binary/package.use
index 5feeadf9b..028c0385b 100644
--- a/profiles/calculate/desktop/CLDX/amd64/binary/package.use
+++ b/profiles/calculate/desktop/CLDX/amd64/binary/package.use
@@ -309,7 +309,7 @@
 =net-dns/bind-tools-9.7.3 ipv6 ssl -doc -idn -urandom -xml
 =net-dns/libidn-1.22 nls -doc -elibc_FreeBSD -emacs -java -mono -static-libs
 =net-fs/nfs-utils-1.2.3-r1 elibc_glibc ipv6 nfsv3 nfsv4 tcpd -caps -kerberos
-=net-fs/samba-3.5.8-r1 acl aio client cups ldap netapi pam quota readline server smbclient -addns -ads -avahi -caps -cluster -debug -doc -examples -fam -ldb -smbsharemodes -smbtav2 -swat -syslog -winbind
+=net-fs/samba-3.5.9 acl aio client cups ldap netapi pam quota readline server smbclient -addns -ads -avahi -caps -cluster -debug -doc -examples -fam -ldb -smbsharemodes -smbtav2 -swat -syslog -winbind
 =net-ftp/filezilla-3.3.4.1 dbus nls -test
 =net-im/pidgin-2.9.0 dbus gstreamer gtk ncurses networkmanager nls perl python spell xscreensaver -debug -doc -eds -gadu -gnutls -groupwise -idn -meanwhile -prediction -sasl -silc -tcl -tk -zephyr -zeroconf
 =net-im/skype-2.2.0.35-r1 -qt-static
@@ -357,7 +357,7 @@
 =net-print/cups-1.4.6-r21 X acl dbus gnutls jpeg ldap linguas_de linguas_es linguas_fr linguas_it linguas_pl linguas_pt linguas_pt_BR linguas_ru pam perl png python samba ssl threads tiff usb -debug -elibc_FreeBSD -java -kerberos -linguas_da -linguas_eu -linguas_fi -linguas_id -linguas_ja -linguas_ko -linguas_nl -linguas_no -linguas_sv -linguas_zh -linguas_zh_TW -php -slp -static-libs -xinetd
 =net-print/foomatic-filters-4.0.7 cups
 =net-print/gutenprint-5.2.6 cups foomaticdb gimp gtk readline -ppds
-=net-print/hplip-3.11.5-r1 acl fax hpcups hpijs libnotify policykit scanner static-ppds -X -doc -kde -minimal -parport -qt4 -snmp
+=net-print/hplip-3.11.5 acl fax hpcups hpijs libnotify policykit scanner static-ppds -X -doc -kde -minimal -parport -qt4 -snmp
 =net-print/samsung-unified-linux-driver-1.01 -doc -test
 =net-wireless/blueman-1.21-r1 network nls policykit -gnome -pulseaudio
 =net-wireless/bluez-4.93 alsa consolekit cups usb -caps -debug -gstreamer -health -maemo6 -old-daemons -pcmcia -pnat -test-programs
@@ -402,7 +402,7 @@
 =sys-apps/openrc-0.8.3-r1 elibc_glibc kernel_linux ncurses pam unicode -debug -kernel_FreeBSD -selinux
 =sys-apps/pciutils-3.1.7 -network-cron -zlib
 =sys-apps/pcmciautils-014-r1 -debug -static -staticsocket
-=sys-apps/portage-2.2.0_alpha46 ipc less linguas_pl -build -doc -epydoc -python2 -python3 -selinux
+=sys-apps/portage-2.2.0_alpha47 ipc less linguas_pl -build -doc -epydoc -python2 -python3 -selinux
 =sys-apps/preload-0.6.4-r2 -vanilla
 =sys-apps/pv-1.2.0 nls
 =sys-apps/sandbox-2.4 multilib