From 5579c428aa706586796cb3bbe397673eb906987f Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Wed, 4 May 2016 14:17:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=20CDS=20=D0=B8=D1=81=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=20net-proxy/havp?=
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/server    | 1 -
 .../6_ac_update_sync/world/update/201-300/{249 => 250}    | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename profiles/templates/3.2/6_ac_update_sync/world/update/201-300/{249 => 250} (56%)

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 aa83e87..3dc4b84 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 = 249
+world = 250
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server
index fb0f2a0..e1191fa 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/server
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server
@@ -12,7 +12,6 @@ mail-filter/opendkim
 mail-filter/postgrey
 net-ftp/ftp
 net-mail/fetchmail
-net-proxy/havp
 net-proxy/squidguard
 sys-apps/calculate-server
 sys-apps/most
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249 b/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/250
similarity index 56%
rename from profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249
rename to profiles/templates/3.2/6_ac_update_sync/world/update/201-300/250
index 0d02fd2..7162a3f 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/250
@@ -1,7 +1,11 @@
-# Calculate format=world name=world ini(overlay-distros.world)<249
+# Calculate format=world name=world ini(overlay-distros.world)<250
 
-#-ini(overlay-distros.world,249)-#
+#-ini(overlay-distros.world,250)-#
 
 #?in(os_linux_pkglist, CLD)!=#
 kde-apps/okular
 #in#
+
+#?in(os_linux_pkglist, CDS)!=#
+!net-proxy/havp
+#in#