v0.7

5 years ago · f1128831e4
28 changed files with 5 additions and 114 deletions
--- a/profiles/CLC/amd64/20/calculate.env
+++ b/profiles/CLC/amd64/20/calculate.env
@ -1,3 +1,3 @@
				@@ -1,3 +1,3 @@
 [main]
-cl_template_location = calculate,local,remote
-cl_template_path = /var/db/repos/calculate/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
+cl_template_location = calculate,minimal,local,remote
+cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/minimal/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
--- a/profiles/CLC/calculate.env
+++ b/profiles/CLC/calculate.env
@ -1,3 +1,3 @@
				@@ -1,3 +1,3 @@
 [main]
-os_linux_name = 'Calculate Linux Custom'
-os_linux_shortname = CLC
+os_linux_name = 'Calculate Linux Minimal'
+os_linux_shortname = CLM
--- a/profiles/CLS/amd64/20/calculate.env
+++ b/profiles/CLS/amd64/20/calculate.env
@ -1,3 +0,0 @@
				@@ -1,3 +0,0 @@
-[main]
-cl_template_location = calculate,distros,local,remote
-cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
--- a/profiles/CLS/amd64/20/parent
+++ b/profiles/CLS/amd64/20/parent
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-calculate:default/amd64/20/desktop
-../..
--- a/profiles/CLS/amd64/parent
+++ b/profiles/CLS/amd64/parent
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/amd64/18/desktop
-..
--- a/profiles/CLS/calculate.env
+++ b/profiles/CLS/calculate.env
@ -1,3 +0,0 @@
				@@ -1,3 +0,0 @@
-[main]
-os_linux_name = 'Calculate Linux Scratch'
-os_linux_shortname = CLS
--- a/profiles/CLS/make.defaults
+++ b/profiles/CLS/make.defaults
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-USE=""
-THEMES="CLS"
--- a/profiles/CLS/package.use
+++ b/profiles/CLS/package.use
@ -1,4 +0,0 @@
				@@ -1,4 +0,0 @@
-# -----------------------------------------
-# Removed unnecessary dependence
-# -----------------------------------------
-sys-apps/calculate-utils -client -qt5
--- a/profiles/CLS/parent
+++ b/profiles/CLS/parent
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-..
--- a/profiles/CLS/x86/20/calculate.env
+++ b/profiles/CLS/x86/20/calculate.env
@ -1,6 +0,0 @@
				@@ -1,6 +0,0 @@
-[main]
-cl_template_location = calculate,distros,local,remote
-cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
-
-[update]
-cl_update_rep_url = git://github.com/calculatelinux/gentoo-archive.git,git://github.com/calculatelinux/calculate-archive.git,git://github.com/calculatelinux/distros-archive.git
--- a/profiles/CLS/x86/20/parent
+++ b/profiles/CLS/x86/20/parent
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-calculate:default/x86/20/desktop
-../..
--- a/profiles/CLS/x86/calculate.env
+++ b/profiles/CLS/x86/calculate.env
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-[update]
-cl_update_rep_url = git://github.com/calculatelinux/gentoo-archive.git,git://github.com/calculatelinux/calculate-archive.git,git://github.com/calculatelinux/distros-archive.git
--- a/profiles/CLS/x86/parent
+++ b/profiles/CLS/x86/parent
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/x86/18/desktop
-..
--- a/profiles/repo_name
+++ b/profiles/repo_name
@ -1 +1 @@
				@@ -1 +1 @@
-minimal-gentoo
+minimal
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate path=/var/lib name=calculate
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@ -1,5 +0,0 @@
				@@ -1,5 +0,0 @@
-# Calculate format=samba name=ini.env ini(overlay-distros.remerge)==
-
-[overlay-distros]
-# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20160120
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.remerge)<20160101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/6
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/6
@ -1,4 +0,0 @@
				@@ -1,4 +0,0 @@
-# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-# merge=www-client/chromium,media-video/smtube,sys-apps/baselayout,app-office/libreoffice
-
-[overlay-distros]
-remerge = #-cut()-#
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.remerge)<20170101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220
@ -1,4 +0,0 @@
				@@ -1,4 +0,0 @@
-# Calculate format=samba name=ini.env cl_chroot_status==on&&ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-cdr/brasero,app-cdr/k3b,app-cdr/xfburn,app-editors/gedit,app-editors/leafpad,app-editors/pluma,app-office/libreoffice,app-text/qpdfview,app-text/qpdfview,gnome-extra/gnome-calculator,kde-apps/gwenview,kde-apps/kcalc,kde-apps/kmail,kde-apps/konsole,kde-apps/kopete,kde-apps/kwrite,mail-client/claws-mail,mail-client/evolution,mail-client/trojita,mate-extra/mate-calc,media-gfx/eog,media-gfx/eom,media-gfx/gimp,media-gfx/lximage-qt,media-gfx/nomacs,media-sound/clementine,media-sound/rhythmbox,media-video/smplayer,media-video/totem,net-im/gajim,net-im/pidgin,net-im/qutim,net-irc/hexchat,net-irc/konversation,net-irc/kvirc,net-irc/polari,sci-calculators/galculator,www-client/epiphany,www-client/qupzilla,x11-terms/gnome-terminal,x11-terms/mate-terminal,x11-terms/qterminal,x11-terms/xfce4-terminal
-
-[overlay-calculate]
-remerge = #-cl_pass_file-#
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.remerge)<20180101
--- a/profiles/templates/3.5/6_ac_update_sync/revision/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate path=/var/lib name=calculate
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.revision)<20160101
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/1-migrate-ini.env
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/1-migrate-ini.env
@ -1,12 +0,0 @@
				@@ -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 =
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/2-migrate-CLSM-CLDM.env
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/2-migrate-CLSM-CLDM.env
@ -1,16 +0,0 @@
				@@ -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
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/3-migrate-CLSL-CLDL.env
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/3-migrate-CLSL-CLDL.env
@ -1,16 +0,0 @@
				@@ -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
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/4-migrate-CMC-CLS.env
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/4-migrate-CMC-CLS.env
@ -1,16 +0,0 @@
				@@ -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
--- a/profiles/templates/3.5/6_ac_update_sync/revision/2017/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/2017/.calculate_directory
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.revision)<20180101
				`@ -1 +0,0 @@` @@ -1 +0,0 @@
				`# Calculate path=/var/lib name=calculate`
				`@ -1 +0,0 @@` @@ -1 +0,0 @@
				`# Calculate append=skip ini(overlay-distros.remerge)<20160101`