From 5bdc1628c1a66bf389e850b5e36b969a458b2709 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 15 Sep 2015 13:44:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.2/6_ac_update_sync/world/0-ini | 2 +- .../templates/3.2/6_ac_update_sync/world/create/network | 2 +- .../templates/3.2/6_ac_update_sync/world/update/0-99/85 | 4 ---- .../6_ac_update_sync/world/update/100-199/{154 => 155} | 8 ++++++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{154 => 155} (59%) diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index dd4f2c0..0f986c5 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 154 +world = 155 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network index 4703f6f..4f3c0b8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network @@ -10,7 +10,7 @@ net-misc/ntp net-misc/vconfig #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=# net-misc/networkmanager net-misc/networkmanager-openvpn net-misc/networkmanager-pptp diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/0-99/85 b/profiles/templates/3.2/6_ac_update_sync/world/update/0-99/85 index f2a4e46..c10d5d1 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/0-99/85 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/0-99/85 @@ -10,10 +10,6 @@ x11-misc/parcellite #?in(os_linux_pkglist, CLD+)!=# !app-editors/vim !app-misc/mc -!net-misc/networkmanager -!net-misc/networkmanager-openvpn -!net-misc/networkmanager-pptp -!net-misc/networkmanager-vpnc !net-print/cups !net-print/hplip media-gfx/imagemagick diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/154 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/155 similarity index 59% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/154 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/155 index 18972cf..41f74b3 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/154 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/155 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<154 +# Calculate format=world name=world ini(overlay-distros.world)<155 -#-ini(overlay-distros.world,154)-# +#-ini(overlay-distros.world,155)-# #?in(os_linux_pkglist, CLDX+)!=# games-arcade/briquolo @@ -10,4 +10,8 @@ x11-misc/devilspie #?in(os_linux_pkglist, CLD+)!=# kde-apps/kbreakout +net-misc/networkmanager +net-misc/networkmanager-openvpn +net-misc/networkmanager-pptp +net-misc/networkmanager-vpnc #in#