From a7c605f291a90285ef3e7a47c0f9343314944e17 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 12 Apr 2016 00:26:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20CLSK=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= =?UTF-8?q?=20=D0=B8=D0=B7=20CLD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../world/create/{kde5 => CLSK} | 3 +++ .../world/create/applications | 9 +++------ .../world/create/{drivers => drivers+} | 0 .../world/create/{education => education+} | 0 .../6_ac_update_sync/world/create/graphics | 4 ++-- .../6_ac_update_sync/world/create/multimedia | 9 ++++++--- .../3.2/6_ac_update_sync/world/create/netapps | 19 +++++++++++-------- .../3.2/6_ac_update_sync/world/create/network | 4 ++-- .../3.2/6_ac_update_sync/world/create/printer | 4 ++-- .../world/create/{science => science+} | 0 .../3.2/6_ac_update_sync/world/create/tools | 14 +++++++------- .../6_ac_update_sync/world/create/wireless | 2 +- 12 files changed, 37 insertions(+), 31 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/create/{kde5 => CLSK} (82%) rename profiles/templates/3.2/6_ac_update_sync/world/create/{drivers => drivers+} (100%) rename profiles/templates/3.2/6_ac_update_sync/world/create/{education => education+} (100%) rename profiles/templates/3.2/6_ac_update_sync/world/create/{science => science+} (100%) diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde5 b/profiles/templates/3.2/6_ac_update_sync/world/create/CLSK similarity index 82% rename from profiles/templates/3.2/6_ac_update_sync/world/create/kde5 rename to profiles/templates/3.2/6_ac_update_sync/world/create/CLSK index 32bd56b..7ab67c2 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde5 +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/CLSK @@ -7,7 +7,10 @@ kde-apps/gwenview kde-apps/kcalc kde-apps/kcron kde-apps/kde-l10n +kde-apps/kdepim-l10n +kde-apps/kmail kde-apps/konsole +kde-apps/kopete kde-apps/kwrite kde-apps/spectacle kde-plasma/plasma-meta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/applications b/profiles/templates/3.2/6_ac_update_sync/world/create/applications index 1bb5abf..b9dd19d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/applications @@ -1,14 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=# app-office/libreoffice #in# -#?in(os_linux_pkglist, CLD, CLDX, CLDX+)!=# -app-text/fbreader -#in# - -#?in(os_linux_pkglist, CLD, CLD+)!=# +#?in(os_linux_pkglist, CLD, CLSK, CLD+, CLDX+)!=# kde-misc/openofficeorg-thumbnail #in# @@ -36,6 +32,7 @@ app-office/gnumeric app-office/lyx app-office/scribus app-office/texmaker +app-text/fbreader app-text/kchmviewer app-text/keepnote app-text/mupdf diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/drivers b/profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ similarity index 100% rename from profiles/templates/3.2/6_ac_update_sync/world/create/drivers rename to profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ 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+ similarity index 100% rename from profiles/templates/3.2/6_ac_update_sync/world/create/education rename to profiles/templates/3.2/6_ac_update_sync/world/create/education+ diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics index 9c7890f..9a8fbad 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+)!=# media-gfx/imagemagick #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# media-gfx/gimp #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia index 317148d..d79f10f 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# media-video/smplayer #in# @@ -9,13 +9,16 @@ media-sound/clementine media-video/gtk-recordmydesktop #in# +#?in(os_linux_pkglist, CLD, CLSK, CLD+)!=# +media-sound/amarok +media-video/qt-recordmydesktop +#in# + #?in(os_linux_pkglist, CLD, CLD+)!=# app-cdr/k3b -media-sound/amarok media-video/dvdauthor media-video/dvgrab media-video/kffmpegthumbnailer -media-video/qt-recordmydesktop #in# #?in(os_linux_pkglist, CLDX, CLDX+)!=# 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 0e2a3f9..1fe7424 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 @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLSK, CLDX+)!=# app-text/wgetpaste #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CLDX+)!=# net-analyzer/nmap net-analyzer/traceroute net-misc/whois @@ -14,7 +14,7 @@ net-misc/whois www-client/qupzilla #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# x11-misc/x11vnc #in# @@ -22,10 +22,6 @@ x11-misc/x11vnc net-irc/konversation #in# -#?in(os_linux_pkglist, CLD, CLD+)!=# -net-p2p/ktorrent -#in# - #?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=# mail-client/claws-mail #in# @@ -40,6 +36,14 @@ x11-plugins/pidgin-libnotify x11-plugins/purple-plugin_pack #in# +#?in(os_linux_pkglist, CLD, CLD+)!=# +net-p2p/ktorrent +#in# + +#?in(os_linux_pkglist, CLSK, CLDX+)!=# +net-p2p/qbittorrent +#in# + #?in(os_linux_pkglist, CDS, CDS+)!=# net-analyzer/fail2ban net-analyzer/iptraf-ng @@ -85,7 +89,6 @@ net-misc/modem-manager-gui net-misc/yandex-disk net-p2p/amule #net-p2p/mldonkey -net-p2p/qbittorrent net-p2p/rtorrent net-p2p/transmission net-voip/ekiga 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 a20a777..ae58633 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 @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CDS+)!=# 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, CLDM, CLDX, CLD+, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=# net-misc/networkmanager net-misc/networkmanager-l2tp net-misc/networkmanager-openvpn diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/printer b/profiles/templates/3.2/6_ac_update_sync/world/create/printer index 4402642..6407f42 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/printer @@ -1,11 +1,11 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# net-print/cups net-print/hplip #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# media-gfx/xsane net-print/cnijfilter net-print/gutenprint diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/science b/profiles/templates/3.2/6_ac_update_sync/world/create/science+ similarity index 100% rename from profiles/templates/3.2/6_ac_update_sync/world/create/science rename to profiles/templates/3.2/6_ac_update_sync/world/create/science+ 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 0b34802..d07dafd 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 @@ -26,7 +26,7 @@ app-admin/sudo sys-apps/memtest86+ #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLSK, CDS+)!=# app-admin/hddtemp app-cdr/cdrtools app-cdr/dvd+rw-tools @@ -48,15 +48,15 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLDX+, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CLDX+, CDS+)!=# sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CDS+)!=# app-admin/testdisk #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CDS+)!=# app-portage/gentoolkit-dev sys-apps/hdparm sys-apps/pcmciautils @@ -81,11 +81,11 @@ www-plugins/adobe-flash sys-devel/prelink #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=# sys-apps/keyexec #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -94,7 +94,7 @@ sys-apps/usb_modeswitch x11-libs/gksu #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDO, CMC, CLD+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDO, CMC, CLSK, CLD+)!=# sys-power/upower-pm-utils #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless index 911dd77..53de66f 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless @@ -8,7 +8,7 @@ sys-firmware/ipw2100-firmware sys-firmware/ipw2200-firmware #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK)!=# net-wireless/broadcom-sta #in#