From f37618b29ef0e13355f66b1ad58abc988bf6f8b0 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 8 Sep 2015 15:18:26 +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 +- .../templates/3.2/6_ac_update_sync/world/create/plasma+ | 2 +- .../3.2/6_ac_update_sync/world/update/100-199/{144 => 145} | 6 +++--- .../3.2/6_ac_update_sync/world/update/100-199/146 | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{144 => 145} (91%) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/146 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 ab97cb2..f052ae9 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 = 144 +world = 146 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/plasma+ b/profiles/templates/3.2/6_ac_update_sync/world/create/plasma+ index 068c841..409915c 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/plasma+ +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/plasma+ @@ -1,3 +1,3 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= +# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!=&&os_arch_machine==x86_64 kde-plasma/plasma-meta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/144 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/145 similarity index 91% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/144 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/145 index 1a4df92..671b10c 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/144 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/145 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<144 +# Calculate format=world name=world ini(overlay-distros.world)<145 -#-ini(overlay-distros.world,144)-# +#-ini(overlay-distros.world,145)-# #?in(os_linux_pkglist, CLDX+)!=# app-arch/arj @@ -8,7 +8,7 @@ app-arch/unrar app-editors/emacs dev-python/xlwt games-sports/xmoto -kde-plasma/plasma-meta +!kde-plasma/plasma-meta media-sound/lxmusic media-sound/xmms2 net-p2p/bittorrent diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/146 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/146 new file mode 100644 index 0000000..4413413 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/146 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<146 + +#-ini(overlay-distros.world,146)-# + +#?in(os_linux_pkglist, CLDX+)!=&&os_arch_machine==x86_64# +!kde-plasma/plasma-meta +#in#