From 79b781a22b53551586788da40492c40734e3362d Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 27 Jul 2015 12:26:12 +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=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.2/6_ac_update_sync/world/0-ini | 2 +- .../6_ac_update_sync/world/create/education | 5 +++++ .../6_ac_update_sync/world/create/emulation+ | 1 + .../3.2/6_ac_update_sync/world/create/netapps | 11 +++++++---- .../3.2/6_ac_update_sync/world/create/network | 4 ++++ .../3.2/6_ac_update_sync/world/create/tools | 6 ++++++ .../world/update/100-199/{107 => 108} | 19 +++++++++++++++++-- 7 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/education rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{107 => 108} (51%) diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index 01ad1da..7420f51 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 107 +world = 108 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/education b/profiles/templates/3.2/6_ac_update_sync/world/create/education new file mode 100644 index 0000000..65a711d --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/education @@ -0,0 +1,5 @@ +# Calculate name=world format=world + +#?in(os_linux_pkglist, CLDX+)!=# +sci-astronomy/stellarium +#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ b/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ index 9ca6ec5..0bb64a9 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ @@ -8,4 +8,5 @@ app-emulation/virt-manager app-emulation/wine app-emulation/winetricks games-emulation/dosbox +sci-visualization/qtiplot #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps index 97c4901..2af82d5 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps @@ -50,12 +50,18 @@ net-ftp/tftp-hpa www-client/links #in# +#?in(os_linux_pkglist, CLD+)!=# +net-im/qutim +net-irc/kvirc +#in# + #?in(os_linux_pkglist, CLDX+)!=# mail-client/geary mail-client/sylpheed mail-client/thunderbird net-im/corebird net-im/psi +net-irc/kvirc net-misc/dropbox net-misc/modem-manager-gui net-misc/yandex-disk @@ -63,10 +69,7 @@ net-p2p/amule net-p2p/qbittorrent net-p2p/rtorrent net-p2p/transmission +net-voip/ekiga net-voip/linphone www-client/firefox #in# - -#?in(os_linux_pkglist, CLD+)!=# -net-im/qutim -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network index a676d07..65bebe2 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network @@ -33,6 +33,10 @@ net-misc/ifenslave net-misc/wol #in# +#?in(os_linux_pkglist, CLDX+)!=# +net-misc/wicd +#in# + #?in(os_linux_pkglist, CDS+)!=# net-misc/tor #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index 19b506d..349e616 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -128,6 +128,7 @@ sys-process/iotop #in# #?in(os_linux_pkglist, CLDX+)!=# +app-admin/conky app-admin/keepassx app-cdr/gcdemu app-editors/ghex @@ -159,6 +160,8 @@ net-im/mcabber net-misc/clipgrab net-misc/putty net-news/quiterss +sys-auth/thinkfinger +sys-power/apcupsd x11-misc/slim x11-misc/spacefm x11-misc/sunflower @@ -179,4 +182,7 @@ net-analyzer/mtr net-misc/aria2 net-misc/iperf sys-apps/lshw +sys-apps/setserial +sys-fs/sshfs-fuse +sys-process/nmon #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/107 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/108 similarity index 51% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/107 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/108 index 19667c3..64577a6 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/107 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/108 @@ -1,13 +1,25 @@ -# Calculate format=world name=world ini(overlay-distros.world)<107 +# Calculate format=world name=world ini(overlay-distros.world)<108 -#-ini(overlay-distros.world,107)-# +#-ini(overlay-distros.world,108)-# #?in(os_linux_pkglist, CLDX+)!=# +net-irc/kvirc +#in# + +#?in(os_linux_pkglist, CLDX+)!=# +app-admin/conky media-video/openshot media-video/totem net-im/corebird net-im/psi +net-irc/kvirc +net-misc/wicd +net-voip/ekiga net-voip/linphone +sci-astronomy/stellarium +sci-visualization/qtiplot +sys-auth/thinkfinger +sys-power/apcupsd x11-misc/mate-notification-daemon x11-themes/greybird x11-wm/compiz-fusion @@ -15,4 +27,7 @@ x11-wm/compiz-fusion #?in(os_linux_pkglist, CDS+)!=# dev-lang/php +sys-apps/setserial +sys-fs/sshfs-fuse +sys-process/nmon #in#