From 82f3b94b58663f2c9127657a00f0c638bae8dc23 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 12 Aug 2014 15:04:38 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20Depend=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/3.1/2_ac_install_merge/Depends/calculate-server | 1 + .../templates/3.1/2_ac_install_merge/Depends/calculate-update | 2 +- profiles/templates/3.1/2_ac_install_merge/Depends/gdm | 1 + .../templates/3.1/2_ac_install_merge/Depends/gnome-background | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/kdm | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/lightdm | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/lxdm | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/slim | 1 + .../3.1/2_ac_install_merge/Depends/splash-themes-calculate | 1 + profiles/templates/3.1/2_ac_install_merge/Depends/xbmc | 2 +- 11 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/gdm create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/kdm create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/lightdm create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/lxdm create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/slim create mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server new file mode 100644 index 000000000..b8aa0b59d --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update index 828e58721..66d794b62 100644 --- a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/gdm b/profiles/templates/3.1/2_ac_install_merge/Depends/gdm new file mode 100644 index 000000000..e9822979d --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background b/profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background new file mode 100644 index 000000000..add900b9a --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/kdm b/profiles/templates/3.1/2_ac_install_merge/Depends/kdm new file mode 100644 index 000000000..41b44787f --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/lightdm b/profiles/templates/3.1/2_ac_install_merge/Depends/lightdm new file mode 100644 index 000000000..6a8453808 --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/lxdm b/profiles/templates/3.1/2_ac_install_merge/Depends/lxdm new file mode 100644 index 000000000..122a1e795 --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio b/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio new file mode 100644 index 000000000..ffccd15ac --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio @@ -0,0 +1 @@ +# Calculate append=skip merge(media-sound/pulseaudio)!= merge=media-video/smplayer diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/slim b/profiles/templates/3.1/2_ac_install_merge/Depends/slim new file mode 100644 index 000000000..e6efe5283 --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate new file mode 100644 index 000000000..4fc2a02e7 --- /dev/null +++ b/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 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc b/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc index 72656fef2..b9d2d7e1c 100644 --- a/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc +++ b/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