From 51dbe8851a29d46f39393c35f3d3a77e3c9e202c Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Tue, 8 Dec 2015 13:16:17 +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 +-
 profiles/templates/3.2/6_ac_update_sync/world/create/netapps | 2 +-
 .../templates/3.2/6_ac_update_sync/world/update/200-299/233  | 4 ----
 .../3.2/6_ac_update_sync/world/update/200-299/{235 => 236}   | 5 +++--
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{235 => 236} (68%)

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 ebabb1e..30cd791 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 = 235
+world = 236
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 2881a14..f5eda65 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
@@ -10,7 +10,7 @@ net-analyzer/traceroute
 net-misc/whois
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=#
 www-client/qupzilla
 #in#
 
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233
index 1cad76f..1e95a92 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233
@@ -6,10 +6,6 @@
 !net-p2p/bittorrent
 #in#
 
-#?in(os_linux_pkglist, CLD+)!=#
-www-client/qupzilla
-#in#
-
 #?in(os_linux_pkglist, CLDX+)!=#
 !media-sound/ardour
 !net-im/mcabber
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/236
similarity index 68%
rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235
rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/236
index 3292540..81b8efc 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/236
@@ -1,7 +1,8 @@
-# Calculate format=world name=world ini(overlay-distros.world)<235
+# Calculate format=world name=world ini(overlay-distros.world)<236
 
-#-ini(overlay-distros.world,235)-#
+#-ini(overlay-distros.world,236)-#
 
 #?in(os_linux_pkglist, CLD+)!=#
+!www-client/qupzilla
 www-plugins/adobe-flash
 #in#