From aef34168eaefe49560851fc7dd96c83e87904e51 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 10 Nov 2015 18:28:48 +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=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= 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 +- profiles/templates/3.2/6_ac_update_sync/world/create/netapps | 1 - .../3.2/6_ac_update_sync/world/update/200-299/{205 => 206} | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{205 => 206} (86%) 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 72cf0bc..657c929 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 = 205 +world = 206 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps index 4125cfd..cee03b7 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps @@ -101,7 +101,6 @@ net-analyzer/trafshow net-analyzer/wireshark net-misc/youtube-dl net-p2p/bittorrent -net-p2p/btpd net-p2p/mldonkey www-client/elinks www-client/lynx diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/205 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/206 similarity index 86% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/205 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/206 index 3ee7ee7..f9bb954 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/205 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/206 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<205 +# Calculate format=world name=world ini(overlay-distros.world)<206 -#-ini(overlay-distros.world,205)-# +#-ini(overlay-distros.world,206)-# #?in(os_linux_pkglist, CLSK)!=# app-admin/sudo @@ -16,6 +16,7 @@ x11-wm/jwm #in# #?in(os_linux_pkglist, CDS+)!=# +!net-p2p/btpd sys-apps/iucode_tool sys-apps/microcode-ctl #in#