From a9a1cda7fb4a73088738d2932f557239c4b504de Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 9 Sep 2015 10:44:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=B1=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D1=80=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=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 +- .../templates/3.2/6_ac_update_sync/world/create/kde-apps+ | 7 +++---- .../3.2/6_ac_update_sync/world/update/100-199/151 | 4 ---- .../6_ac_update_sync/world/update/100-199/{152 => 153} | 8 ++++++-- 4 files changed, 10 insertions(+), 11 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{152 => 153} (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 1031cc0..da9068e 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 = 152 +world = 153 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ index 6554e93..d359a97 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ @@ -1,7 +1,7 @@ # Calculate name=world format=world in(os_linux_pkglist,CLDX+)!=&&os_arch_machine==x86_64 kde-apps/amor -kde-apps/attica +#kde-apps/attica kde-apps/audiocd-kio kde-apps/baloo-widgets kde-apps/dolphin @@ -12,8 +12,7 @@ kde-apps/juk kde-apps/kaccounts-integration kde-apps/kate kde-apps/kcmshell -kde-apps/kcontrol -kde-apps/kcontrol +#kde-apps/kcontrol kde-apps/kcron kde-apps/kde4-l10n kde-apps/kdeadmin-meta @@ -29,7 +28,7 @@ kde-apps/kde-l10n kde-apps/kdemultimedia-meta kde-apps/kdenetwork-filesharing kde-apps/kdenlive -kde-apps/kdepasswd +#kde-apps/kdepasswd kde-apps/kdepim-l10n kde-apps/kdesu kde-apps/kdetoys-meta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/151 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/151 index 6b6dced..9ad7ef4 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/151 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/151 @@ -112,7 +112,6 @@ kde-plasma/systemsettings kde-plasma/user-manager kde-apps/amor -kde-apps/attica kde-apps/audiocd-kio kde-apps/baloo-widgets kde-apps/dolphin @@ -123,8 +122,6 @@ kde-apps/juk kde-apps/kaccounts-integration kde-apps/kate kde-apps/kcmshell -kde-apps/kcontrol -kde-apps/kcontrol kde-apps/kcron kde-apps/kde4-l10n kde-apps/kdeadmin-meta @@ -140,7 +137,6 @@ kde-apps/kde-l10n kde-apps/kdemultimedia-meta kde-apps/kdenetwork-filesharing kde-apps/kdenlive -kde-apps/kdepasswd kde-apps/kdepim-l10n kde-apps/kdesu kde-apps/kdetoys-meta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/152 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/153 similarity index 56% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/152 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/153 index 5dae199..6fb6b1e 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/152 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/153 @@ -1,7 +1,11 @@ -# Calculate format=world name=world ini(overlay-distros.world)<152 +# Calculate format=world name=world ini(overlay-distros.world)<153 -#-ini(overlay-distros.world,152)-# +#-ini(overlay-distros.world,153)-# #?in(os_linux_pkglist, CLDX+)!=# +!kde-apps/attica +!kde-apps/kcontrol +!kde-apps/kdepasswd + dev-python/spyder #in#