From 4ca98655db54d4002bfabb3c4c05b55464fc5a23 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?= Date: Thu, 4 Feb 2021 17:02:51 +0300 Subject: [PATCH] =?UTF-8?q?CCG:=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D1=8B=20world?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.5/6_ac_update_sync/world/create/base | 4 ++++ .../6_ac_update_sync/world/create/decoration | 4 ++++ .../3.5/6_ac_update_sync/world/create/games | 4 ++++ .../6_ac_update_sync/world/create/multimedia | 6 ++++++ .../3.5/6_ac_update_sync/world/create/netapps | 6 ++++-- .../3.5/6_ac_update_sync/world/create/tools | 19 +++++++++++-------- .../3.5/6_ac_update_sync/world/create/xfce | 10 +++++++++- .../3.5/6_ac_update_sync/world/create/xorg | 8 ++++++++ 8 files changed, 50 insertions(+), 11 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 042ca8c..acb14a3 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 @@ -6,3 +6,7 @@ sys-apps/calculate-toolkit sys-apps/ifplugd sys-apps/less #in# + +#?in(os_linux_pkglist, CCG)!=# +app-portage/gentoolkit +#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 d37b882..d48dccf 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 @@ -13,3 +13,7 @@ x11-themes/gnome-themes-standard x11-themes/gtk-engines x11-themes/xfwm4-themes #in# + +#?in(os_linux_pkglist, CCG)!=# +media-fonts/droid +#in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/games b/profiles/templates/3.5/6_ac_update_sync/world/create/games index 1609c73..f73c477 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/games +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/games @@ -3,3 +3,7 @@ #?in(os_linux_pkglist, CCDX)!=# games-misc/games-envd #in# + +#?in(os_linux_pkglist, CCG)!=# +games-util/steam-launcher +#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 f6306f0..884afee 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 @@ -6,3 +6,9 @@ media-sound/pavucontrol media-sound/qastools media-video/smplayer #in# + +#?in(os_linux_pkglist, CCG)!=# +media-sound/alsa-utils +media-sound/pulseaudio +#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 480dab8..b8de90b 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,5 +1,9 @@ # Calculate name=world format=world +#?in(os_linux_pkglist, CCG, CCDX)!=# +x11-misc/x11vnc +#in# + #?in(os_linux_pkglist, CCDX)!=# app-text/wgetpaste mail-client/claws-mail @@ -10,6 +14,4 @@ net-misc/remmina net-misc/whois net-p2p/deluge www-client/firefox -www-plugins/adobe-flash -x11-misc/x11vnc #in# 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 486929e..bef1c42 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,23 +1,28 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CCDX)!=# -app-admin/hardinfo -app-admin/hddtemp +#?in(os_linux_pkglist, CCDX, CCG)!=# app-admin/logrotate -app-admin/sudo app-arch/lbzip2 app-arch/p7zip app-arch/pigz +app-editors/vim +app-vim/colorschemes +virtual/cron +virtual/logger +#in# + +#?in(os_linux_pkglist, CCDX)!=# +app-admin/hardinfo +app-admin/hddtemp +app-admin/sudo app-arch/rar app-arch/unzip app-cdr/cdrtools app-cdr/dvd+rw-tools -app-editors/vim app-misc/mc app-misc/tmux app-pda/usbmuxd app-portage/portage-utils -app-vim/colorschemes dev-python/gst-python net-misc/dhcp sys-apps/acl @@ -49,8 +54,6 @@ sys-power/powertop sys-power/upower sys-process/htop sys-process/lsof -virtual/cron -virtual/logger x11-libs/gksu x11-misc/wmctrl #in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce index 74fba71..0458ca2 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce @@ -1,11 +1,14 @@ # Calculate name=world format=world +#?in(os_linux_pkglist, CCDX, CCG)!=# +x11-terms/xfce4-terminal +#in# + #?in(os_linux_pkglist, CCDX)!=# app-arch/xarchiver dev-util/catfish media-sound/volumeicon x11-misc/sw-notify-send -x11-terms/xfce4-terminal xfce-base/xfce4-meta xfce-extra/thunar-archive-plugin xfce-extra/thunar-media-tags-plugin @@ -20,3 +23,8 @@ xfce-extra/xfce4-screenshooter xfce-extra/xfce4-taskmanager xfce-extra/xfce4-xkb-plugin #in# + +#?in(os_linux_pkglist, CCG)!=# +xfce-base/xfce4-panel +xfce-base/xfwm4 +#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 ce4f095..b8a9c1d 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 @@ -5,3 +5,11 @@ app-misc/xorg-meta x11-misc/lightdm x11-misc/xscreensaver #in# + +#?in(os_linux_pkglist, CCG)!=# +x11-apps/mesa-progs +x11-apps/xrandr +x11-apps/xsetroot +x11-base/xorg-server +x11-misc/sddm +#in#