From 79a77915492ab15bc5502667718d84af0193fba5 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 18 Jun 2018 13:23:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20CLDXE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../6_ac_update_sync/world/create/applications | 6 +++--- .../6_ac_update_sync/world/create/decoration | 10 +++++----- .../6_ac_update_sync/world/create/education | 6 ++++++ .../3.5/6_ac_update_sync/world/create/games | 2 +- .../3.5/6_ac_update_sync/world/create/graphics | 4 ++-- .../6_ac_update_sync/world/create/multimedia | 6 +++--- .../3.5/6_ac_update_sync/world/create/netapps | 12 ++++++------ .../3.5/6_ac_update_sync/world/create/network | 4 ++-- .../3.5/6_ac_update_sync/world/create/printer | 6 +++--- .../3.5/6_ac_update_sync/world/create/tools | 18 +++++++++--------- .../3.5/6_ac_update_sync/world/create/wireless | 4 ++-- .../3.5/6_ac_update_sync/world/create/xfce | 2 +- .../3.5/6_ac_update_sync/world/create/xorg | 6 +++--- 13 files changed, 46 insertions(+), 40 deletions(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/create/education diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/applications b/profiles/templates/3.5/6_ac_update_sync/world/create/applications index 06a5c1f..ee8c2c3 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/applications @@ -1,14 +1,14 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# app-office/libreoffice #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# app-text/fbreader #in# -#?in(os_linux_pkglist, CLDL, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDX, CLDXE)!=# app-editors/leafpad app-text/qpdfview sci-calculators/galculator 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 8c7834a..dcbad3c 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 @@ -1,21 +1,21 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS)!=# media-gfx/grub-splashes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate media-gfx/splash-themes-calculate x11-themes/calculate-icon-theme #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# media-gfx/lightdm-themes-calculate #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDM, CLDX, CLDXE)!=# x11-themes/claws-mail-theme-calculate #in# @@ -23,7 +23,7 @@ x11-themes/claws-mail-theme-calculate media-gfx/plasma-themes-calculate #in# -#?in(os_linux_pkglist, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDXE)!=# x11-themes/elementary-icon-theme x11-themes/gnome-themes-standard x11-themes/gtk-engines diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/education b/profiles/templates/3.5/6_ac_update_sync/world/create/education new file mode 100644 index 0000000..dd594e2 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/education @@ -0,0 +1,6 @@ +# Calculate name=world format=world + +#?in(os_linux_pkglist, CLDXE)!=# +dev-java/eclipse-ecj +media-gfx/inkscape +#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 aa2665d..541fd1a 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 @@ -1,5 +1,5 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# games-misc/games-envd #in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/graphics b/profiles/templates/3.5/6_ac_update_sync/world/create/graphics index ea42478..2e03863 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/graphics @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# media-gfx/gimp media-gfx/imagemagick #in# -#?in(os_linux_pkglist, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDXE)!=# media-gfx/nomacs #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 63b1872..38635f5 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,16 +1,16 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXE)!=# media-sound/clementine media-video/smplayer media-video/smtube #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# media-video/gtk-recordmydesktop #in# -#?in(os_linux_pkglist, CLDL, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDX, CLDXE)!=# media-sound/pavucontrol media-sound/qastools #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 d883346..b132ed4 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,32 +1,32 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS, CLC)!=# app-text/wgetpaste net-misc/whois #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS)!=# net-analyzer/nmap net-analyzer/traceroute #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# www-client/firefox www-plugins/adobe-flash #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# net-im/gajim net-im/gajim-httpupload net-misc/remmina x11-misc/x11vnc #in# -#?in(os_linux_pkglist, CLDC, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDM, CLDX, CLDXE)!=# net-p2p/deluge #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDM, CLDX, CLDXE)!=# mail-client/claws-mail net-irc/hexchat #in# 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 8f1109d..ec04682 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 @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS, CLC)!=# net-dialup/pptpclient net-dialup/rp-pppoe net-dialup/xl2tpd @@ -10,7 +10,7 @@ net-misc/ntp net-misc/vconfig #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# net-misc/networkmanager-l2tp net-misc/networkmanager-openvpn net-misc/networkmanager-pptp diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/printer b/profiles/templates/3.5/6_ac_update_sync/world/create/printer index f6b9d18..15f63d0 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/printer @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# net-print/cnijfilter net-print/cups net-print/epson-inkjet-printer-escpr @@ -10,11 +10,11 @@ net-print/hplip-plugin #net-print/xerox-drivers #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXE)!=# media-gfx/xsane #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDXE)!=# app-admin/system-config-printer #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 f0bfc37..f331c29 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, CLC, CLS, CSS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS, CLC, 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, CLC, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS, CLC, CLS)!=# app-admin/logrotate sys-apps/ethtool sys-apps/usbutils @@ -20,7 +20,7 @@ virtual/cron virtual/logger #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS, CLC)!=# app-editors/vim app-portage/portage-utils app-vim/colorschemes @@ -34,7 +34,7 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CDS)!=# app-admin/hddtemp app-admin/sudo app-admin/testdisk @@ -50,7 +50,7 @@ sys-fs/mtools sys-fs/ntfs3g #in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -66,11 +66,11 @@ sys-power/powernowd sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXE)!=# sys-power/upower #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# app-pda/usbmuxd dev-python/gst-python sys-apps/mlocate @@ -79,7 +79,7 @@ sys-block/gparted x11-misc/wmctrl #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDXE)!=# x11-libs/gksu #in# @@ -95,7 +95,7 @@ sys-block/partitionmanager gnome-base/dconf-editor #in# -#?in(os_linux_pkglist, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDXE)!=# app-admin/hardinfo #in# 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 5961394..372e5cc 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,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CLS)!=# net-wireless/broadcom-sta net-wireless/rtl8723de net-wireless/wireless-tools @@ -10,6 +10,6 @@ sys-firmware/ipw2100-firmware sys-firmware/ipw2200-firmware #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# net-wireless/blueman #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 a85c23c..424a65b 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,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDXE)!=# app-arch/xarchiver dev-util/catfish media-sound/volumeicon 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 1abe53b..3684d6d 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 @@ -1,13 +1,13 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXE, CLS)!=# app-misc/xorg-meta #in# -#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXE)!=# x11-misc/lightdm #in# -#?in(os_linux_pkglist, CLDL, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDX, CLDXE)!=# x11-misc/light-locker #in#