From 5af783ed28bd212c591d40299e5bd8be766f7f8e Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 13 Oct 2015 14:25:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8C=20Calculate?= =?UTF-8?q?=20Linux=20Scratch=20KDE=20=D1=81=20KDE=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/CLSK/amd64/parent | 2 ++ profiles/CLSK/calculate.env | 4 ++++ profiles/CLSK/make.defaults | 1 + profiles/CLSK/parent | 1 + profiles/CLSK/x86/parent | 2 ++ profiles/profiles.desc | 1 + .../templates/3.2/6_ac_update_sync/world/0-ini | 2 +- .../3.2/6_ac_update_sync/world/create/decoration | 8 ++++++-- .../3.2/6_ac_update_sync/world/create/kde5 | 14 ++++++++++++++ .../3.2/6_ac_update_sync/world/create/tools | 8 ++++---- .../3.2/6_ac_update_sync/world/create/wireless | 2 +- .../3.2/6_ac_update_sync/world/create/xorg | 2 +- .../3.2/6_ac_update_sync/world/update/100-199/163 | 7 +++++++ 13 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 profiles/CLSK/amd64/parent create mode 100644 profiles/CLSK/calculate.env create mode 100644 profiles/CLSK/make.defaults create mode 100644 profiles/CLSK/parent create mode 100644 profiles/CLSK/x86/parent create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/kde5 create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/163 diff --git a/profiles/CLSK/amd64/parent b/profiles/CLSK/amd64/parent new file mode 100644 index 0000000..d1fbc2c --- /dev/null +++ b/profiles/CLSK/amd64/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/x/amd64 +.. diff --git a/profiles/CLSK/calculate.env b/profiles/CLSK/calculate.env new file mode 100644 index 0000000..51c2ab0 --- /dev/null +++ b/profiles/CLSK/calculate.env @@ -0,0 +1,4 @@ +[main] +os_linux_name = 'Calculate Linux Scratch' +os_linux_subname = 'KDE' +os_linux_shortname = CLSK diff --git a/profiles/CLSK/make.defaults b/profiles/CLSK/make.defaults new file mode 100644 index 0000000..a67b1fd --- /dev/null +++ b/profiles/CLSK/make.defaults @@ -0,0 +1 @@ +USE="" diff --git a/profiles/CLSK/parent b/profiles/CLSK/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/CLSK/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/CLSK/x86/parent b/profiles/CLSK/x86/parent new file mode 100644 index 0000000..54c256e --- /dev/null +++ b/profiles/CLSK/x86/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/x/x86 +.. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index bf0d4b1..2b4c855 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -14,6 +14,7 @@ amd64 CLDX/amd64 stable amd64 CLDO/amd64 stable amd64 CDS/amd64 stable amd64 CLS/amd64 stable +amd64 CLSK/amd64 stable amd64 CSS/amd64 stable amd64 CMC/amd64 stable amd64 CLD+/amd64 stable diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index f22c03e..e807a3d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 162 +world = 163 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration index 210ee3a..41d6445 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration @@ -5,13 +5,13 @@ media-gfx/grub-splashes-calculate media-gfx/syslinux-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLD+, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLSK, CLD+, CLDX+)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate x11-themes/calculate-xcursors #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLD+, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=# x11-themes/calculate-icon-theme #in# @@ -33,6 +33,10 @@ x11-themes/oxygen-gtk:2 x11-themes/oxygen-gtk:3 #in# +#?in(os_linux_pkglist, CLSK, CLDX+)!=# +x11-themes/gnome-breeze +#in# + #?in(os_linux_pkglist, CLDX+)!=# x11-themes/greybird x11-wm/compiz-fusion diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde5 b/profiles/templates/3.2/6_ac_update_sync/world/create/kde5 new file mode 100644 index 0000000..b114099 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde5 @@ -0,0 +1,14 @@ +# Calculate name=world format=world in(os_linux_pkglist,CLSK)!= + +kde-plasma/plasma-meta + +# kdeadmin-meta +kde-apps/kcron + +# kdebase-meta +kde-apps/dolphin +kde-apps/konsole +kde-apps/kwrite + +# kdemultimedia-meta +kde-apps/dragon diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index b19f76f..b671bba 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -4,14 +4,14 @@ dev-util/ccache #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CSS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CLSK, CSS, CMC, CDS+)!=# app-misc/tmux sys-auth/pam_update sys-fs/btrfs-progs sys-fs/reiserfsprogs #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CLSK, CMC, CDS+)!=# app-admin/logrotate app-admin/syslog-ng sys-apps/ethtool @@ -60,7 +60,7 @@ sys-power/powernowd sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLDX+, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLSK, CLDX+, CDS+)!=# app-editors/vim sys-apps/acl app-misc/mc @@ -87,7 +87,7 @@ x11-libs/gksu sys-power/upower-pm-utils #in# -#?in(os_linux_pkglist, CLS, CMC)!=# +#?in(os_linux_pkglist, CLS, CLSK, CMC)!=# net-misc/dhcp #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless index 64cf5e3..fffbfcf 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK, CLDX+)!=# sys-firmware/b43-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg index f3d922b..25e82d8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK, CLDX+)!=# app-misc/xorg-meta #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/163 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/163 new file mode 100644 index 0000000..15e3a9f --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/163 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<163 + +#-ini(overlay-distros.world,163)-# + +#?in(os_linux_pkglist, CDS+)!=# +app-portage/genlop +#in#