From 323c9cced76c90b62bacce41f28dd66ebc3c8f37 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 16 Jun 2015 23:23:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B0=D1=81=D1=82=D0=B8=D1=87=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B8=20=D0=B2=20?= =?UTF-8?q?calculate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/CDS/amd64/parent | 2 +- profiles/CDS/x86/parent | 2 +- profiles/CLD/amd64/make.defaults | 1 - profiles/CLD/amd64/parent | 2 +- profiles/CLD/make.defaults | 4 ---- profiles/CLD/x86/parent | 2 +- profiles/CLDX/amd64/make.defaults | 1 - profiles/CLDX/amd64/parent | 2 +- profiles/CLDX/x86/parent | 2 +- profiles/CLS/amd64/make.defaults | 1 - profiles/CLS/amd64/parent | 2 +- profiles/CLS/x86/parent | 2 +- profiles/CMC/amd64/parent | 2 +- profiles/CMC/package.mask | 2 +- profiles/CMC/package.use | 6 +++--- profiles/CMC/x86/parent | 2 +- profiles/CSS/amd64/parent | 2 +- profiles/CSS/x86/parent | 2 +- 18 files changed, 16 insertions(+), 23 deletions(-) diff --git a/profiles/CDS/amd64/parent b/profiles/CDS/amd64/parent index 98ac9b5..0a823a1 100644 --- a/profiles/CDS/amd64/parent +++ b/profiles/CDS/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/server/amd64 +../../../../calculate/profiles/base/server/amd64 .. diff --git a/profiles/CDS/x86/parent b/profiles/CDS/x86/parent index 59fbcc3..c971f0f 100644 --- a/profiles/CDS/x86/parent +++ b/profiles/CDS/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/server/x86 +../../../../calculate/profiles/base/server/x86 .. diff --git a/profiles/CLD/amd64/make.defaults b/profiles/CLD/amd64/make.defaults index 249a267..c22b628 100644 --- 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" diff --git a/profiles/CLD/amd64/parent b/profiles/CLD/amd64/parent index f68a1b0..7d31601 100644 --- a/profiles/CLD/amd64/parent +++ b/profiles/CLD/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/amd64 +../../../../calculate/profiles/base/desktop/kde/amd64 .. diff --git a/profiles/CLD/make.defaults b/profiles/CLD/make.defaults index 0513128..e3158f0 100644 --- 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" diff --git a/profiles/CLD/x86/parent b/profiles/CLD/x86/parent index 4f35365..80cbe44 100644 --- a/profiles/CLD/x86/parent +++ b/profiles/CLD/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/x86 +../../../../calculate/profiles/base/desktop/kde/x86 .. diff --git a/profiles/CLDX/amd64/make.defaults b/profiles/CLDX/amd64/make.defaults index 099502b..3b63686 100644 --- 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" diff --git a/profiles/CLDX/amd64/parent b/profiles/CLDX/amd64/parent index f68a1b0..d1fbc2c 100644 --- a/profiles/CLDX/amd64/parent +++ b/profiles/CLDX/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/amd64 +../../../../calculate/profiles/base/desktop/x/amd64 .. diff --git a/profiles/CLDX/x86/parent b/profiles/CLDX/x86/parent index 4f35365..54c256e 100644 --- a/profiles/CLDX/x86/parent +++ b/profiles/CLDX/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/x86 +../../../../calculate/profiles/base/desktop/x/x86 .. diff --git a/profiles/CLS/amd64/make.defaults b/profiles/CLS/amd64/make.defaults index ba696b9..bfa9f8e 100644 --- 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" diff --git a/profiles/CLS/amd64/parent b/profiles/CLS/amd64/parent index f68a1b0..d1fbc2c 100644 --- a/profiles/CLS/amd64/parent +++ b/profiles/CLS/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/amd64 +../../../../calculate/profiles/base/desktop/x/amd64 .. diff --git a/profiles/CLS/x86/parent b/profiles/CLS/x86/parent index 4f35365..54c256e 100644 --- a/profiles/CLS/x86/parent +++ b/profiles/CLS/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/x86 +../../../../calculate/profiles/base/desktop/x/x86 .. diff --git a/profiles/CMC/amd64/parent b/profiles/CMC/amd64/parent index f68a1b0..d1fbc2c 100644 --- a/profiles/CMC/amd64/parent +++ b/profiles/CMC/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/amd64 +../../../../calculate/profiles/base/desktop/x/amd64 .. diff --git a/profiles/CMC/package.mask b/profiles/CMC/package.mask index 4bfb49c..52a4eff 100644 --- 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 diff --git a/profiles/CMC/package.use b/profiles/CMC/package.use index ff2e924..4c07872 100644 --- 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 diff --git a/profiles/CMC/x86/parent b/profiles/CMC/x86/parent index 4f35365..54c256e 100644 --- a/profiles/CMC/x86/parent +++ b/profiles/CMC/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/desktop/x86 +../../../../calculate/profiles/base/desktop/x/x86 .. diff --git a/profiles/CSS/amd64/parent b/profiles/CSS/amd64/parent index 98ac9b5..0a823a1 100644 --- a/profiles/CSS/amd64/parent +++ b/profiles/CSS/amd64/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/server/amd64 +../../../../calculate/profiles/base/server/amd64 .. diff --git a/profiles/CSS/x86/parent b/profiles/CSS/x86/parent index 59fbcc3..c971f0f 100644 --- a/profiles/CSS/x86/parent +++ b/profiles/CSS/x86/parent @@ -1,2 +1,2 @@ -../../../../calculate/profiles/server/x86 +../../../../calculate/profiles/base/server/x86 ..