diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 83d0c91..1fcf66e 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -9,6 +9,7 @@ # AMD64 Profiles amd64 CLD/amd64 stable +amd64 CLDC/amd64 stable amd64 CLDL/amd64 stable amd64 CLDM/amd64 stable amd64 CLDX/amd64 stable @@ -19,6 +20,7 @@ amd64 CSS/amd64 stable # x86 Profiles x86 CLD/x86 stable +x86 CLDC/x86 stable x86 CLDL/x86 stable x86 CLDM/x86 stable x86 CLDX/x86 stable diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/applications b/profiles/templates/3.4/6_ac_update_sync/world/create/applications index c70104e..06a5c1f 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/applications @@ -1,17 +1,13 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# app-office/libreoffice #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# app-text/fbreader #in# -#?in(os_linux_pkglist, CLD)!=# -kde-misc/openofficeorg-thumbnail -#in# - #?in(os_linux_pkglist, CLDL, CLDX)!=# app-editors/leafpad app-text/qpdfview diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/cinnamon b/profiles/templates/3.4/6_ac_update_sync/world/create/cinnamon index 7ecf5b5..531fc0b 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/cinnamon +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/cinnamon @@ -5,7 +5,6 @@ app-admin/openrc-settingsd app-arch/file-roller app-cdr/brasero app-editors/gedit -app-misc/mc app-text/evince gnome-extra/cinnamon gnome-extra/gnome-calculator @@ -14,13 +13,9 @@ mail-client/evolution media-gfx/cinnamon-themes-calculate media-gfx/eog media-gfx/gnome-screenshot -media-gfx/lightdm-themes-calculate media-sound/rhythmbox net-im/gajim -net-irc/hexchat -net-p2p/deluge sys-apps/baobab www-client/qupzilla x11-terms/gnome-terminal -x11-themes/calculate-icon-theme #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/decoration b/profiles/templates/3.4/6_ac_update_sync/world/create/decoration index 1764cc7..c4f5e97 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/decoration +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/decoration @@ -5,16 +5,16 @@ media-gfx/grub-splashes-calculate media-gfx/syslinux-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# x11-themes/calculate-icon-theme #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# media-gfx/lightdm-themes-calculate #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/games b/profiles/templates/3.4/6_ac_update_sync/world/create/games index e96e9de..aa2665d 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/games +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/games @@ -1,5 +1,5 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# games-misc/games-envd #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/graphics b/profiles/templates/3.4/6_ac_update_sync/world/create/graphics index f612054..ea42478 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/graphics @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# media-gfx/gimp media-gfx/imagemagick #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/kde b/profiles/templates/3.4/6_ac_update_sync/world/create/kde index 90b030e..5d64b97 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/kde +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/kde @@ -6,6 +6,7 @@ kde-apps/gwenview kde-apps/kamera kde-apps/kcalc kde-apps/kcron +kde-apps/kde4-l10n kde-apps/kde-l10n kde-apps/kdepim-l10n:4 kde-apps/kmail @@ -17,8 +18,5 @@ kde-apps/kwrite kde-apps/okular kde-apps/print-manager kde-apps/spectacle +kde-misc/openofficeorg-thumbnail kde-plasma/plasma-meta - -#kde-apps/kdenetwork-filesharing -#kde-apps/kwalletmanager -kde-apps/kde4-l10n diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia index 679b9fa..b4adebb 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/multimedia @@ -1,15 +1,18 @@ # Calculate name=world format=world +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# +media-video/smplayer +#in# + #?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# media-sound/clementine -media-video/smplayer #in# #?in(os_linux_pkglist, CLD, CLDL)!=# media-video/qt-recordmydesktop #in# -#?in(os_linux_pkglist, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDM, CLDX)!=# media-video/gtk-recordmydesktop #in# @@ -22,6 +25,10 @@ media-sound/qastools app-cdr/k3b #in# +#?in(os_linux_pkglist, CLDC)!=# +media-sound/rhythmbox +#in# + #?in(os_linux_pkglist, CLDX)!=# app-cdr/xfburn #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/netapps b/profiles/templates/3.4/6_ac_update_sync/world/create/netapps index b4973b5..e0257b4 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/netapps @@ -1,20 +1,20 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=# app-text/wgetpaste #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# net-analyzer/nmap net-analyzer/traceroute net-misc/whois #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# www-client/qupzilla #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# x11-misc/x11vnc #in# @@ -26,15 +26,18 @@ net-irc/konversation mail-client/trojita #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# net-misc/remmina #in# +#?in(os_linux_pkglist, CLDC, CLDM, CLDX)!=# +net-irc/hexchat +net-p2p/deluge +#in# + #?in(os_linux_pkglist, CLDM, CLDX)!=# mail-client/claws-mail net-im/pidgin -net-irc/hexchat -net-p2p/deluge x11-plugins/pidgin-hotkeys x11-plugins/pidgin-libnotify x11-plugins/purple-plugin_pack diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/network b/profiles/templates/3.4/6_ac_update_sync/world/create/network index 28bdccd..4616593 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/network @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# net-dialup/pptpclient net-dialup/rp-pppoe net-dialup/xl2tpd @@ -10,7 +10,7 @@ net-misc/ntp net-misc/vconfig #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# net-misc/networkmanager net-misc/networkmanager-l2tp net-misc/networkmanager-openvpn @@ -18,7 +18,7 @@ net-misc/networkmanager-pptp net-misc/networkmanager-vpnc #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# gnome-extra/nm-applet #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/printer b/profiles/templates/3.4/6_ac_update_sync/world/create/printer index ed799de..bf83a88 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/printer @@ -1,14 +1,11 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# -net-print/cups -net-print/hplip -#in# - -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# media-gfx/xsane net-print/cnijfilter +net-print/cups net-print/gutenprint +net-print/hplip net-print/hplip-plugin net-print/xerox-drivers #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/tools b/profiles/templates/3.4/6_ac_update_sync/world/create/tools index 850cfb2..889b128 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/tools @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CLS, CSS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLS, CSS, CMC)!=# app-arch/lbzip2 app-arch/pigz app-misc/tmux @@ -10,7 +10,7 @@ sys-fs/reiserfsprogs sys-fs/xfsprogs #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLS, CMC)!=# app-admin/logrotate app-admin/syslog-ng sys-apps/ethtool @@ -18,12 +18,12 @@ sys-apps/usbutils sys-process/vixie-cron #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=# app-admin/sudo sys-apps/memtest86+ #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CMC)!=# app-admin/hddtemp app-cdr/cdrtools app-cdr/dvd+rw-tools @@ -44,15 +44,15 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CMC)!=# sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# app-admin/testdisk #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CMC)!=# app-portage/gentoolkit-dev sys-apps/hdparm sys-apps/pcmciautils @@ -63,21 +63,17 @@ sys-power/cpupower sys-power/powernowd #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CDS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=# app-editors/vim sys-apps/acl app-misc/mc #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# -#www-plugins/adobe-flash -#in# - -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# sys-apps/keyexec #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -88,7 +84,7 @@ sys-apps/usb_modeswitch x11-libs/gksu #in# -#?in(os_linux_pkglist, CLD, CLDM, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CMC)!=# sys-power/upower-pm-utils #in# @@ -100,7 +96,7 @@ net-misc/dhcp sys-block/partitionmanager #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# app-pda/usbmuxd dev-python/gst-python sys-apps/mlocate diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/wireless b/profiles/templates/3.4/6_ac_update_sync/world/create/wireless index dc8a225..ed0dd6c 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/wireless +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/wireless @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=# net-wireless/wireless-tools net-wireless/wpa_supplicant sys-firmware/b43-firmware @@ -8,10 +8,10 @@ sys-firmware/ipw2100-firmware sys-firmware/ipw2200-firmware #in# -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=# net-wireless/broadcom-sta #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# net-wireless/blueman #in# diff --git a/profiles/templates/3.4/6_ac_update_sync/world/create/xorg b/profiles/templates/3.4/6_ac_update_sync/world/create/xorg index 15cb79d..655441c 100644 --- a/profiles/templates/3.4/6_ac_update_sync/world/create/xorg +++ b/profiles/templates/3.4/6_ac_update_sync/world/create/xorg @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLS)!=# +#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLS)!=# app-misc/xorg-meta #in# -#?in(os_linux_pkglist, CLDL, CLDM, CLDX)!=# +#?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX)!=# x11-misc/lightdm #in#