Исправления для Depend шаблонов

profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server

@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-server)!= merge=sys-auth/pambase

profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update

@@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-update)!= merge=app-portage/eix
+# Calculate append=skip merge(sys-apps/calculate-update)!= merge=app-portage/eix,app-portage/layman

profiles/templates/3.1/2_ac_install_merge/Depends/gdm

@@ -0,0 +1 @@
+# Calculate append=skip merge(gnome-base/gdm)!= merge=x11-base/xorg-server

profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background

@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-themes/gnome-background)!= merge=media-gfx/calculate-wallpapers

profiles/templates/3.1/2_ac_install_merge/Depends/kdm

@@ -0,0 +1 @@
+# Calculate append=skip merge(kde-base/kdm)!= merge=x11-base/xorg-server

profiles/templates/3.1/2_ac_install_merge/Depends/lightdm

@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-misc/lightdm)!= merge=x11-base/xorg-server

profiles/templates/3.1/2_ac_install_merge/Depends/lxdm

@@ -0,0 +1 @@
+# Calculate append=skip merge(lxde-base/lxdm)!= merge=x11-base/xorg-server

profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio

@@ -0,0 +1 @@
+# Calculate append=skip merge(media-sound/pulseaudio)!= merge=media-video/smplayer

profiles/templates/3.1/2_ac_install_merge/Depends/slim

@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-misc/slim)!= merge=x11-base/xorg-server

profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate

@@ -0,0 +1 @@
+# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=media-gfx/splashutils

profiles/templates/3.1/2_ac_install_merge/Depends/xbmc

@@ -1 +1 @@
-# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-apps/xinit
+# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-apps/xinit,x11-base/xorg-server