From d39cf9589f9f719a21bcb14b732274a42fba7eff Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Wed, 28 Dec 2016 13:14:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=20Timeless=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20memtest,=20=D0=BE=D0=BF=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.5/6_ac_update_sync/world/create/base    |  2 +-
 .../6_ac_update_sync/world/create/decoration  | 11 +--
 .../6_ac_update_sync/world/create/multimedia  |  9 +--
 .../3.5/6_ac_update_sync/world/create/netapps | 18 ++---
 .../3.5/6_ac_update_sync/world/create/tools   | 74 ++++++++-----------
 .../6_ac_update_sync/world/create/wireless    |  5 +-
 .../3.5/6_ac_update_sync/world/create/xorg    |  4 -
 7 files changed, 42 insertions(+), 81 deletions(-)

diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/base b/profiles/templates/3.5/6_ac_update_sync/world/create/base
index 87b39d7..46a509f 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/base
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/base
@@ -8,6 +8,6 @@ sys-apps/less
 sys-kernel/dracut
 #in#
 
-#?in(os_linux_pkglist, CLS, CSS, CMC, Timeless)!=#
+#?in(os_linux_pkglist, CLS, CSS, Timeless)!=#
 app-editors/nano
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/decoration b/profiles/templates/3.5/6_ac_update_sync/world/create/decoration
index 419f119..f8eda08 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/decoration
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/decoration
@@ -7,9 +7,6 @@ media-gfx/grub-splashes-calculate
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
 media-gfx/calculate-wallpapers
 media-gfx/dm-themes-calculate
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
 x11-themes/calculate-icon-theme
 #in#
 
@@ -21,13 +18,13 @@ media-gfx/lightdm-themes-calculate
 x11-themes/claws-mail-theme-calculate
 #in#
 
+#?in(os_linux_pkglist, CLD)!=#
+media-gfx/plasma-themes-calculate
+#in#
+
 #?in(os_linux_pkglist, CLDX)!=#
 x11-themes/elementary-icon-theme
 x11-themes/gnome-themes-standard
 x11-themes/gtk-engines
 x11-themes/xfwm4-themes
 #in#
-
-#?in(os_linux_pkglist, CLD)!=#
-media-gfx/plasma-themes-calculate
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.5/6_ac_update_sync/world/create/multimedia
index 5498fee..9718b67 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/multimedia
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/multimedia
@@ -1,11 +1,8 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=#
-media-video/smplayer
-#in#
-
 #?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=#
 media-sound/clementine
+media-video/smplayer
 #in#
 
 #?in(os_linux_pkglist, CLDC, CLDM, CLDX)!=#
@@ -33,7 +30,3 @@ media-video/totem
 #?in(os_linux_pkglist, CLDX)!=#
 app-cdr/xfburn
 #in#
-
-#?in(os_linux_pkglist, CMC)!=#
-media-tv/kodi
-#in#
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 cb24f6b..beb8d7d 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
@@ -1,10 +1,7 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=#
-app-text/wgetpaste
-#in#
-
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=#
+app-text/wgetpaste
 net-analyzer/nmap
 net-analyzer/traceroute
 net-misc/whois
@@ -16,14 +13,6 @@ www-plugins/adobe-flash
 x11-misc/x11vnc
 #in#
 
-#?in(os_linux_pkglist, CLD)!=#
-net-irc/konversation
-#in#
-
-#?in(os_linux_pkglist, CLDL)!=#
-mail-client/trojita
-#in#
-
 #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=#
 net-misc/remmina
 #in#
@@ -42,9 +31,14 @@ x11-plugins/purple-plugin_pack
 #in#
 
 #?in(os_linux_pkglist, CLD)!=#
+net-irc/konversation
 net-p2p/ktorrent
 #in#
 
+#?in(os_linux_pkglist, CLDL)!=#
+mail-client/trojita
+#in#
+
 #?in(os_linux_pkglist, CDS)!=#
 net-analyzer/fail2ban
 net-analyzer/iptraf-ng
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 3ac91bb..27b9a8d 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
@@ -1,6 +1,6 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLS, CSS, CMC, Timeless)!=#
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, Timeless, CLS, CSS)!=#
 app-arch/lbzip2
 app-arch/pigz
 app-misc/tmux
@@ -12,7 +12,7 @@ sys-fs/reiserfsprogs
 sys-fs/xfsprogs
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLS, CMC, Timeless)!=#
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, Timeless, CLS)!=#
 app-admin/logrotate
 app-admin/syslog-ng
 sys-apps/ethtool
@@ -20,20 +20,25 @@ sys-apps/usbutils
 sys-process/vixie-cron
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=#
-app-admin/sudo
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, Timeless)!=#
+app-editors/vim
+app-misc/mc
+app-vim/colorschemes
+sys-apps/acl
 sys-apps/memtest86+
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=#
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=#
 app-admin/hddtemp
+app-admin/sudo
+app-admin/testdisk
 app-cdr/cdrtools
 app-cdr/dvd+rw-tools
 app-portage/portage-utils
 sys-apps/dmidecode
 sys-apps/gptfdisk
-sys-apps/lm_sensors
 sys-apps/inxi
+sys-apps/lm_sensors
 sys-apps/pciutils
 sys-apps/pv
 sys-apps/smartmontools
@@ -46,66 +51,45 @@ sys-process/htop
 sys-process/lsof
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CMC)!=#
-sys-power/powertop
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=#
-app-admin/testdisk
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CMC)!=#
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
+app-arch/p7zip
+app-arch/rar
+app-arch/unzip
 app-portage/gentoolkit-dev
 sys-apps/hdparm
+sys-apps/keyexec
 sys-apps/pcmciautils
+sys-apps/usb_modeswitch
 sys-fs/exfat-utils
 sys-fs/fuse-exfat
 sys-power/acpi
 sys-power/cpupower
 sys-power/powernowd
+sys-power/powertop
 #in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, Timeless)!=#
-app-editors/vim
-app-misc/mc
-app-vim/colorschemes
-sys-apps/acl
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
-sys-apps/keyexec
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM)!=#
+sys-power/upower-pm-utils
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
-app-arch/p7zip
-app-arch/rar
-app-arch/unzip
-sys-apps/usb_modeswitch
+#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=#
+app-pda/usbmuxd
+dev-python/gst-python
+sys-apps/mlocate
+sys-block/gparted
+#для корректной поддержки мультимедиа клавиатур
+x11-misc/wmctrl
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDM, CLDX)!=#
 x11-libs/gksu
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CMC)!=#
-sys-power/upower-pm-utils
-#in#
-
-#?in(os_linux_pkglist, CLD, CLS, CMC)!=#
-net-misc/dhcp
-#in#
-
 #?in(os_linux_pkglist, CLDC, CLDM)!=#
 x11-misc/parcellite
 #in#
 
-#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=#
-app-pda/usbmuxd
-dev-python/gst-python
-sys-apps/mlocate
-sys-block/gparted
-#для корректной поддержки мультимедиа клавиатур
-x11-misc/wmctrl
+#?in(os_linux_pkglist, CLD, CLS)!=#
+net-misc/dhcp
 #in#
 
 #?in(os_linux_pkglist, CLD)!=#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/wireless b/profiles/templates/3.5/6_ac_update_sync/world/create/wireless
index ed0dd6c..70a62ff 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/wireless
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/wireless
@@ -1,6 +1,7 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=#
+net-wireless/broadcom-sta
 net-wireless/wireless-tools
 net-wireless/wpa_supplicant
 sys-firmware/b43-firmware
@@ -8,10 +9,6 @@ sys-firmware/ipw2100-firmware
 sys-firmware/ipw2200-firmware
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=#
-net-wireless/broadcom-sta
-#in#
-
 #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=#
 net-wireless/blueman
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xorg b/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
index 655441c..1abe53b 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
@@ -11,7 +11,3 @@ x11-misc/lightdm
 #?in(os_linux_pkglist, CLDL, CLDX)!=#
 x11-misc/light-locker
 #in#
-
-#?in(os_linux_pkglist, CMC)!=#
-x11-base/xorg-server
-#in#