From 8d5992847ea050af6d191f455dd0e052de0ec476 Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Sun, 5 Jun 2022 15:53:41 +0300
Subject: [PATCH] =?UTF-8?q?CCM:=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.5/6_ac_update_sync/world/create/netapps   | 17 ++++++++++++-----
 .../3.5/6_ac_update_sync/world/create/network   |  3 ---
 2 files changed, 12 insertions(+), 8 deletions(-)

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 fd7f934..8df482d 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
@@ -2,12 +2,11 @@
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
 app-text/wgetpaste
-net-misc/whois
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
 net-analyzer/nmap
 net-analyzer/traceroute
+net-dns/bind-tools
+net-misc/ntp
+net-misc/whois
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
@@ -32,6 +31,10 @@ mail-client/claws-mail
 net-irc/hexchat
 #in#
 
+#?in(os_linux_pkglist, CCM, CDS)!=#
+net-analyzer/vnstat
+#in#
+
 #?in(os_linux_pkglist, CLD)!=#
 kde-apps/krdc
 kde-apps/krfb
@@ -39,14 +42,18 @@ net-irc/konversation
 net-p2p/ktorrent
 #in#
 
+#?in(os_linux_pkglist, CCM)!=#
+mail-mta/nullmailer
+#in#
+
 #?in(os_linux_pkglist, CDS)!=#
 net-analyzer/fail2ban
 net-analyzer/iptraf-ng
 net-analyzer/macchanger
 net-analyzer/sarg
 net-analyzer/tcpdump
-net-analyzer/vnstat
 net-dialup/minicom
+net-fs/samba
 net-ftp/tftp-hpa
 net-irc/weechat
 www-client/links
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/network b/profiles/templates/3.5/6_ac_update_sync/world/create/network
index 4efb38b..1db586d 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/network
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/network
@@ -4,9 +4,7 @@
 net-dialup/pptpclient
 net-dialup/rp-pppoe
 net-dialup/xl2tpd
-net-dns/bind-tools
 net-firewall/shorewall
-net-misc/ntp
 net-misc/vconfig
 #in#
 
@@ -22,7 +20,6 @@ net-vpn/networkmanager-wireguard
 net-dialup/ppp
 net-dns/ddclient
 net-firewall/iptables
-net-fs/samba
 net-misc/bridge-utils
 net-misc/ifenslave
 net-misc/wol