From bea836b136450479208ad1e212da6db8d172e22c Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Thu, 2 Apr 2015 15:09:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D1=80=D0=B5=D0=B4=D0=BA=D0=BE=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82=D1=8B=20=D0=B2=20CLD?=
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/kde  |  8 ++++----
 .../3.2/6_ac_update_sync/world/create/multimedia     |  1 -
 .../3.2/6_ac_update_sync/world/create/netapps        |  1 -
 .../templates/3.2/6_ac_update_sync/world/update/33   | 12 ++++++++++++
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/33

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 6d36b79..b287d6d 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 = 32
+world = 33
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde b/profiles/templates/3.2/6_ac_update_sync/world/create/kde
index ba02fd9..1b6de0f 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde
@@ -3,8 +3,8 @@
 # kdeadmin-meta
 
 kde-base/kcron
-kde-base/ksystemlog
 kde-base/kuser
+#kde-base/ksystemlog
 
 # kdeartwork-meta
 kde-base/kdeartwork-colorschemes
@@ -69,11 +69,8 @@ kde-base/kdm
 # kdegraphics-meta
 kde-base/gwenview
 kde-base/kamera
-kde-base/kcolorchooser
 kde-base/kdegraphics-mobipocket
 kde-base/kgamma
-kde-base/kolourpaint
-kde-base/kruler
 kde-base/ksnapshot
 kde-base/libkdcraw
 kde-base/libkexiv2
@@ -83,6 +80,9 @@ kde-base/svgpart
 kde-base/thumbnailers
 kde-base/ksaneplugin
 kde-base/libksane
+#kde-base/kcolorchooser
+#kde-base/kolourpaint
+#kde-base/kruler
 
 # kdemultimedia-meta
 kde-base/audiocd-kio
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia
index 1bab685..9a63dc8 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia
@@ -12,7 +12,6 @@ media-sound/amarok
 media-plugins/kipi-plugins
 media-video/dvdauthor
 media-video/dvgrab
-media-video/kdenlive
 media-video/kffmpegthumbnailer
 media-video/recordmydesktop
 media-video/smplayer
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 2e5e1ab..856f03a 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
@@ -20,7 +20,6 @@ x11-misc/x11vnc
 #in#
 
 #?in(os_linux_pkglist, CLD)!=#
-net-im/choqok
 net-irc/konversation
 net-p2p/ktorrent
 #in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/33 b/profiles/templates/3.2/6_ac_update_sync/world/update/33
new file mode 100644
index 0000000..96327c0
--- /dev/null
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/33
@@ -0,0 +1,12 @@
+# Calculate format=world name=world ini(overlay-distros.world)<33
+
+#-ini(overlay-distros.world,33)-#
+
+#?in(os_linux_pkglist, CLD)!=#
+!kde-base/kcolorchooser
+!kde-base/kolourpaint
+!kde-base/kruler
+!kde-base/ksystemlog
+!media-video/kdenlive
+!net-im/choqok
+#in#