diff --git a/profiles/CLDG/amd64/20/calculate.env b/profiles/CLDG/amd64/20/calculate.env index 7e8a26d..a797897 100644 --- a/profiles/CLDG/amd64/20/calculate.env +++ b/profiles/CLDG/amd64/20/calculate.env @@ -1,3 +1,3 @@ [main] -cl_template_location = calculate,distros,gnome-distro,local,remote -cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/db/repos/gnome-distro/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates +cl_template_location = calculate,distros,calculate-gnome,local,remote +cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/db/repos/calculate-gnome/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates diff --git a/profiles/CLDG/package.use b/profiles/CLDG/package.use index 8010239..ca1b99d 100644 --- a/profiles/CLDG/package.use +++ b/profiles/CLDG/package.use @@ -76,7 +76,7 @@ gnome-extra/evolution-data-server oauth # GNOME without games by default gnome-base/gnome-extra-apps -games -# GNOME Software only for extensions - Пакет не установлен +# GNOME Software only for extensions - The package is not installed # gnome-extra/gnome-software -firmware # Garde binaires @@ -85,7 +85,7 @@ www-client/chromium -gnome-keyring media-gfx/gimp -gnome media-video/vlc -gnome-keyring -# Recommended by Jksf +# Recommended by nemofsan # Transmission net-p2p/transmission -qt5 gtk @@ -99,14 +99,14 @@ net-misc/remmina gnome-keyring net-libs/glib-networking gnome net-libs/gnome-online-accounts gnome -# Пакет может не собираться с USE = gnome +# The package may not compile using USE = gnome x11-wm/mutter gnome x11-misc/xdg-utils gnome x11-themes/adwaita-qt gnome x11-terms/gnome-terminal gnome-shell nautilus -# Происходит циклическая зависимость пакетов с USE = gnome +# There is a cyclic dependency of packages with USE = gnome media-libs/libcanberra -gnome sound media-plugins/grilo-plugins gnome-online-accounts diff --git a/profiles/calculate.env b/profiles/calculate.env index 307ccc1..39ab49e 100644 --- a/profiles/calculate.env +++ b/profiles/calculate.env @@ -1,7 +1,7 @@ [main] -cl_template_location = calculate,distros,gnome-distro,local -cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/db/repos/gnome-distro/profiles/templates,/var/calculate/templates +cl_template_location = calculate,distros,calculate-gnome,local +cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/db/repos/calculate-gnome/profiles/templates,/var/calculate/templates [update] -cl_update_rep_name = gentoo,calculate,distros,gnome-distro -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://github.com/nemofsan/gnome-distro.git +cl_update_rep_name = gentoo,calculate,distros,calculate-gnome +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://github.com/nemofsan/calculate-gnome.git diff --git a/profiles/repo_name b/profiles/repo_name index 24274af..247125e 100644 --- a/profiles/repo_name +++ b/profiles/repo_name @@ -1 +1 @@ -gnome-distro +calculate-gnome diff --git a/profiles/templates/6_ac_update_sync/world/0-ini b/profiles/templates/6_ac_update_sync/world/0-ini index 8bf0886..bb00f07 100644 --- a/profiles/templates/6_ac_update_sync/world/0-ini +++ b/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(gnome-profile.world)== -[gnome-profile] +[calculate-gnome] world = 20220905