From 0ed2e1c1d6379df89030ae486a61e03f0a83383f Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 13 Jan 2014 12:15:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8C=20ac?= =?UTF-8?q?oola?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/.gitignore | 1 + metadata/layout.conf | 1 + profiles/CLDX/amd64/binary/parent | 7 ----- profiles/CLDX/calculate.env | 6 ---- profiles/CLDX/make.conf/make.defaults | 19 ------------- profiles/CLDX/package.keywords | 20 ------------- profiles/CLDX/package.use | 26 ----------------- profiles/CLDX/use.force | 2 -- profiles/CLDX/use.mask | 6 ---- profiles/CLDX/virtuals | 2 -- profiles/CLDX/x86/binary/parent | 7 ----- profiles/acoola/amd64/binary/parent | 3 ++ profiles/{CLDX => acoola}/amd64/make.defaults | 0 profiles/{CLDX => acoola}/amd64/parent | 3 +- .../binary/make.conf/make.defaults | 0 profiles/acoola/calculate.env | 6 ++++ profiles/acoola/make.conf/make.defaults | 1 + profiles/acoola/package.keywords | 0 profiles/acoola/package.use | 0 profiles/{CLDX => acoola}/parent | 0 profiles/acoola/x86/binary/parent | 3 ++ profiles/{CLDX => acoola}/x86/make.defaults | 0 profiles/{CLDX => acoola}/x86/parent | 3 +- profiles/profiles.desc | 28 +++---------------- 24 files changed, 21 insertions(+), 123 deletions(-) create mode 100644 metadata/.gitignore create mode 100644 metadata/layout.conf delete mode 100644 profiles/CLDX/amd64/binary/parent delete mode 100644 profiles/CLDX/calculate.env delete mode 100644 profiles/CLDX/make.conf/make.defaults delete mode 100644 profiles/CLDX/package.keywords delete mode 100644 profiles/CLDX/package.use delete mode 100644 profiles/CLDX/use.force delete mode 100644 profiles/CLDX/use.mask delete mode 100644 profiles/CLDX/virtuals delete mode 100644 profiles/CLDX/x86/binary/parent create mode 100644 profiles/acoola/amd64/binary/parent rename profiles/{CLDX => acoola}/amd64/make.defaults (100%) rename profiles/{CLDX => acoola}/amd64/parent (58%) rename profiles/{CLDX => acoola}/binary/make.conf/make.defaults (100%) create mode 100644 profiles/acoola/calculate.env create mode 100644 profiles/acoola/make.conf/make.defaults create mode 100644 profiles/acoola/package.keywords create mode 100644 profiles/acoola/package.use rename profiles/{CLDX => acoola}/parent (100%) create mode 100644 profiles/acoola/x86/binary/parent rename profiles/{CLDX => acoola}/x86/make.defaults (100%) rename profiles/{CLDX => acoola}/x86/parent (60%) diff --git a/metadata/.gitignore b/metadata/.gitignore new file mode 100644 index 0000000..14d86ad --- /dev/null +++ b/metadata/.gitignore @@ -0,0 +1 @@ +/cache diff --git a/metadata/layout.conf b/metadata/layout.conf new file mode 100644 index 0000000..18fe1f0 --- /dev/null +++ b/metadata/layout.conf @@ -0,0 +1 @@ +masters = calculate diff --git a/profiles/CLDX/amd64/binary/parent b/profiles/CLDX/amd64/binary/parent deleted file mode 100644 index caec665..0000000 --- a/profiles/CLDX/amd64/binary/parent +++ /dev/null @@ -1,7 +0,0 @@ -.. -../../../../binary/make.conf -../../../../binary -../../../binary/make.conf -../../../binary -../../binary/make.conf -../../binary diff --git a/profiles/CLDX/calculate.env b/profiles/CLDX/calculate.env deleted file mode 100644 index 1ef3ca5..0000000 --- a/profiles/CLDX/calculate.env +++ /dev/null @@ -1,6 +0,0 @@ -[main] -cl_template_location = overlay,distro,local,remote -cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/CLDX/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates -os_linux_name = 'Calculate Linux Desktop' -os_linux_subname = XFCE -os_linux_shortname = CLDX diff --git a/profiles/CLDX/make.conf/make.defaults b/profiles/CLDX/make.conf/make.defaults deleted file mode 100644 index bd57281..0000000 --- a/profiles/CLDX/make.conf/make.defaults +++ /dev/null @@ -1,19 +0,0 @@ -USE="" - -# Audio -USE="${USE} cdda -gstreamer" - -# Network protocols -USE="${USE} rdesktop" - -# System -USE="${USE} -dconf gnome-keyring networkmanager" - -# Window manager and specialities -USE="${USE} -eds -gnome -kde" - -VIDEO_CARDS="${VIDEO_CARDS} radeonhd" -CDISTRO="CLDX desktop" -CL="builder client desktop console consolegui" -THEMES="CLDX" -LIGHTDM_SESSION=xfce diff --git a/profiles/CLDX/package.keywords b/profiles/CLDX/package.keywords deleted file mode 100644 index 045364d..0000000 --- a/profiles/CLDX/package.keywords +++ /dev/null @@ -1,20 +0,0 @@ -~app-text/evince-3.4.0 amd64 x86 -~dev-util/catfish-0.6.4 amd64 x86 -~mail-client/claws-mail-3.9.0 amd64 x86 -~mail-client/claws-mail-address_keeper-1.0.7 amd64 x86 -~mail-client/claws-mail-fancy-0.9.17 amd64 x86 -~media-gfx/geeqie-1.1 amd64 x86 -~media-gfx/shotwell-0.14.1 amd64 x86 -~media-libs/gexiv2-0.6.0 amd64 x86 -~media-plugins/audacious-plugins-3.3.4 amd64 x86 -~media-sound/audacious-3.3.4 amd64 x86 -~media-video/smplayer-0.8.5 amd64 x86 -~net-fs/smbnetfs-0.5.3 amd64 x86 -~net-misc/freerdp-1.1.0_beta1_p20130605 amd64 x86 -~net-misc/remmina-1.0.0_p20130625 amd64 x86 -~x11-terms/xfce4-terminal-0.6.2 amd64 x86 -~xfce-base/exo-0.10.2 amd64 x86 -~xfce-base/libxfce4util-4.10.1 amd64 x86 -~xfce-base/thunar-1.6.3 amd64 x86 -~xfce-extra/xfce4-gvfs-mount-0.0.4 amd64 x86 -~xfce-extra/xfce4-xkb-plugin-0.5.6 amd64 x86 diff --git a/profiles/CLDX/package.use b/profiles/CLDX/package.use deleted file mode 100644 index e1ed696..0000000 --- a/profiles/CLDX/package.use +++ /dev/null @@ -1,26 +0,0 @@ -lxde-base/lxdm gtk3 -mail-client/claws-mail imap -media-sound/audacious chardet -net-misc/networkmanager-pptp gnome -net-misc/networkmanager-openvpn gnome -net-misc/networkmanager-vpnc gnome -net-misc/remmina ssh freerdp -net-p2p/deluge webinterface -net-print/gutenprint gimp -sys-apps/calculate-client xfce -sys-apps/calculate-desktop xfce -sys-block/gparted dmraid fat jfs ntfs reiserfs xfs xfce -x11-drivers/ati-drivers qt4 -x11-themes/tango-icon-theme -png -dev-qt/qtgui gtkstyle -xfce-base/thunar xfce_plugins_trash -xfce-base/xfdesktop thunar xfce_plugins_menu - -#need for xfce-base/thunar-1.2.0 -gnome-base/gvfs gdu - -#required by net-p2p/deluge-1.3.3 -net-libs/rb_libtorrent python - -#required by xfce-base/thunar-1.2.3[udev], required by xfce-extra/thunar-archive-plugin-0.3.0, required by app-misc/cl-xfce-meta-4.8-r2, required by app-misc/cldx-meta-11.12[-calculate_noxfce], required by app-misc/calculate-meta-11.12, required by @selected, required by @world (argument) -sys-fs/udev gudev diff --git a/profiles/CLDX/use.force b/profiles/CLDX/use.force deleted file mode 100644 index edb5fe0..0000000 --- a/profiles/CLDX/use.force +++ /dev/null @@ -1,2 +0,0 @@ -cdistro_CLDX -cdistro_desktop diff --git a/profiles/CLDX/use.mask b/profiles/CLDX/use.mask deleted file mode 100644 index 0f402e0..0000000 --- a/profiles/CLDX/use.mask +++ /dev/null @@ -1,6 +0,0 @@ -cdistro_CDS -cdistro_CLD -cdistro_CLDG -cdistro_CLS -cdistro_CMC -cdistro_CSS diff --git a/profiles/CLDX/virtuals b/profiles/CLDX/virtuals deleted file mode 100644 index 5ab5401..0000000 --- a/profiles/CLDX/virtuals +++ /dev/null @@ -1,2 +0,0 @@ -virtual/bittorrent net-p2p/transmission -virtual/editor app-editors/nano diff --git a/profiles/CLDX/x86/binary/parent b/profiles/CLDX/x86/binary/parent deleted file mode 100644 index caec665..0000000 --- a/profiles/CLDX/x86/binary/parent +++ /dev/null @@ -1,7 +0,0 @@ -.. -../../../../binary/make.conf -../../../../binary -../../../binary/make.conf -../../../binary -../../binary/make.conf -../../binary diff --git a/profiles/acoola/amd64/binary/parent b/profiles/acoola/amd64/binary/parent new file mode 100644 index 0000000..c65d7c8 --- /dev/null +++ b/profiles/acoola/amd64/binary/parent @@ -0,0 +1,3 @@ +.. +../../binary/make.conf +../../binary diff --git a/profiles/CLDX/amd64/make.defaults b/profiles/acoola/amd64/make.defaults similarity index 100% rename from profiles/CLDX/amd64/make.defaults rename to profiles/acoola/amd64/make.defaults diff --git a/profiles/CLDX/amd64/parent b/profiles/acoola/amd64/parent similarity index 58% rename from profiles/CLDX/amd64/parent rename to profiles/acoola/amd64/parent index d2d1bf2..b606671 100644 --- a/profiles/CLDX/amd64/parent +++ b/profiles/acoola/amd64/parent @@ -1,5 +1,4 @@ ../../../../../../../usr/portage/profiles/default/linux/amd64/13.0 -../../../make.conf/amd64 -../../make.conf +../../../../calculate/profiles/calculate/desktop/CLDX/amd64 ../make.conf .. diff --git a/profiles/CLDX/binary/make.conf/make.defaults b/profiles/acoola/binary/make.conf/make.defaults similarity index 100% rename from profiles/CLDX/binary/make.conf/make.defaults rename to profiles/acoola/binary/make.conf/make.defaults diff --git a/profiles/acoola/calculate.env b/profiles/acoola/calculate.env new file mode 100644 index 0000000..9e72be2 --- /dev/null +++ b/profiles/acoola/calculate.env @@ -0,0 +1,6 @@ +[main] +cl_template_location = overlay,distro,local,remote +cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/acoola/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates +os_linux_name = 'AcoolA' +os_linux_subname = '' +os_linux_shortname = acoola diff --git a/profiles/acoola/make.conf/make.defaults b/profiles/acoola/make.conf/make.defaults new file mode 100644 index 0000000..a67b1fd --- /dev/null +++ b/profiles/acoola/make.conf/make.defaults @@ -0,0 +1 @@ +USE="" diff --git a/profiles/acoola/package.keywords b/profiles/acoola/package.keywords new file mode 100644 index 0000000..e69de29 diff --git a/profiles/acoola/package.use b/profiles/acoola/package.use new file mode 100644 index 0000000..e69de29 diff --git a/profiles/CLDX/parent b/profiles/acoola/parent similarity index 100% rename from profiles/CLDX/parent rename to profiles/acoola/parent diff --git a/profiles/acoola/x86/binary/parent b/profiles/acoola/x86/binary/parent new file mode 100644 index 0000000..c65d7c8 --- /dev/null +++ b/profiles/acoola/x86/binary/parent @@ -0,0 +1,3 @@ +.. +../../binary/make.conf +../../binary diff --git a/profiles/CLDX/x86/make.defaults b/profiles/acoola/x86/make.defaults similarity index 100% rename from profiles/CLDX/x86/make.defaults rename to profiles/acoola/x86/make.defaults diff --git a/profiles/CLDX/x86/parent b/profiles/acoola/x86/parent similarity index 60% rename from profiles/CLDX/x86/parent rename to profiles/acoola/x86/parent index 6831f73..03fd809 100644 --- a/profiles/CLDX/x86/parent +++ b/profiles/acoola/x86/parent @@ -1,5 +1,4 @@ ../../../../../../../../../../usr/portage/profiles/default/linux/x86/13.0 -../../../make.conf/x86 -../../make.conf +../../../../calculate/profiles/calculate/desktop/CLDX/x86 ../make.conf .. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 03d5293..9ddd1c4 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -8,31 +8,11 @@ # AMD64 Profiles -amd64 CLD/amd64 stable -amd64 CLD/amd64/binary stable -amd64 CLDX/amd64 stable -amd64 CLDX/amd64/binary stable -amd64 CLS/amd64 stable -amd64 CLS/amd64/binary stable -amd64 CMC/amd64 stable -amd64 CMC/amd64/binary stable -amd64 CDS/amd64 stable -amd64 CDS/amd64/binary stable -amd64 CSS/amd64 stable -amd64 CSS/amd64/binary stable +amd64 acoola/amd64 dev +amd64 acoola/amd64/binary dev # x86 Profiles -x86 CLD/x86 stable -x86 CLD/x86/binary stable -x86 CLDX/x86 stable -x86 CLDX/x86/binary stable -x86 CLS/x86 stable -x86 CLS/x86/binary stable -x86 CMC/x86 stable -x86 CMC/x86/binary stable -x86 CDS/x86 stable -x86 CDS/x86/binary stable -x86 CSS/x86 stable -x86 CSS/x86/binary stable +x86 acoola/x86 dev +x86 acoola/x86/binary dev # vim: set ts=8