diff --git a/profiles/CLDL/amd64/parent b/profiles/CLDL/amd64/parent new file mode 100644 index 0000000..1627eb4 --- /dev/null +++ b/profiles/CLDL/amd64/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/amd64 +.. diff --git a/profiles/CLDL/calculate.env b/profiles/CLDL/calculate.env new file mode 100644 index 0000000..ba5357b --- /dev/null +++ b/profiles/CLDL/calculate.env @@ -0,0 +1,4 @@ +[main] +os_linux_name = 'Calculate Linux Desktop' +os_linux_subname = 'LXQt' +os_linux_shortname = CLDL diff --git a/profiles/CLDL/make.defaults b/profiles/CLDL/make.defaults new file mode 100644 index 0000000..b1fe2a4 --- /dev/null +++ b/profiles/CLDL/make.defaults @@ -0,0 +1,2 @@ +USE="" +THEMES="CLD" diff --git a/profiles/CLDL/parent b/profiles/CLDL/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/CLDL/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/CLDL/x86/parent b/profiles/CLDL/x86/parent new file mode 100644 index 0000000..0bb9835 --- /dev/null +++ b/profiles/CLDL/x86/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/x86 +.. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 5b948b4..83d0c91 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -9,21 +9,21 @@ # AMD64 Profiles amd64 CLD/amd64 stable +amd64 CLDL/amd64 stable amd64 CLDM/amd64 stable amd64 CLDX/amd64 stable amd64 CMC/amd64 stable amd64 CLS/amd64 stable -amd64 CLSL/amd64 stable amd64 CDS/amd64 stable amd64 CSS/amd64 stable # x86 Profiles x86 CLD/x86 stable +x86 CLDL/x86 stable x86 CLDM/x86 stable x86 CLDX/x86 stable x86 CMC/x86 stable x86 CLS/x86 stable -x86 CLSL/x86 stable x86 CDS/x86 stable x86 CSS/x86 stable diff --git a/profiles/templates/3.4/6_ac_update_sync/revision/03-migrate-CLDL.env b/profiles/templates/3.4/6_ac_update_sync/revision/03-migrate-CLDL.env new file mode 100644 index 0000000..48f9057 --- /dev/null +++ b/profiles/templates/3.4/6_ac_update_sync/revision/03-migrate-CLDL.env @@ -0,0 +1,16 @@ +# Calculate exec=/bin/bash ini(overlay-distros.revision)<3 + +#-ini(overlay-distros.revision,3)-# + +if [ ! -f /etc/portage/make.profile ]; then + if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CLSL/amd64 > /dev/null + then + rm /etc/portage/make.profile + ln -sf ../../var/lib/layman/distros/profiles/CLDL/amd64 /etc/portage/make.profile + fi + if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CLSL/x86 > /dev/null + then + rm /etc/portage/make.profile + ln -sf ../../var/lib/layman/distros/profiles/CLDL/x86 /etc/portage/make.profile + fi +fi diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/applications b/profiles/templates/3.4/6_ac_update_sync/world/create/applications index ab2d938..c70104e 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/applications @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# app-office/libreoffice #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# app-text/fbreader #in# @@ -12,11 +12,8 @@ app-text/fbreader kde-misc/openofficeorg-thumbnail #in# -#?in(os_linux_pkglist, CLDX, CLSL)!=# -app-text/qpdfview -#in# - -#?in(os_linux_pkglist, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDX)!=# app-editors/leafpad +app-text/qpdfview sci-calculators/galculator #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/decoration b/profiles/templates/3.4/6_ac_update_sync/world/create/decoration index cab321f..f028e35 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/decoration +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/decoration @@ -5,12 +5,12 @@ media-gfx/grub-splashes-calculate media-gfx/syslinux-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# x11-themes/calculate-icon-theme #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/games b/profiles/templates/3.4/6_ac_update_sync/world/create/games index 271b1b5..e96e9de 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/games +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/games @@ -1,5 +1,5 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# games-misc/games-envd #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/graphics b/profiles/templates/3.4/6_ac_update_sync/world/create/graphics index 08e75c2..f612054 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/graphics @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# media-gfx/gimp media-gfx/imagemagick #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/lxqt b/profiles/templates/3.4/6_ac_update_sync/world/create/lxqt index a2afba2..b6581cd 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/lxqt +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/lxqt @@ -1,20 +1,16 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLSL)!=# -app-editors/leafpad +#?in(os_linux_pkglist, CLDL)!=# lxde-base/lxtask lxqt-base/lxqt-admin lxqt-base/lxqt-meta lxqt-base/lxqt-openssh-askpass lxqt-base/lxqt-powermanagement lxqt-base/lxqt-sudo -mail-client/trojita media-gfx/lximage-qt -media-sound/qastools net-im/qutim net-irc/kvirc net-p2p/qbittorrent -sys-block/gparted x11-misc/qlipper x11-misc/screengrab x11-misc/sddm diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia index 76b1a61..f7617b9 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia @@ -9,8 +9,9 @@ media-video/smplayer media-video/gtk-recordmydesktop #in# -#?in(os_linux_pkglist, CLDX, CLSL)!=# +#?in(os_linux_pkglist, CLDL, CLDX)!=# media-sound/pavucontrol +media-sound/qastools #in# #?in(os_linux_pkglist, CLD)!=# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/netapps b/profiles/templates/3.4/6_ac_update_sync/world/create/netapps index fd1ee7c..b4973b5 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/netapps @@ -1,20 +1,20 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# app-text/wgetpaste #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# net-analyzer/nmap net-analyzer/traceroute net-misc/whois #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# www-client/qupzilla #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# x11-misc/x11vnc #in# @@ -22,11 +22,18 @@ x11-misc/x11vnc net-irc/konversation #in# +#?in(os_linux_pkglist, CLDL)!=# +mail-client/trojita +#in# + +#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +net-misc/remmina +#in# + #?in(os_linux_pkglist, CLDM, CLDX)!=# mail-client/claws-mail net-im/pidgin net-irc/hexchat -net-misc/remmina net-p2p/deluge x11-plugins/pidgin-hotkeys x11-plugins/pidgin-libnotify diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/network b/profiles/templates/3.4/6_ac_update_sync/world/create/network index e092b43..28bdccd 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/network @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, 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, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# net-misc/networkmanager net-misc/networkmanager-l2tp net-misc/networkmanager-openvpn @@ -18,7 +18,7 @@ net-misc/networkmanager-pptp net-misc/networkmanager-vpnc #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLSL)!=# +#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# gnome-extra/nm-applet #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/tools b/profiles/templates/3.4/6_ac_update_sync/world/create/tools index 1452608..3f466a0 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/tools @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CLSL, CSS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CLS, CSS, CMC)!=# app-arch/lbzip2 app-arch/pigz app-misc/tmux @@ -10,7 +10,7 @@ sys-fs/reiserfsprogs sys-fs/xfsprogs #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CLSL, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CLS, CMC)!=# app-admin/logrotate app-admin/syslog-ng sys-apps/ethtool @@ -18,12 +18,12 @@ sys-apps/usbutils sys-process/vixie-cron #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# app-admin/sudo sys-apps/memtest86+ #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# app-admin/hddtemp app-cdr/cdrtools app-cdr/dvd+rw-tools @@ -44,15 +44,15 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CMC)!=# sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# app-admin/testdisk #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CMC)!=# app-portage/gentoolkit-dev sys-apps/hdparm sys-apps/pcmciautils @@ -63,7 +63,7 @@ sys-power/cpupower sys-power/powernowd #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSL, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# app-editors/vim sys-apps/acl app-misc/mc @@ -73,11 +73,11 @@ app-misc/mc #www-plugins/adobe-flash #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# sys-apps/keyexec #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -97,7 +97,7 @@ net-misc/dhcp sys-block/partitionmanager #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# app-pda/usbmuxd dev-python/gst-python sys-apps/mlocate diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/wireless b/profiles/templates/3.4/6_ac_update_sync/world/create/wireless index c39be17..dc8a225 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/wireless +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/wireless @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# net-wireless/wireless-tools net-wireless/wpa_supplicant sys-firmware/b43-firmware @@ -8,10 +8,10 @@ sys-firmware/ipw2100-firmware sys-firmware/ipw2200-firmware #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# net-wireless/broadcom-sta #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# net-wireless/blueman #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/xfce b/profiles/templates/3.4/6_ac_update_sync/world/create/xfce index d5f2fa3..1f9dd1b 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/xfce @@ -3,7 +3,6 @@ #?in(os_linux_pkglist, CLDX)!=# app-arch/xarchiver dev-util/catfish -media-sound/qastools media-sound/volumeicon x11-misc/light-locker x11-misc/sw-notify-send diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/xorg b/profiles/templates/3.4/6_ac_update_sync/world/create/xorg index beeba29..1b80a85 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/xorg +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/xorg @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSL)!=# +#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# app-misc/xorg-meta #in#