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

profiles/calculate/desktop/package.keywords/default

@@ -26,6 +26,7 @@
 
 ~net-im/skype-4.0.0.8 amd64 x86
 
+~x11-drivers/nvidia-drivers-304.64 amd64 x86
 #~x11-drivers/xf86-video-ati-6.14.6 amd64 x86
 #~x11-drivers/xf86-video-nouveau-1.0.1 amd64 x86
 ~x11-drivers/xf86-video-intel-2.20.10 amd64 x86

profiles/calculate/desktop/package.use

@@ -40,7 +40,7 @@ sys-fs/ntfs3g udev
 sys-power/cpufreqd nvidia
 www-client/links -X
 www-plugins/adobe-flash -vdpau
-x11-base/xorg-drivers -video_cards_nvidia -video_cards_vmware
+x11-base/xorg-drivers -video_cards_nvidia -video_cards_vmware -video_cards_mach64
 x11-libs/cairo cleartype glitz svg
 x11-libs/libX11 xcb
 x11-misc/xscreensaver -opengl -jpeg -perl
@@ -87,3 +87,4 @@ x11-drivers/xf86-video-intel sna
 
 x11-drivers/nvidia-drivers -gtk
 
+x11-drivers/ati-drivers disable-watermark

profiles/calculate/profile.bashrc

@@ -175,7 +175,7 @@ post_pkg_postinst() {
 	then
 		CL_UPDATE_PROG=/usr/sbin/cl-core-setup
 		if [ -e ${CL_UPDATE_PROG} ];then
-			${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path ${D} --pkg-name ${PN}
+			${CL_UPDATE_PROG} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
 		fi
 	fi
 }

profiles/templates/3.1/1_ac_install_merge/grub2/default.grub

@@ -3,7 +3,7 @@ GRUB_DISABLE_RECOVERY=true
 GRUB_DEFAULT=saved
 GRUB_TIMEOUT=2
 !GRUB_TERMINAL=del
-GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_CALCULATE}"
+GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_CALCULATE_LINUX}"
 GRUB_GFXMODE="1024x768"
 GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
 GRUB_COLOR_NORMAL="white/black"