Частично перенесены профили в calculate

9 years ago · 323c9cced7
parent 1262897a3a
commit 323c9cced7
18 changed files with 16 additions and 23 deletions
--- a/profiles/CDS/amd64/parent
+++ b/profiles/CDS/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/server/amd64
+../../../../calculate/profiles/base/server/amd64
 ..
--- a/profiles/CDS/x86/parent
+++ b/profiles/CDS/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/server/x86
+../../../../calculate/profiles/base/server/x86
 ..
--- a/profiles/CLD/amd64/make.defaults
+++ b/profiles/CLD/amd64/make.defaults
@ -1,4 +1,3 @@
-ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLD/x86_64"

 #PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/x86_64"
--- a/profiles/CLD/amd64/parent
+++ b/profiles/CLD/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/amd64
+../../../../calculate/profiles/base/desktop/kde/amd64
 ..
--- a/profiles/CLD/make.defaults
+++ b/profiles/CLD/make.defaults
@ -1,7 +1,3 @@
 USE=""
-
-# Window manager and speciality
-USE="${USE} kde semantic-desktop"
-
 CL="builder client desktop console consolegui"
 THEMES="CLD"
--- a/profiles/CLD/x86/parent
+++ b/profiles/CLD/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/x86
+../../../../calculate/profiles/base/desktop/kde/x86
 ..
--- a/profiles/CLDX/amd64/make.defaults
+++ b/profiles/CLDX/amd64/make.defaults
@ -1,4 +1,3 @@
-ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"

 #PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
--- a/profiles/CLDX/amd64/parent
+++ b/profiles/CLDX/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/amd64
+../../../../calculate/profiles/base/desktop/x/amd64
 ..
--- a/profiles/CLDX/x86/parent
+++ b/profiles/CLDX/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/x86
+../../../../calculate/profiles/base/desktop/x/x86
 ..
--- a/profiles/CLS/amd64/make.defaults
+++ b/profiles/CLS/amd64/make.defaults
@ -1,4 +1,3 @@
-ABI_X86="32"
 PKGDIR="/var/calculate/remote/packages/CLS/x86_64"

 #PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLS/grp/x86_64"
--- a/profiles/CLS/amd64/parent
+++ b/profiles/CLS/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/amd64
+../../../../calculate/profiles/base/desktop/x/amd64
 ..
--- a/profiles/CLS/x86/parent
+++ b/profiles/CLS/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/x86
+../../../../calculate/profiles/base/desktop/x/x86
 ..
--- a/profiles/CMC/amd64/parent
+++ b/profiles/CMC/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/amd64
+../../../../calculate/profiles/base/desktop/x/amd64
 ..
--- a/profiles/CMC/package.mask
+++ b/profiles/CMC/package.mask
@ -1,3 +1,3 @@
 # exclude Python 3
->=dev-lang/python-3
+#>=dev-lang/python-3

--- a/profiles/CMC/package.use
+++ b/profiles/CMC/package.use
@ -2,9 +2,9 @@
 dev-vcs/git -tk -perl
 media-libs/libprojectm -video_cards_nvidia
 net-dialup/rp-pppoe -X
-net-fs/samba -winbind
-net-misc/dhcp minimal
-x11-drivers/ati-drivers -abi_x86_32
+#net-fs/samba -winbind
+#net-misc/dhcp minimal
+#x11-drivers/ati-drivers -abi_x86_32

 # include desktop, console modules
 sys-apps/calculate-utils desktop
--- a/profiles/CMC/x86/parent
+++ b/profiles/CMC/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/desktop/x86
+../../../../calculate/profiles/base/desktop/x/x86
 ..
--- a/profiles/CSS/amd64/parent
+++ b/profiles/CSS/amd64/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/server/amd64
+../../../../calculate/profiles/base/server/amd64
 ..
--- a/profiles/CSS/x86/parent
+++ b/profiles/CSS/x86/parent
@ -1,2 +1,2 @@
-../../../../calculate/profiles/server/x86
+../../../../calculate/profiles/base/server/x86
 ..