From 1889b0969a5600ef45d3bb9af58f09aa422b9924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <at@calculate.ru>
Date: Thu, 17 Dec 2020 13:28:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20www-plug?=
 =?UTF-8?q?ins/adobe-flash=20=D0=B8=D0=B7=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85?=
 =?UTF-8?q?=20Stage,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20sys-fs/ncdu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.5/6_ac_update_sync/world/0-ini          |  2 +-
 .../3.5/6_ac_update_sync/world/create/netapps |  1 -
 .../3.5/6_ac_update_sync/world/create/tools   | 28 +++++++++----------
 .../world/update/2020/20201217                |  7 +++++
 4 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201217

diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini
index 0606bf1..1a6d0f3 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini
@@ -1,4 +1,4 @@
 # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 20200805
+world = 20201217
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/netapps b/profiles/templates/3.5/6_ac_update_sync/world/create/netapps
index 1225981..fd7f934 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/netapps
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/netapps
@@ -12,7 +12,6 @@ net-analyzer/traceroute
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
 www-client/chromium
-www-plugins/adobe-flash
 www-plugins/chrome-freedommarks
 www-plugins/chrome-passman
 www-plugins/chrome-ublock
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/tools b/profiles/templates/3.5/6_ac_update_sync/world/create/tools
index 540ecd6..ce8a4b6 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/tools
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/tools
@@ -20,34 +20,32 @@ virtual/cron
 virtual/logger
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
-app-editors/vim
-app-portage/portage-utils
-app-text/tree
-app-vim/colorschemes
-sys-apps/inxi
-sys-apps/memtest86+
-sys-apps/pciutils
-sys-fs/dmraid
-sys-fs/dosfstools
-sys-fs/mdadm
-sys-process/htop
-sys-process/lsof
-#in#
-
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
 app-admin/hddtemp
 app-admin/sudo
 app-admin/testdisk
 app-cdr/cdrtools
 app-cdr/dvd+rw-tools
+app-editors/vim
 app-misc/mc
+app-portage/portage-utils
+app-text/tree
+app-vim/colorschemes
 sys-apps/acl
 sys-apps/dmidecode
+sys-apps/inxi
 sys-apps/lm-sensors
+sys-apps/memtest86+
+sys-apps/pciutils
 sys-apps/pv
 sys-apps/smartmontools
+sys-fs/dmraid
+sys-fs/dosfstools
+sys-fs/mdadm
 sys-fs/mtools
+sys-fs/ncdu
+sys-process/htop
+sys-process/lsof
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201217 b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201217
new file mode 100644
index 0000000..3d96859
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201217
@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
+sys-fs/ncdu
+#in#