remove old deps

profiles/CCM/calculate.env

@@ -3,8 +3,8 @@ os_linux_name = 'Calculate Container Manager'
 os_linux_shortname = CCM
 
 [update]
-cl_update_rep_name = gentoo,calculate,distros,container
-cl_update_rep_url = https://git.calculate-linux.org/calculate/gentoo-overlay,https://git.calculate-linux.org/calculate/calculate-overlay,https://git.calculate-linux.org/calculate/distros-overlay,https://git.calculate-linux.org/calculate/container-overlay
+cl_update_rep_name = gentoo,calculate,distros
+cl_update_rep_url = https://git.calculate-linux.org/calculate/gentoo-overlay,https://git.calculate-linux.org/calculate/calculate-overlay,https://git.calculate-linux.org/calculate/distros-overlay
 cl_update_rep_list =
-	GitHub: https://github.com/calculatelinux/gentoo,https://github.com/calculatelinux/calculate,https://github.com/calculatelinux/distros,https://github.com/calculatelinux/container
-	Calculate: https://git.calculate-linux.org/calculate/gentoo-overlay,https://git.calculate-linux.org/calculate/calculate-overlay,https://git.calculate-linux.org/calculate/distros-overlay,https://git.calculate-linux.org/calculate/container-overlay
+	GitHub: https://github.com/calculatelinux/gentoo,https://github.com/calculatelinux/calculate,https://github.com/calculatelinux/distros
+	Calculate: https://git.calculate-linux.org/calculate/gentoo-overlay,https://git.calculate-linux.org/calculate/calculate-overlay,https://git.calculate-linux.org/calculate/distros-overlay

profiles/templates/6_ac_update_sync/revision/0-ini

@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-distros.revision)==
+
+[overlay-distros]
+revision = 20230222

profiles/templates/6_ac_update_sync/revision/10-old/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.revision)<20160101

profiles/templates/6_ac_update_sync/revision/10-old/1-migrate-ini.env

@@ -1,12 +0,0 @@
-# Calculate path=/var/lib/calculate name=ini.env format=samba ini(overlay-distros.revision)<#-cut()-#
-
-[overlay-distros]
-revision = #-cut()-#
-world = #-ini(update.world)-#
-
-[update]
-!world =
-
-[update-distros]
-!world =
-!revision =

profiles/templates/6_ac_update_sync/revision/10-old/2-migrate-CLSM-CLDM.env

@@ -1,16 +0,0 @@
-# Calculate exec=/bin/bash ini(overlay-distros.revision)<#-cut()-#
-
-#-ini(overlay-distros.revision,#-cut()-#)-#
-
-if [ ! -f /etc/portage/make.profile ]; then
-	if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CLSM/amd64 > /dev/null
-	then
-		rm /etc/portage/make.profile
-		ln -sf ../../var/lib/layman/distros/profiles/CLDM/amd64 /etc/portage/make.profile
-	fi
-	if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CLSM/x86 > /dev/null
-	then
-		rm /etc/portage/make.profile
-		ln -sf ../../var/lib/layman/distros/profiles/CLDM/x86 /etc/portage/make.profile
-	fi
-fi

profiles/templates/6_ac_update_sync/revision/10-old/3-migrate-CLSL-CLDL.env

@@ -1,16 +0,0 @@
-# Calculate exec=/bin/bash ini(overlay-distros.revision)<#-cut()-#
-
-#-ini(overlay-distros.revision,#-cut()-#)-#
-
-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

profiles/templates/6_ac_update_sync/revision/10-old/4-migrate-CMC-CLS.env

@@ -1,16 +0,0 @@
-# Calculate exec=/bin/bash ini(overlay-distros.revision)<#-cut()-#
-
-#-ini(overlay-distros.revision,#-cut()-#)-#
-
-if [ ! -f /etc/portage/make.profile ]; then
-	if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CMC/amd64 > /dev/null
-	then
-		rm /etc/portage/make.profile
-		ln -sf ../../var/lib/layman/distros/profiles/CLS/amd64 /etc/portage/make.profile
-	fi
-	if file /etc/portage/make.profile | grep /var/lib/layman/distros/profiles/CMC/x86 > /dev/null
-	then
-		rm /etc/portage/make.profile
-		ln -sf ../../var/lib/layman/distros/profiles/CLS/x86 /etc/portage/make.profile
-	fi
-fi

profiles/templates/6_ac_update_sync/revision/2017/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.revision)<20180101

profiles/templates/6_ac_update_sync/revision/2023/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-distros.revision)<20240101

profiles/templates/6_ac_update_sync/revision/2023/20230214.2-ccm-container-overlay

@@ -0,0 +1,25 @@
+# Calculate exec=/bin/bash ini(overlay-distros.revision)<#-cut(0)-#
+
+#-ini(overlay-distros.revision,#-cut(0)-#)-#
+
+if grep -q '\[container\]' /etc/portage/repos.conf/zz-calculate.conf && \
+	[[ ! -e /etc/portage/repos.conf/cl-lxc.conf ]]
+then
+	while IFS= read -r line; do
+		if [[ $line == '[container]' ]]; then
+			new=1
+		elif [[ ${line::1} == '[' ]]; then
+			new=
+		fi
+	
+		if [[ $new == 1 ]]; then
+			echo $line >> /etc/portage/repos.conf/cl-lxc.conf
+		else
+			echo $line >> /etc/portage/repos.conf/zz-calculate-new.conf
+		fi
+	
+	done <<< $(cat /etc/portage/repos.conf/zz-calculate.conf)
+	mv /etc/portage/repos.conf/zz-calculate-new.conf /etc/portage/repos.conf/zz-calculate.conf
+fi
+
+exit 0

profiles/templates/6_ac_update_sync/revision/2023/20230222-sync-type

@@ -0,0 +1,9 @@
+# Calculate exec=/bin/bash ini(overlay-distros.revision)<#-cut(0)-#
+
+#-ini(overlay-distros.revision,#-cut(0)-#)-#
+
+if [[ -e /etc/portage/repos.conf/cl-lxc.conf ]]; then
+	sed -i 's/^sync-type.*/sync-type = git/g' /etc/portage/repos.conf/cl-lxc.conf
+fi
+
+exit 0

profiles/templates/6_ac_update_sync/world/0-ini

@@ -1,4 +1,4 @@
 # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 20221116
+world = 20240408

profiles/templates/6_ac_update_sync/world/create/applications

@@ -14,7 +14,7 @@ sci-calculators/galculator
 #in#
 
 #?in(os_linux_pkglist, CLDX, CLDXS)!=#
-app-editors/leafpad
+app-editors/mousepad
 #in#
 
 #?in(os_linux_pkglist, CLDL)!=#

profiles/templates/6_ac_update_sync/world/create/base

@@ -8,3 +8,7 @@ sys-apps/ifplugd
 sys-apps/less
 sys-kernel/dracut
 #in#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CLS, CSS)!=#
+net-misc/dhcpcd
+#in#

profiles/templates/6_ac_update_sync/world/create/decoration

@@ -8,12 +8,12 @@ media-gfx/grub-splashes-calculate
 media-fonts/noto-emoji
 media-gfx/calculate-wallpapers
 media-gfx/dm-themes-calculate
+media-gfx/lightdm-themes-calculate
 media-gfx/splash-themes-calculate
 x11-themes/calculate-icon-theme
 #in#
 
 #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
-media-gfx/lightdm-themes-calculate
 x11-themes/adwaita-qt
 #in#
 

profiles/templates/6_ac_update_sync/world/create/kde

@@ -21,11 +21,10 @@ kde-apps/korganizer
 kde-apps/kwrite
 kde-apps/okular
 kde-apps/pim-data-exporter
-kde-apps/plasma-telepathy-meta
-kde-apps/print-manager
 kde-apps/spectacle
 kde-apps/thumbnailers
 kde-misc/openofficeorg-thumbnail
 kde-plasma/plasma-meta
+kde-plasma/print-manager
 sys-fs/cryfs
 sys-fs/encfs

profiles/templates/6_ac_update_sync/world/create/lxqt

@@ -2,14 +2,14 @@
 
 #?in(os_linux_pkglist, CLDL)!=#
 app-arch/xarchiver
+lxde-base/lxmenu-data
 lxde-base/lxtask
 lxqt-base/lxqt-admin
-#lxqt-base/lxqt-l10n
 lxqt-base/lxqt-meta
 lxqt-base/lxqt-openssh-askpass
 lxqt-base/lxqt-powermanagement
 lxqt-base/lxqt-sudo
-net-irc/kvirc
+net-irc/hexchat
 x11-misc/qlipper
 x11-misc/screengrab
 x11-terms/qterminal

profiles/templates/6_ac_update_sync/world/create/mate

@@ -8,4 +8,7 @@ mate-extra/mate-sensors-applet
 mate-extra/mate-user-guide
 media-gfx/mate-themes-calculate
 x11-misc/mate-notification-daemon
+x11-themes/mate-icon-theme
+# need for mate-base/caja
+gnome-base/gvfs
 #in#

profiles/templates/6_ac_update_sync/world/create/netapps

@@ -2,10 +2,13 @@
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CDS)!=#
 app-text/wgetpaste
+#in#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
 net-analyzer/nmap
 net-analyzer/traceroute
 net-dns/bind-tools
-net-misc/ntp
+net-misc/chrony
 net-misc/whois
 #in#
 
@@ -31,11 +34,6 @@ mail-client/claws-mail
 net-irc/hexchat
 #in#
 
-#?in(os_linux_pkglist, CCM, CDS)!=#
-net-analyzer/tcpdump
-net-analyzer/vnstat
-#in#
-
 #?in(os_linux_pkglist, CLD)!=#
 kde-apps/krdc
 kde-apps/krfb
@@ -45,8 +43,6 @@ net-p2p/ktorrent
 
 #?in(os_linux_pkglist, CCM)!=#
 mail-mta/nullmailer
-net-analyzer/nload
-net-analyzer/wireshark
 #in#
 
 #?in(os_linux_pkglist, CDS)!=#
@@ -54,6 +50,8 @@ net-analyzer/fail2ban
 net-analyzer/iptraf-ng
 net-analyzer/macchanger
 net-analyzer/sarg
+net-analyzer/tcpdump
+net-analyzer/vnstat
 net-dialup/minicom
 net-fs/samba
 net-ftp/tftp-hpa

profiles/templates/6_ac_update_sync/world/create/network

@@ -9,10 +9,10 @@ net-firewall/shorewall
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
 net-vpn/networkmanager-l2tp
+net-vpn/networkmanager-openconnect
 net-vpn/networkmanager-openvpn
 net-vpn/networkmanager-pptp
 net-vpn/networkmanager-vpnc
-net-vpn/networkmanager-wireguard
 #in#
 
 #?in(os_linux_pkglist, CDS)!=#

profiles/templates/6_ac_update_sync/world/create/printer

@@ -10,6 +10,8 @@ net-print/foomatic-db-engine
 net-print/gutenprint
 net-print/hplip
 net-print/hplip-plugin
+net-print/pantum
+net-print/rastertospl
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXS)!=#

profiles/templates/6_ac_update_sync/world/create/tools

@@ -5,29 +5,23 @@ app-arch/lbzip2
 app-arch/pigz
 app-misc/tmux
 app-text/tree
-net-misc/dhcp
+sys-apps/texinfo
 sys-auth/pam_update
 sys-fs/btrfs-progs
 sys-fs/cryptsetup
 sys-fs/f2fs-tools
-sys-fs/reiserfsprogs
 sys-fs/xfsprogs
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CDS, CLS)!=#
 app-admin/logrotate
 app-admin/syslog-ng
-sys-apps/ethtool
 sys-apps/usbutils
 sys-process/cronie
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
-app-editors/vim
-app-vim/colorschemes
-sys-apps/inxi
-sys-fs/mdadm
-sys-process/htop
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS, CLS)!=#
+sys-apps/ethtool
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
@@ -36,7 +30,6 @@ app-admin/sudo
 app-admin/testdisk
 app-cdr/cdrtools
 app-cdr/dvd+rw-tools
-app-portage/portage-utils
 sys-apps/acl
 sys-apps/dmidecode
 sys-apps/lm-sensors
@@ -56,16 +49,19 @@ app-arch/p7zip
 app-arch/rar
 app-arch/unzip
 sys-apps/hdparm
+sys-apps/inxi
 sys-apps/keyexec
 sys-apps/pcmciautils
 sys-apps/usb_modeswitch
 sys-fs/exfatprogs
+sys-fs/mdadm
 sys-fs/ntfs3g
 sys-power/acpi
 sys-power/acpid
 sys-power/cpupower
 sys-power/powernowd
 sys-power/powertop
+sys-process/htop
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXS)!=#
@@ -106,6 +102,7 @@ app-i18n/enca
 app-portage/ufed
 dev-python/psycopg
 dev-python/pyserial
+net-misc/dhcp
 sci-libs/fftw
 sys-apps/ipmitool
 sys-apps/iproute2

profiles/templates/6_ac_update_sync/world/create/wireless

@@ -3,8 +3,6 @@
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CLS)!=#
 net-wireless/broadcom-sta
 net-wireless/rtl8814au
-net-wireless/rtl8821ce
-net-wireless/rtl8821cu
 net-wireless/wireless-tools
 net-wireless/wpa_supplicant
 sys-firmware/b43-firmware

profiles/templates/6_ac_update_sync/world/create/xfce

@@ -13,7 +13,6 @@ xfce-base/xfce4-power-manager
 xfce-extra/thunar-archive-plugin
 xfce-extra/thunar-media-tags-plugin
 xfce-extra/xfce4-clipman-plugin
-xfce-extra/xfce4-datetime-plugin
 xfce-extra/xfce4-notifyd
 xfce-extra/xfce4-screensaver
 xfce-extra/xfce4-screenshooter

profiles/templates/6_ac_update_sync/world/create/xorg

@@ -8,7 +8,7 @@ app-misc/xorg-meta
 app-i18n/uim
 #in#
 
-#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
 x11-misc/lightdm
 #in#
 

profiles/templates/6_ac_update_sync/world/update/2022/20221226

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDM)!=#
+x11-themes/mate-icon-theme
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-distros.world)<20240101

profiles/templates/6_ac_update_sync/world/update/2023/20230106

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDM)!=#
+gnome-base/gvfs
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/20230109

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
+!!app-portage/portage-utils
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/20230121

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CDS, CLS, CSS)!=#
+sys-apps/texinfo
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/20230510

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDL)!=#
+!net-irc/kvirc
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/20230601

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+# build problems with kernel 6.1
+!net-wireless/rtl8821cu
+

profiles/templates/6_ac_update_sync/world/update/2023/20230914

@@ -0,0 +1,5 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+!net-wireless/rtl8821ce

profiles/templates/6_ac_update_sync/world/update/2023/20231121

@@ -0,0 +1,10 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+!kde-apps/print-manager
+!kde-plasma/print-manager
+
+#?in(os_linux_pkglist, CLD)!=#
+kde-plasma/print-manager
+#in#

profiles/templates/6_ac_update_sync/world/update/2023/20231217

@@ -0,0 +1,5 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+!net-vpn/networkmanager-wireguard

profiles/templates/6_ac_update_sync/world/update/2023/20231219

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, calculate)!=#
+net-misc/dhcpcd
+#in#

profiles/templates/6_ac_update_sync/world/update/2024/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-distros.world)<20250101

profiles/templates/6_ac_update_sync/world/update/2024/20240319

@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
+!net-misc/ntp
+net-misc/chrony
+#in#

profiles/templates/6_ac_update_sync/world/update/2024/20240326

@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLD)!=#
+media-gfx/lightdm-themes-calculate
+x11-misc/lightdm
+#in#

profiles/templates/6_ac_update_sync/world/update/2024/20240331

@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDL)!=#
+lxde-base/lxmenu-data
+#in#

profiles/templates/6_ac_update_sync/world/update/2024/20240408

@@ -0,0 +1,5 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+!kde-apps/plasma-telepathy-meta