From 774ca0488391dfe308e410b9a871a471121469ab Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 20 Jan 2015 10:21:40 +0300 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=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=203.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2 | 2 +- .../3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 | 2 +- .../templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/profiles/templates/3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2 b/profiles/templates/3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2 index 9c4cf1ab9..016917976 100644 --- a/profiles/templates/3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2 +++ b/profiles/templates/3.3/2_ac_install_merge/Remerge/client-3.3.0_alpha2 @@ -1 +1 @@ -# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase,merge=sys-auth/nss_ldap,sys-libs/glibc +# Calculate appned=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase,merge=sys-auth/nss_ldap,sys-libs/glibc diff --git a/profiles/templates/3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 b/profiles/templates/3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 index 65517e046..de8f3048a 100644 --- a/profiles/templates/3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 +++ b/profiles/templates/3.3/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 @@ -1 +1 @@ -# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase +# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase diff --git a/profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 b/profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 index f1a0ea669..03e7e14d2 100644 --- a/profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 +++ b/profiles/templates/3.3/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 @@ -1 +1 @@ -# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron/media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix +# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron/media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix