diff --git a/profiles/CDS+/amd64/make.defaults b/profiles/CDS+/amd64/make.defaults new file mode 100644 index 0000000..c0247f4 --- /dev/null +++ b/profiles/CDS+/amd64/make.defaults @@ -0,0 +1,4 @@ +PKGDIR="/var/calculate/remote/packages/CDS/x86_64" + +#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/x86_64" +PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/x86_64" diff --git a/profiles/CDS+/amd64/parent b/profiles/CDS+/amd64/parent new file mode 100644 index 0000000..0a823a1 --- /dev/null +++ b/profiles/CDS+/amd64/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/server/amd64 +.. diff --git a/profiles/CDS+/calculate.env b/profiles/CDS+/calculate.env new file mode 100644 index 0000000..7e2be56 --- /dev/null +++ b/profiles/CDS+/calculate.env @@ -0,0 +1,3 @@ +[main] +os_linux_name = 'Calculate Directory Server' +os_linux_shortname = 'CDS+' diff --git a/profiles/CDS+/make.defaults b/profiles/CDS+/make.defaults new file mode 100644 index 0000000..4f6cee6 --- /dev/null +++ b/profiles/CDS+/make.defaults @@ -0,0 +1,4 @@ +USE="" +CL="builder console server" +THEMES="CDS" + diff --git a/profiles/CDS+/parent b/profiles/CDS+/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/CDS+/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/CDS+/x86/make.defaults b/profiles/CDS+/x86/make.defaults new file mode 100644 index 0000000..e67e967 --- /dev/null +++ b/profiles/CDS+/x86/make.defaults @@ -0,0 +1,4 @@ +PKGDIR="/var/calculate/remote/packages/CDS/i686" + +#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/i686" +PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/i686" diff --git a/profiles/CDS+/x86/parent b/profiles/CDS+/x86/parent new file mode 100644 index 0000000..c971f0f --- /dev/null +++ b/profiles/CDS+/x86/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/server/x86 +.. diff --git a/profiles/CLD+/amd64/make.defaults b/profiles/CLD+/amd64/make.defaults new file mode 100644 index 0000000..c22b628 --- /dev/null +++ b/profiles/CLD+/amd64/make.defaults @@ -0,0 +1,4 @@ +PKGDIR="/var/calculate/remote/packages/CLD/x86_64" + +#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/x86_64" +PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/x86_64" diff --git a/profiles/CLD+/amd64/parent b/profiles/CLD+/amd64/parent new file mode 100644 index 0000000..7d31601 --- /dev/null +++ b/profiles/CLD+/amd64/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/kde/amd64 +.. diff --git a/profiles/CLD+/calculate.env b/profiles/CLD+/calculate.env new file mode 100644 index 0000000..2392772 --- /dev/null +++ b/profiles/CLD+/calculate.env @@ -0,0 +1,4 @@ +[main] +os_linux_name = 'Calculate Linux Desktop' +os_linux_subname = 'KDE Plus' +os_linux_shortname = 'CLD+' diff --git a/profiles/CLD+/make.defaults b/profiles/CLD+/make.defaults new file mode 100644 index 0000000..e3158f0 --- /dev/null +++ b/profiles/CLD+/make.defaults @@ -0,0 +1,3 @@ +USE="" +CL="builder client desktop console consolegui" +THEMES="CLD" diff --git a/profiles/CLD+/parent b/profiles/CLD+/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/CLD+/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/CLD+/x86/make.defaults b/profiles/CLD+/x86/make.defaults new file mode 100644 index 0000000..315f5c5 --- /dev/null +++ b/profiles/CLD+/x86/make.defaults @@ -0,0 +1,4 @@ +PKGDIR="/var/calculate/remote/packages/CLD/i686" + +#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/i686" +PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/i686" diff --git a/profiles/CLD+/x86/parent b/profiles/CLD+/x86/parent new file mode 100644 index 0000000..80cbe44 --- /dev/null +++ b/profiles/CLD+/x86/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/kde/x86 +.. diff --git a/profiles/CLDX+/calculate.env b/profiles/CLDX+/calculate.env index c840d29..b6f476d 100644 --- a/profiles/CLDX+/calculate.env +++ b/profiles/CLDX+/calculate.env @@ -1,4 +1,4 @@ [main] os_linux_name = 'Calculate Linux Desktop' os_linux_subname = 'XFCE Plus' -os_linux_shortname = CLDX+ +os_linux_shortname = 'CLDX+' diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 3a079b2..76e9519 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -15,7 +15,9 @@ amd64 CLSM/amd64 stable amd64 CLS/amd64 stable amd64 CSS/amd64 stable amd64 CMC/amd64 stable +amd64 CLD+/amd64 stable amd64 CLDX+/amd64 stable +amd64 CDS+/amd64 stable # x86 Profiles x86 CLD/x86 stable @@ -25,6 +27,8 @@ x86 CLSM/x86 stable x86 CLS/x86 stable x86 CSS/x86 stable x86 CMC/x86 stable +x86 CLD+/x86 stable x86 CLDX+/x86 stable +x86 CDS+/x86 stable # vim: set ts=8 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 9262dea..990426b 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,21 +1,17 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# app-editors/vim app-office/libreoffice app-text/fbreader #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# kde-misc/openofficeorg-thumbnail #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# app-editors/leafpad app-text/qpdfview sci-calculators/galculator #in# - -#?in(os_linux_pkglist, CMC)!=# -media-tv/kodi -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/base b/profiles/templates/3.2/6_ac_update_sync/world/create/base index 89cda79..92d12b2 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/base +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/base @@ -8,4 +8,3 @@ sys-apps/ifplugd sys-apps/less sys-kernel/dracut #in# - diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration index 91a8ef3..b34f819 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration @@ -5,7 +5,7 @@ media-gfx/grub-splashes-calculate media-gfx/syslinux-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate x11-themes/calculate-icon-theme @@ -13,13 +13,13 @@ x11-themes/calculate-xcursors x11-themes/claws-mail-theme-calculate #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# media-gfx/kdm-themes-calculate x11-themes/oxygen-gtk:2 x11-themes/oxygen-gtk:3 #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# media-gfx/lightdm-themes-calculate x11-themes/gnome-themes-standard x11-themes/gtk-engines 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 5c1b872..d65c32b 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,15 +1,14 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# media-gfx/gimp media-gfx/imagemagick #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# sci-libs/clapack #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# media-gfx/nomacs #in# - diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde b/profiles/templates/3.2/6_ac_update_sync/world/create/kde index 2b89945..8d431a3 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde @@ -1,4 +1,4 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLD)!= +# Calculate name=world format=world in(os_linux_pkglist,CLD,CLD+)!= # kdeadmin-meta kde-apps/kcron diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/mate b/profiles/templates/3.2/6_ac_update_sync/world/create/mate index 4934ef0..14b928d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/mate +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/mate @@ -1,3 +1,3 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= +# Calculate name=world format=world in(os_linux_pkglist,CLSM,CLDX+)!= mate-base/mate 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 82c303c..7463dee 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,12 +1,12 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# media-sound/alsa-utils media-video/smplayer media-video/smtube #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# app-cdr/k3b media-sound/amarok media-video/dvdauthor @@ -15,18 +15,20 @@ media-video/kffmpegthumbnailer media-video/qt-recordmydesktop #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# app-cdr/xfburn media-sound/clementine media-video/gtk-recordmydesktop #in# +#?in(os_linux_pkglist, CMC, CLDX+)!=# +media-tv/kodi +#in# + #?in(os_linux_pkglist, CLS)!=# media-video/ffmpeg #in# #?in(os_linux_pkglist, CLDX+)!=# -media-tv/kodi media-video/vlc #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 a4ff2c5..141e3ae 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,17 +1,16 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+, CMC)!=# app-text/wgetpaste #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS)!=# -app-text/wgetpaste +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+)!=# net-analyzer/nmap net-analyzer/traceroute net-misc/whois #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# net-im/skype www-client/chromium www-plugins/chrome-binary-plugins @@ -19,12 +18,12 @@ www-plugins/chrome-ublock x11-misc/x11vnc #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# net-irc/konversation net-p2p/ktorrent #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# net-ftp/filezilla mail-client/claws-mail net-im/pidgin @@ -36,7 +35,7 @@ x11-plugins/pidgin-libnotify x11-plugins/purple-plugin_pack #in# -#?in(os_linux_pkglist, CDS)!=# +#?in(os_linux_pkglist, CDS, CDS+)!=# net-analyzer/fail2ban net-analyzer/iptraf-ng net-analyzer/macchanger 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 cf6b672..c228325 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,29 +1,29 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+, CMC)!=# net-dns/bind-tools net-firewall/shorewall net-misc/ntp net-misc/vconfig #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+)!=# net-dialup/pptpclient net-dialup/rp-pppoe #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# net-misc/networkmanager net-misc/networkmanager-openvpn net-misc/networkmanager-pptp net-misc/networkmanager-vpnc #in# -#?in(os_linux_pkglist, CLDX+, CLDX, CLSM)!=# +#?in(os_linux_pkglist, CLDX, CLDX+, CLSM)!=# gnome-extra/nm-applet #in# -#?in(os_linux_pkglist, CDS)!=# +#?in(os_linux_pkglist, CDS, CDS+)!=# net-dialup/ppp net-dialup/pptpd net-dialup/xl2tpd diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox index 2d9d221..b0863d8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox @@ -1,4 +1,4 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+,CLS)!= +# Calculate name=world format=world in(os_linux_pkglist,CLS,CLDX+)!= x11-terms/rxvt-unicode x11-wm/openbox 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 2c7efc2..e1d8024 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,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# media-gfx/xsane net-print/cnijfilter net-print/cups diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server index 377406c..9fc98db 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CDS, CSS)!=# +#?in(os_linux_pkglist, CDS, CDS+, CSS)!=# net-misc/dhcp #in# -#?in(os_linux_pkglist, CDS)!=# +#?in(os_linux_pkglist, CDS, CDS+)!=# dev-db/postgresql mail-filter/clamsmtp mail-filter/opendkim 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 41fe4d7..47bf315 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 @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS, CLSM, CLS, CSS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+, CLSM, CLS, CSS, CMC)!=# app-misc/tmux dev-util/ccache sys-auth/pam_update @@ -8,7 +8,7 @@ sys-fs/btrfs-progs sys-fs/reiserfsprogs #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS, CLSM, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+, CLSM, CLS, CMC)!=# app-admin/logrotate app-admin/syslog-ng sys-apps/ethtool @@ -16,7 +16,7 @@ sys-apps/usbutils sys-process/vixie-cron #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CDS, CDS+, CMC)!=# app-admin/hddtemp app-admin/sudo app-cdr/cdrtools @@ -40,7 +40,7 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CMC)!=# app-portage/gentoolkit-dev sys-apps/hdparm sys-apps/pcmciautils @@ -53,7 +53,7 @@ sys-power/powernowd sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -67,7 +67,7 @@ x11-libs/gksu virtual/rubygems #in# -#?in(os_linux_pkglist, CLD, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CMC)!=# sys-power/upower-pm-utils #in# @@ -75,11 +75,11 @@ sys-power/upower-pm-utils net-misc/dhcp #in# -#?in(os_linux_pkglist, CLD)!=# +#?in(os_linux_pkglist, CLD, CLD+)!=# sys-block/partitionmanager #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# app-admin/hardinfo app-pda/usbmuxd dev-python/gst-python @@ -93,12 +93,7 @@ x11-misc/sw-notify-send x11-misc/wmctrl #in# -#?in(os_linux_pkglist, CMC)!=# -app-misc/lirc -sys-apps/lm_sensors -#in# - -#?in(os_linux_pkglist, CDS)!=# +#?in(os_linux_pkglist, CDS, CDS+)!=# app-antivirus/clamav app-editors/vim app-i18n/enca @@ -120,3 +115,7 @@ sys-fs/xfsdump sys-process/iotop #in# +#?in(os_linux_pkglist, CMC)!=# +app-misc/lirc +sys-apps/lm_sensors +#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 4802ae3..919009c 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 @@ -1,12 +1,12 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CLSM, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CLSM, CLS, CMC)!=# sys-firmware/b43-firmware net-wireless/broadcom-sta net-wireless/wireless-tools net-wireless/wpa_supplicant #in# -#?in(os_linux_pkglist, CLDX+, CLDX)!=# +#?in(os_linux_pkglist, CLDX, CLDX+)!=# net-wireless/blueman #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/xfce b/profiles/templates/3.2/6_ac_update_sync/world/create/xfce index 9faf873..0459e53 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/xfce @@ -1,4 +1,4 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+,CLDX)!= +# Calculate name=world format=world in(os_linux_pkglist,CLDX,CLDX+)!= app-arch/xarchiver media-sound/pavucontrol diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg index 42ffb04..ad833ee 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg @@ -1,10 +1,9 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX+, CLDX, CLSM, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLD+, CLDX, CLDX+, CLSM, CLS, CMC)!=# app-misc/xorg-meta #in# -#?in(os_linux_pkglist, CLDX+, CLDX, CLSM)!=# +#?in(os_linux_pkglist, CLDX, CLDX+, CLSM)!=# x11-misc/lightdm #in# -