From 9a436d8b4ce53c9eee8c547b0d6087c32bbe09db Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 4 May 2016 09:50:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20world?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B8=D1=81=D1=82=D1=80=D0=B8=D0=B1?= =?UTF-8?q?=D1=83=D1=82=D0=B8=D0=B2=D0=BE=D0=B2.=20=D0=92=20CLD=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20okular?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.2/6_ac_update_sync/world/0-ini | 2 +- .../world/create/applications | 38 +-- .../6_ac_update_sync/world/create/children+ | 5 - .../6_ac_update_sync/world/create/cinnamon+ | 3 - .../6_ac_update_sync/world/create/decoration | 20 +- .../6_ac_update_sync/world/create/depends+ | 7 - .../3.2/6_ac_update_sync/world/create/dicts+ | 5 - .../6_ac_update_sync/world/create/drivers+ | 6 - .../6_ac_update_sync/world/create/education+ | 5 - .../6_ac_update_sync/world/create/emulation+ | 16 -- .../3.2/6_ac_update_sync/world/create/fonts+ | 36 --- .../3.2/6_ac_update_sync/world/create/games | 15 - .../6_ac_update_sync/world/create/graphics | 18 +- .../3.2/6_ac_update_sync/world/create/ide+ | 4 - .../3.2/6_ac_update_sync/world/create/kde | 1 + .../6_ac_update_sync/world/create/kde-apps+ | 263 ------------------ .../world/create/kde-frameworks+ | 71 ----- .../6_ac_update_sync/world/create/kde-misc+ | 4 - .../6_ac_update_sync/world/create/kde-plasma+ | 38 --- .../3.2/6_ac_update_sync/world/create/lib+ | 39 --- .../3.2/6_ac_update_sync/world/create/lxqt+ | 9 - .../3.2/6_ac_update_sync/world/create/mate | 7 +- .../6_ac_update_sync/world/create/microcode+ | 3 - .../6_ac_update_sync/world/create/multimedia | 45 +-- .../3.2/6_ac_update_sync/world/create/netapps | 76 +---- .../3.2/6_ac_update_sync/world/create/network | 22 +- .../6_ac_update_sync/world/create/openbox+ | 14 - .../6_ac_update_sync/world/create/plugins+ | 18 -- .../3.2/6_ac_update_sync/world/create/printer | 8 +- .../6_ac_update_sync/world/create/science+ | 7 - .../3.2/6_ac_update_sync/world/create/server | 33 +-- .../3.2/6_ac_update_sync/world/create/tools | 153 ++-------- .../6_ac_update_sync/world/create/wireless | 8 +- .../3.2/6_ac_update_sync/world/create/wm+ | 17 -- .../3.2/6_ac_update_sync/world/create/xfce | 46 +-- .../3.2/6_ac_update_sync/world/create/xorg | 6 +- .../6_ac_update_sync/world/update/201-300/249 | 7 + 37 files changed, 64 insertions(+), 1011 deletions(-) delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/children+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/cinnamon+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/depends+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/dicts+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/education+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/fonts+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/ide+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/kde-frameworks+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/kde-misc+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/kde-plasma+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/lib+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/lxqt+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/microcode+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/openbox+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/plugins+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/science+ delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/wm+ create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249 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 2e62c93..aa83e87 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 = 248 +world = 249 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/applications b/profiles/templates/3.2/6_ac_update_sync/world/create/applications index e6d7092..b552ff5 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/applications @@ -1,47 +1,15 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# app-office/libreoffice #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# kde-misc/openofficeorg-thumbnail #in# -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# app-editors/leafpad app-text/qpdfview sci-calculators/galculator #in# - -#?in(os_linux_pkglist, CLDX+)!=# -app-office/calligra -#in# - -#?in(os_linux_pkglist, CLDX+)!=# -app-editors/bluefish -app-editors/gedit -app-editors/gvim -app-editors/juffed -app-editors/latexila -#app-i18n/poedit -app-misc/rox-filer -app-misc/xmind -app-office/abiword -app-office/gnumeric -app-office/lyx -app-office/scribus -app-office/texmaker -app-text/fbreader -app-text/kchmviewer -app-text/keepnote -app-text/mupdf -app-text/xournal -dev-db/pgadmin3 -dev-util/meld -sci-calculators/speedcrunch -#in# - -#?in(os_linux_pkglist, CDS+)!=# -app-text/fbless -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/children+ b/profiles/templates/3.2/6_ac_update_sync/world/create/children+ deleted file mode 100644 index 6034c7f..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/children+ +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -media-gfx/tuxpaint -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/cinnamon+ b/profiles/templates/3.2/6_ac_update_sync/world/create/cinnamon+ deleted file mode 100644 index 87db413..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/cinnamon+ +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -gnome-extra/cinnamon 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 6f78aea..769daa4 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,37 +5,27 @@ media-gfx/grub-splashes-calculate media-gfx/syslinux-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# media-gfx/calculate-wallpapers media-gfx/dm-themes-calculate #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# x11-themes/calculate-icon-theme #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# media-gfx/lightdm-themes-calculate x11-themes/claws-mail-theme-calculate #in# -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# x11-themes/elementary-icon-theme x11-themes/gnome-themes-standard x11-themes/gtk-engines x11-themes/xfwm4-themes #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# media-gfx/plasma-themes-calculate #in# - -#?in(os_linux_pkglist, CLDX+)!=# -x11-misc/nitrogen -x11-themes/audacious-themes -x11-themes/greybird -x11-themes/smplayer-skins -x11-themes/smplayer-themes -x11-themes/calculate-xcursors -x11-wm/compiz-fusion -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/depends+ b/profiles/templates/3.2/6_ac_update_sync/world/create/depends+ deleted file mode 100644 index 08790f4..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/depends+ +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate name=world format=world - -# Depending kde4 applications for installation in kde5 -#?in(os_linux_pkglist, CLDX+)!=# -kde-base/baloo -x11-libs/qtscriptgenerator -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/dicts+ b/profiles/templates/3.2/6_ac_update_sync/world/create/dicts+ deleted file mode 100644 index 109ec1f..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/dicts+ +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -app-dicts/stardict-calculate-ru -app-text/sdcv -app-text/stardict diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ b/profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ deleted file mode 100644 index 25cdb6a..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/drivers+ +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -media-video/nvidia-settings -x11-drivers/ati-drivers -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/education+ b/profiles/templates/3.2/6_ac_update_sync/world/create/education+ deleted file mode 100644 index 65a711d..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/education+ +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -sci-astronomy/stellarium -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ b/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ deleted file mode 100644 index 68a8004..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/emulation+ +++ /dev/null @@ -1,16 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -app-emulation/playonlinux -app-emulation/q4wine -app-emulation/qemu -app-emulation/virt-manager -app-emulation/virtualbox -app-emulation/virtualbox-additions -app-emulation/virtualbox-extpack-oracle -app-emulation/wine -app-emulation/winetricks -games-emulation/dosbox -#app-emulation/lxc -sci-visualization/qtiplot -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/fonts+ b/profiles/templates/3.2/6_ac_update_sync/world/create/fonts+ deleted file mode 100644 index 8a3c693..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/fonts+ +++ /dev/null @@ -1,36 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -media-fonts/font-adobe-100dpi -media-fonts/font-adobe-75dpi -media-fonts/font-adobe-utopia-100dpi -media-fonts/font-adobe-utopia-75dpi -media-fonts/font-adobe-utopia-type1 -media-fonts/font-arabic-misc -media-fonts/font-bh-100dpi -media-fonts/font-bh-75dpi -media-fonts/font-bh-lucidatypewriter-100dpi -media-fonts/font-bh-lucidatypewriter-75dpi -media-fonts/font-bh-ttf -media-fonts/font-bh-type1 -media-fonts/font-bitstream-100dpi -media-fonts/font-bitstream-75dpi -media-fonts/font-bitstream-speedo -media-fonts/font-bitstream-type1 -media-fonts/font-cronyx-cyrillic -media-fonts/font-cursor-misc -media-fonts/font-daewoo-misc -media-fonts/font-dec-misc -media-fonts/font-ibm-type1 -media-fonts/font-isas-misc -media-fonts/font-jis-misc -media-fonts/font-micro-misc -media-fonts/font-misc-cyrillic -media-fonts/font-misc-ethiopic -media-fonts/font-misc-meltho -media-fonts/font-mutt-misc -media-fonts/font-schumacher-misc -media-fonts/font-screen-cyrillic -media-fonts/font-sony-misc -media-fonts/font-sun-misc -media-fonts/font-winitzki-cyrillic -media-fonts/font-xfree86-type1 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/games b/profiles/templates/3.2/6_ac_update_sync/world/create/games index 911d932..271b1b5 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/games +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/games @@ -3,18 +3,3 @@ #?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# games-misc/games-envd #in# - -#?in(os_linux_pkglist, CLDX+)!=# -games-action/oolite -games-action/supertuxkart -games-arcade/briquolo -games-arcade/lbreakout2 -games-arcade/supertux -games-misc/xpenguins -games-sports/xmoto -games-strategy/0ad -games-strategy/freeciv -games-util/steam-launcher -kde-apps/kbreakout -kde-apps/ktuberling -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics index b89221f..08e75c2 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics @@ -1,24 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# media-gfx/gimp media-gfx/imagemagick #in# -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# media-gfx/nomacs #in# - -#?in(os_linux_pkglist, CLDX+)!=# -media-gfx/blender -media-gfx/darktable -media-gfx/digikam -media-gfx/fotowall -media-gfx/freecad -media-gfx/gqview -media-gfx/gthumb -media-gfx/hugin -media-gfx/inkscape -media-gfx/librecad -media-gfx/pinta -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/ide+ b/profiles/templates/3.2/6_ac_update_sync/world/create/ide+ deleted file mode 100644 index bbe96b4..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/ide+ +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -dev-python/spyder -dev-util/eric diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde b/profiles/templates/3.2/6_ac_update_sync/world/create/kde index 306323a..623ea18 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde @@ -12,6 +12,7 @@ kde-apps/kmail kde-apps/konsole kde-apps/kopete kde-apps/kwrite +kde-apps/okular kde-apps/print-manager kde-apps/spectacle kde-plasma/plasma-meta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ deleted file mode 100644 index 13b5355..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-apps+ +++ /dev/null @@ -1,263 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= -kde-apps/akonadiconsole -kde-apps/akregator -kde-apps/amor -kde-apps/analitza -kde-apps/ark -kde-apps/artikulate -kde-apps/attica -kde-apps/audiocd-kio -kde-apps/baloo-widgets -kde-apps/blinken -kde-apps/blogilo -kde-apps/bomber -kde-apps/bovo -kde-apps/calendarjanitor -kde-apps/cantor -kde-apps/cervisia -kde-apps/dolphin -kde-apps/dolphin-plugins -kde-apps/dragon -kde-apps/drkonqi -kde-apps/ffmpegthumbs -kde-apps/filelight -kde-apps/gpgmepp -kde-apps/granatier -kde-apps/gwenview -kde-apps/jovie -kde-apps/juk -kde-apps/kabcclient -kde-apps/kaccessible -kde-apps/kaccounts-integration -kde-apps/kaddressbook -kde-apps/kajongg -kde-apps/kalarm -kde-apps/kalgebra -kde-apps/kalzium -kde-apps/kamera -kde-apps/kanagram -kde-apps/kapman -kde-apps/kapptemplate -kde-apps/kate -kde-apps/katomic -kde-apps/kblackbox -kde-apps/kblocks -kde-apps/kbounce -kde-apps/kbreakout -kde-apps/kbruch -kde-apps/kcachegrind -kde-apps/kcalc -kde-apps/kcharselect -kde-apps/kcmshell -kde-apps/kcolorchooser -#kde-apps/kcontrol -kde-apps/kcron -kde-apps/kde4-l10n -kde-apps/kdeaccessibility-meta -kde-apps/kdeadmin-meta -#kde-apps/kde-apps-meta -kde-apps/kdeartwork-colorschemes -kde-apps/kdeartwork-desktopthemes -kde-apps/kdeartwork-emoticons -kde-apps/kdeartwork-iconthemes -kde-apps/kdeartwork-kscreensaver -kde-apps/kdeartwork-meta -#kde-apps/kdeartwork-styles -kde-apps/kdeartwork-wallpapers -kde-apps/kdeartwork-weatherwallpapers -kde-apps/kde-base-artwork -kde-apps/kdebase-data -kde-apps/kdebase-desktoptheme -kde-apps/kdebase-kioslaves -kde-apps/kdebase-menu -kde-apps/kdebase-menu-icons -kde-apps/kdebase-meta -kde-apps/kdebase-runtime-meta -kde-apps/kdebugdialog -kde-apps/kdebugsettings -kde-apps/kdecore-meta -kde-apps/kde-dev-scripts -kde-apps/kde-dev-utils -kde-apps/kdeedu-data -#kde-apps/kdeedu-meta -kde-apps/kdegames-meta -#kde-apps/kdegraphics-meta -kde-apps/kdegraphics-mobipocket -kde-apps/kde-l10n -#kde-apps/kde-meta -kde-apps/kdemultimedia-meta -kde-apps/kdenetwork-filesharing -kde-apps/kdenetwork-meta -kde-apps/kdenlive -#kde-apps/kdepasswd -kde-apps/kdepim-common-libs -#kde-apps/kdepim-icons -kde-apps/kdepim-kresources -kde-apps/kdepim-l10n -kde-apps/kdepimlibs -kde-apps/kdepim-meta -kde-apps/kdepim-runtime -#kde-apps/kdepim-wizards -kde-apps/kdesdk-kioslaves -kde-apps/kdesdk-meta -kde-apps/kdesdk-strigi-analyzer -kde-apps/kdesdk-thumbnailers -kde-apps/kdesu -kde-apps/kdetoys-meta -kde-apps/kdeutils-meta -kde-apps/kde-wallpapers -kde-apps/kdewebdev-meta -kde-apps/kdf -kde-apps/kdialog -kde-apps/kdiamond -kde-apps/kdontchangethehostname -kde-apps/keditbookmarks -kde-apps/keditfiletype -kde-apps/kfile -kde-apps/kfilereplace -kde-apps/kfind -kde-apps/kfloppy -kde-apps/kfmclient -kde-apps/kfourinline -kde-apps/kgamma -kde-apps/kgeography -kde-apps/kget -kde-apps/kglobalaccel -kde-apps/kgoldrunner -kde-apps/kgpg -kde-apps/khangman -kde-apps/khelpcenter -kde-apps/kiconfinder -kde-apps/kig -kde-apps/kigo -kde-apps/killbots -kde-apps/kimagemapeditor -kde-apps/kimgio -kde-apps/kioclient -kde-apps/kio-extras -kde-apps/kiriki -kde-apps/kiten -kde-apps/kjots -kde-apps/kjumpingcube -kde-apps/kleopatra -kde-apps/klettres -kde-apps/klickety -kde-apps/klines -kde-apps/klinkstatus -kde-apps/kmag -kde-apps/kmahjongg -kde-apps/kmail -kde-apps/kmimetypefinder -kde-apps/kmines -kde-apps/kmix -kde-apps/kmousetool -kde-apps/kmouth -kde-apps/kmplot -kde-apps/knavalbattle -kde-apps/knetattach -kde-apps/knetwalk -kde-apps/knewstuff -kde-apps/knode -kde-apps/knotes -kde-apps/knotify -kde-apps/kolf -kde-apps/kollision -kde-apps/kolourpaint -kde-apps/kommander -kde-apps/kompare -kde-apps/konq-plugins -kde-apps/konqueror -kde-apps/konquest -kde-apps/konsole -kde-apps/konsolekalendar -kde-apps/konsolepart -kde-apps/kontact -kde-apps/kopete -kde-apps/korganizer -kde-apps/kpasswdserver -kde-apps/kpat -kde-apps/kppp -kde-apps/kqtquickcharts -kde-apps/kquitapp -kde-apps/krdc -kde-apps/kreadconfig -kde-apps/kremotecontrol -kde-apps/kreversi -kde-apps/krfb -kde-apps/kruler -kde-apps/ksaneplugin -kde-apps/kscd -kde-apps/kshisen -kde-apps/ksirk -kde-apps/ksnakeduel -#kde-apps/ksnapshot -kde-apps/kspaceduel -kde-apps/ksquares -kde-apps/kstars -kde-apps/kstart -kde-apps/ksudoku -kde-apps/ksystemlog -kde-apps/kteatime -kde-apps/ktimer -kde-apps/ktimetracker -kde-apps/ktimezoned -kde-apps/ktnef -kde-apps/ktouch -kde-apps/ktp-l10n -kde-apps/ktraderclient -kde-apps/ktuberling -kde-apps/kturtle -kde-apps/ktux -kde-apps/kubrick -kde-apps/kuiserver -kde-apps/kurifilter-plugins -kde-apps/kuser -kde-apps/kwalletd -kde-apps/kwalletd-pam -kde-apps/kwalletmanager -kde-apps/kwordquiz -kde-apps/kwrite -kde-apps/libkcddb -kde-apps/libkcompactdisc -kde-apps/libkdcraw -#kde-apps/libkdeedu -kde-apps/libkdegames -#kde-apps/libkdepim -kde-apps/libkeduvocdocument -kde-apps/libkexiv2 -kde-apps/libkface -#kde-apps/libkgeomap -kde-apps/libkipi -#kde-apps/libkleo -kde-apps/libkmahjongg -kde-apps/libkomparediff2 -kde-apps/libkonq -#kde-apps/libkpgp -kde-apps/libksane -kde-apps/lokalize -kde-apps/lskat -#kde-apps/marble -kde-apps/mplayerthumbs -kde-apps/nsplugins -kde-apps/okteta -kde-apps/okular -kde-apps/pairs -kde-apps/palapeli -kde-apps/parley -kde-apps/phonon-kde -kde-apps/picmi -kde-apps/plasma-apps -kde-apps/plasma-runtime -kde-apps/poxml -kde-apps/print-manager -kde-apps/renamedlg-plugins -kde-apps/rocs -kde-apps/solid-runtime -kde-apps/spectacle -kde-apps/step -kde-apps/superkaramba -kde-apps/svgpart -kde-apps/sweeper -kde-apps/thumbnailers -kde-apps/umbrello -kde-apps/zeroconf-ioslave diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-frameworks+ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-frameworks+ deleted file mode 100644 index 721bce1..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-frameworks+ +++ /dev/null @@ -1,71 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -kde-frameworks/attica -kde-frameworks/baloo -kde-frameworks/bluez-qt -kde-frameworks/extra-cmake-modules -kde-frameworks/frameworkintegration -kde-frameworks/kactivities -kde-frameworks/kapidox -kde-frameworks/karchive -kde-frameworks/kauth -kde-frameworks/kbookmarks -kde-frameworks/kcmutils -kde-frameworks/kcodecs -kde-frameworks/kcompletion -kde-frameworks/kconfig -kde-frameworks/kconfigwidgets -kde-frameworks/kcoreaddons -kde-frameworks/kcrash -kde-frameworks/kdbusaddons -kde-frameworks/kdeclarative -kde-frameworks/kded -kde-frameworks/kdelibs4support -kde-frameworks/kdesignerplugin -kde-frameworks/kdesu -kde-frameworks/kdewebkit -kde-frameworks/kdnssd -kde-frameworks/kdoctools -kde-frameworks/kemoticons -kde-frameworks/kf-env -kde-frameworks/kfilemetadata -kde-frameworks/kglobalaccel -kde-frameworks/kguiaddons -kde-frameworks/khtml -kde-frameworks/ki18n -kde-frameworks/kiconthemes -kde-frameworks/kidletime -kde-frameworks/kimageformats -kde-frameworks/kinit -kde-frameworks/kio -kde-frameworks/kitemmodels -kde-frameworks/kitemviews -kde-frameworks/kjobwidgets -kde-frameworks/kjs -kde-frameworks/kjsembed -kde-frameworks/kmediaplayer -kde-frameworks/knewstuff -kde-frameworks/knotifications -kde-frameworks/knotifyconfig -kde-frameworks/kpackage -kde-frameworks/kparts -kde-frameworks/kpeople -kde-frameworks/kplotting -kde-frameworks/kpty -kde-frameworks/kross -kde-frameworks/krunner -kde-frameworks/kservice -kde-frameworks/ktexteditor -kde-frameworks/ktextwidgets -kde-frameworks/kunitconversion -kde-frameworks/kwallet -kde-frameworks/kwidgetsaddons -kde-frameworks/kwindowsystem -kde-frameworks/kxmlgui -kde-frameworks/kxmlrpcclient -kde-frameworks/modemmanager-qt -kde-frameworks/networkmanager-qt -kde-frameworks/plasma -kde-frameworks/solid -kde-frameworks/sonnet -kde-frameworks/threadweaver diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-misc+ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-misc+ deleted file mode 100644 index a6f9e45..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-misc+ +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -kde-misc/kdirstat -kde-misc/yakuake diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-plasma+ b/profiles/templates/3.2/6_ac_update_sync/world/create/kde-plasma+ deleted file mode 100644 index bda4ed5..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/kde-plasma+ +++ /dev/null @@ -1,38 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -kde-plasma/bluedevil -kde-plasma/breeze -kde-plasma/kde-cli-tools -kde-plasma/kdecoration -kde-plasma/kde-gtk-config -kde-plasma/kdeplasma-addons -kde-plasma/kgamma -kde-plasma/khotkeys -kde-plasma/kinfocenter -kde-plasma/kmenuedit -kde-plasma/kscreen -kde-plasma/ksshaskpass -kde-plasma/ksysguard -kde-plasma/kwallet-pam -kde-plasma/kwayland -kde-plasma/kwayland-integration -kde-plasma/kwin -kde-plasma/kwrited -kde-plasma/libkscreen -kde-plasma/libksysguard -kde-plasma/milou -kde-plasma/oxygen -kde-plasma/oxygen-fonts -kde-plasma/plasma-desktop -kde-plasma/plasma-mediacenter -kde-plasma/plasma-meta -kde-plasma/plasma-nm -kde-plasma/plasma-pa -kde-plasma/plasma-sdk -kde-plasma/plasma-workspace -kde-plasma/plasma-workspace-wallpapers -kde-plasma/polkit-kde-agent -kde-plasma/powerdevil -kde-plasma/sddm-kcm -kde-plasma/systemsettings -kde-plasma/user-manager diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/lib+ b/profiles/templates/3.2/6_ac_update_sync/world/create/lib+ deleted file mode 100644 index 40d6ef0..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/lib+ +++ /dev/null @@ -1,39 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -dev-python/Kivy - -dev-python/PyQt5 -dev-python/xlwt - -dev-qt/assistant:5 -dev-qt/designer:5 -dev-qt/linguist:5 -dev-qt/pixeltool:5 -dev-qt/qdbusviewer:5 -dev-qt/qdoc:5 -dev-qt/qtbluetooth:5 -dev-qt/qtconcurrent:5 -dev-qt/qtcore:5 -dev-qt/qtdbus:5 -dev-qt/qtdeclarative:5 -dev-qt/qtdiag:5 -dev-qt/qtgui:5 -dev-qt/qthelp:5 -dev-qt/qtopengl:5 -dev-qt/qtpositioning:5 -dev-qt/qtprintsupport:5 -dev-qt/qtquick1:5 -dev-qt/qtquickcontrols:5 -dev-qt/qtscript:5 -dev-qt/qtsensors:5 -dev-qt/qtserialport:5 -dev-qt/qtsql:5 -dev-qt/qtsvg:5 -dev-qt/qttest:5 -dev-qt/qttranslations:5 -dev-qt/qtwayland:5 -dev-qt/qtwebchannel:5 -dev-qt/qtwebkit:5 -dev-qt/qtwebsockets:5 -dev-qt/qtx11extras:5 -dev-qt/qtxmlpatterns:5 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/lxqt+ b/profiles/templates/3.2/6_ac_update_sync/world/create/lxqt+ deleted file mode 100644 index eb4012d..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/lxqt+ +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -lxqt-base/lxqt-admin -lxqt-base/lxqt-meta -lxqt-base/lxqt-openssh-askpass -lxqt-base/lxqt-powermanagement -lxqt-base/lxqt-sudo -media-gfx/lximage-qt -x11-terms/qterminal diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/mate b/profiles/templates/3.2/6_ac_update_sync/world/create/mate index 3c5fbf9..e1add63 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/mate +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/mate @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLDM, CLDX+)!=# +#?in(os_linux_pkglist, CLDM)!=# mate-base/mate mate-extra/caja-extensions mate-extra/mate-sensors-applet @@ -9,8 +9,3 @@ net-analyzer/mate-netspeed x11-misc/mate-notification-daemon x11-misc/parcellite #in# - -#?in(os_linux_pkglist, CLDX+)!=# -mate-extra/caja-dropbox -x11-themes/mate-icon-theme-faenza -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/microcode+ b/profiles/templates/3.2/6_ac_update_sync/world/create/microcode+ deleted file mode 100644 index c07df31..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/microcode+ +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CDS+)!= - -sys-apps/microcode-ctl diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia index 0334b25..29bfd08 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia @@ -1,60 +1,27 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# media-video/smplayer #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# media-sound/clementine media-video/gtk-recordmydesktop #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# media-sound/amarok media-video/qt-recordmydesktop #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# app-cdr/k3b #in# -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# app-cdr/xfburn #in# -#?in(os_linux_pkglist, CMC, CLDX+)!=# +#?in(os_linux_pkglist, CMC)!=# media-tv/kodi #in# - -#?in(os_linux_pkglist, CLDX+)!=# -media-video/dvdauthor -media-video/dvgrab -media-video/kffmpegthumbnailer -media-video/kaffeine -#in# - -#?in(os_linux_pkglist, CLDX+)!=# -app-cdr/brasero -media-gfx/shotwell -media-plugins/qmmp-plugin-pack -media-radio/radiotray -media-sound/alsa-utils -media-sound/audacious -media-sound/audacity -media-sound/easytag -#media-sound/lxmusic -media-sound/qmmp -media-sound/rhythmbox -media-sound/soundconverter -#media-sound/xmms2 -media-video/avidemux -media-video/devede -media-video/istanbul -media-video/kino -media-video/mpv -media-video/openshot -media-video/pitivi -media-video/smtube -media-video/totem -media-video/vlc -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps index 48f51ef..e168f2e 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps @@ -1,28 +1,28 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC)!=# app-text/wgetpaste #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS)!=# net-analyzer/nmap net-analyzer/traceroute net-misc/whois #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# www-client/qupzilla #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# x11-misc/x11vnc #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# net-irc/konversation #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# mail-client/claws-mail net-im/pidgin net-irc/hexchat @@ -33,11 +33,11 @@ x11-plugins/pidgin-libnotify x11-plugins/purple-plugin_pack #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# net-p2p/ktorrent #in# -#?in(os_linux_pkglist, CDS, CDS+)!=# +#?in(os_linux_pkglist, CDS)!=# net-analyzer/fail2ban net-analyzer/iptraf-ng net-analyzer/macchanger @@ -50,63 +50,3 @@ net-ftp/tftp-hpa net-irc/weechat www-client/links #in# - -#?in(os_linux_pkglist, CLDX+)!=# -net-im/choqok -net-im/qutim -www-client/rekonq -#in# - -#?in(os_linux_pkglist, CLDX+)!=&&os_arch_machine==x86_64# -www-client/opera -#in# - -#?in(os_linux_pkglist, CLDX+)!=# -mail-client/geary -mail-client/sylpheed -mail-client/thunderbird -mail-client/trojita -net-analyzer/wireshark -net-ftp/filezilla -net-im/corebird -net-im/gajim -net-im/licq -net-im/psi -net-im/psimedia -net-im/skype -net-irc/kvirc -net-misc/dropbox -net-misc/modem-manager-gui -net-misc/yandex-disk -net-p2p/amule -#net-p2p/mldonkey -net-p2p/qbittorrent -net-p2p/rtorrent -net-p2p/transmission -net-voip/ekiga -net-voip/linphone -www-client/chromium -www-client/epiphany -www-client/firefox -www-client/midori -www-client/otter -www-client/seamonkey -www-client/uget -www-plugins/chrome-ublock -#in# - -#?in(os_linux_pkglist, CLDX+)!=&&os_arch_machine==x86_64# -www-plugins/chrome-binary-plugins -#in# - -#?in(os_linux_pkglist, CDS+)!=# -net-analyzer/bmon -net-analyzer/ettercap -net-analyzer/trafshow -net-analyzer/wireshark -net-misc/youtube-dl -net-p2p/mldonkey -www-client/elinks -www-client/lynx -www-client/w3m -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network index cd564af..49c0f1b 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=# +#?in(os_linux_pkglist, CLD, 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, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# net-misc/networkmanager net-misc/networkmanager-l2tp net-misc/networkmanager-openvpn @@ -18,11 +18,11 @@ net-misc/networkmanager-pptp net-misc/networkmanager-vpnc #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# gnome-extra/nm-applet #in# -#?in(os_linux_pkglist, CDS, CDS+)!=# +#?in(os_linux_pkglist, CDS)!=# net-dialup/ppp net-dialup/pptpd net-dns/ddclient @@ -33,17 +33,3 @@ net-misc/bridge-utils net-misc/ifenslave net-misc/wol #in# - -#?in(os_linux_pkglist, CLDX+)!=# -net-firewall/fwbuilder -net-misc/cmst -net-misc/connman -net-misc/connman-gtk -net-misc/wicd -#in# - -#?in(os_linux_pkglist, CDS+)!=# -net-firewall/firehol -net-firewall/sanewall -net-misc/tor -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox+ b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox+ deleted file mode 100644 index bee33c5..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox+ +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -x11-misc/compton -x11-misc/gmrun -#x11-misc/notification-daemon -x11-misc/obconf -x11-misc/pcmanfm -x11-misc/screengrab -x11-misc/tint2 -x11-misc/tintwizard -x11-misc/xxkb -x11-wm/openbox -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/plugins+ b/profiles/templates/3.2/6_ac_update_sync/world/create/plugins+ deleted file mode 100644 index e1957e2..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/plugins+ +++ /dev/null @@ -1,18 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -x11-plugins/pidgin-birthday-reminder -x11-plugins/pidgin-bot-sentry -x11-plugins/pidgin-encryption -x11-plugins/pidgin-extprefs -x11-plugins/pidgin-indicator -x11-plugins/pidgin-latex -x11-plugins/pidgin-led-notification -x11-plugins/pidgin-mbpurple -x11-plugins/pidgin-mpris -x11-plugins/pidgin-musictracker -x11-plugins/pidgin-opensteamworks -x11-plugins/pidgin-otr -x11-plugins/pidgin-rhythmbox -x11-plugins/pidgin-sipe -x11-plugins/pidgintex -x11-themes/pidgin-penguins-smileys diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/printer b/profiles/templates/3.2/6_ac_update_sync/world/create/printer index 4402642..ed799de 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/printer @@ -1,18 +1,14 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# net-print/cups net-print/hplip #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# media-gfx/xsane net-print/cnijfilter net-print/gutenprint net-print/hplip-plugin net-print/xerox-drivers #in# - -#?in(os_linux_pkglist, CLDX+)!=# -net-print/splix -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/science+ b/profiles/templates/3.2/6_ac_update_sync/world/create/science+ deleted file mode 100644 index 8b3bd8c..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/science+ +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CLDX+)!=# -sci-astronomy/celestia -#sci-geosciences/qgis -#sci-libs/openfoam -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server index c6e6e76..fb0f2a0 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server @@ -1,10 +1,10 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CDS, CSS, CDS+)!=# +#?in(os_linux_pkglist, CDS, CSS)!=# net-misc/dhcp #in# -#?in(os_linux_pkglist, CDS, CDS+)!=# +#?in(os_linux_pkglist, CDS)!=# dev-db/pg_top dev-db/postgresql mail-filter/clamsmtp @@ -17,32 +17,3 @@ net-proxy/squidguard sys-apps/calculate-server sys-apps/most #in# - -#?in(os_linux_pkglist, CLDX+)!=# -mail-mta/ssmtp -net-wireless/hostapd -#in# - -#?in(os_linux_pkglist, CDS+)!=# -dev-db/mariadb -dev-db/mongodb -dev-db/redis -dev-lang/php -dev-vcs/gitolite -mail-filter/procmail -mail-filter/spamassassin -mail-mta/postfix -net-dns/bind -net-fs/netatalk -net-fs/samba -net-ftp/proftpd -net-ftp/vsftpd -net-im/ejabberd -net-mail/dovecot -net-misc/asterisk -net-misc/hylafaxplus -net-misc/minidlna -net-proxy/squid -www-servers/lighttpd -www-servers/nginx -#in# 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 73749b0..88740c0 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 @@ -1,10 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLDX+, CDS+)!=# -dev-util/ccache -#in# - -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CSS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CSS, CMC)!=# app-arch/lbzip2 app-arch/pigz app-misc/tmux @@ -13,7 +9,7 @@ sys-fs/btrfs-progs sys-fs/reiserfsprogs #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CMC)!=# app-admin/logrotate app-admin/syslog-ng sys-apps/ethtool @@ -21,12 +17,12 @@ sys-apps/usbutils sys-process/vixie-cron #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC)!=# app-admin/sudo sys-apps/memtest86+ #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CMC)!=# app-admin/hddtemp app-cdr/cdrtools app-cdr/dvd+rw-tools @@ -48,15 +44,15 @@ sys-process/htop sys-process/lsof #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLDX+, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC)!=# sys-power/powertop #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS)!=# app-admin/testdisk #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC)!=# app-portage/gentoolkit-dev sys-apps/hdparm sys-apps/pcmciautils @@ -67,21 +63,21 @@ sys-power/cpupower sys-power/powernowd #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLDX+, CDS+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS)!=# app-editors/vim sys-apps/acl app-misc/mc #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# www-plugins/adobe-flash #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# sys-apps/keyexec #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# app-arch/p7zip app-arch/rar app-arch/unzip @@ -90,7 +86,7 @@ sys-apps/usb_modeswitch x11-libs/gksu #in# -#?in(os_linux_pkglist, CLD, CLDM, CMC, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CMC)!=# sys-power/upower-pm-utils #in# @@ -98,11 +94,11 @@ sys-power/upower-pm-utils net-misc/dhcp #in# -#?in(os_linux_pkglist, CLD, CLDX+)!=# +#?in(os_linux_pkglist, CLD)!=# sys-block/partitionmanager #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# app-pda/usbmuxd dev-python/gst-python sys-apps/mlocate @@ -111,11 +107,11 @@ sys-block/gparted x11-misc/wmctrl #in# -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# app-admin/hardinfo #in# -#?in(os_linux_pkglist, CDS, CDS+)!=# +#?in(os_linux_pkglist, CDS)!=# app-antivirus/clamav app-i18n/enca app-portage/ufed @@ -131,120 +127,3 @@ sys-block/tw_cli sys-fs/xfsdump sys-process/iotop #in# - -#?in(os_linux_pkglist, CLDX+)!=# -app-admin/conky -app-admin/keepassx -app-admin/sysstat -app-arch/arj -app-arch/unrar -app-benchmarks/bootchart2 -app-cdr/gcdemu -app-editors/emacs -app-editors/ghex -app-laptop/tpb -app-laptop/tp_smapi -app-misc/anki -app-misc/screen -app-misc/screenfetch -app-misc/workrave -app-mobilephone/wammu -app-portage/cpuinfo2cpuflags -app-text/texlive -app-text/xournal -dev-db/mysql-workbench -dev-db/sqlitebrowser -dev-lang/mono -dev-libs/libcgroup -dev-python/ipython -dev-qt/qt-creator -dev-util/android-tools -dev-util/geany -dev-util/geany-plugins -dev-util/gource -dev-util/strace -gnome-base/dconf-editor -mail-client/evolution -mail-client/mutt -mail-client/sylpheed -media-gfx/cellwriter -media-gfx/dispcalgui -media-radio/fldigi -media-sound/mac -media-sound/picard -net-analyzer/iftop -net-analyzer/mbrowse -net-misc/badvpn -net-misc/clipgrab -net-misc/putty -net-news/quiterss -sys-apps/gsmartcontrol -sys-auth/thinkfinger -sys-devel/prelink -sys-fs/cryptsetup -sys-power/apcupsd -x11-misc/devilspie -x11-misc/dmenu -x11-misc/gcolor2 -x11-misc/i3lock -x11-misc/i3status -x11-misc/idesk -x11-misc/idesk-extras -x11-misc/openbox-menu -x11-misc/oroborus-desklaunch -x11-misc/oroborus-deskmenu -x11-misc/oroborus-keylaunch -x11-misc/qlipper -x11-misc/slim -x11-misc/spacefm -x11-misc/sunflower -x11-misc/xrestop -x11-misc/xsnow -x11-misc/xvkbd -x11-terms/guake -x11-terms/rxvt-unicode -x11-terms/terminator -x11-terms/tilda -x11-themes/geany-themes -#in# - -#?in(os_linux_pkglist, CDS+)!=# -app-arch/dump -app-arch/pbzip2 -app-arch/pixz -app-arch/plzip -app-arch/pxz -app-arch/star -app-benchmarks/bootchart2 -app-benchmarks/stress -app-crypt/pgpdump -app-misc/screenfetch -app-portage/genlop -dev-vcs/bzr -dev-vcs/cvs -dev-vcs/mercurial -dev-vcs/subversion -net-analyzer/jnettop -net-analyzer/iftop -net-analyzer/mtr -net-analyzer/nethogs -net-analyzer/nload -net-analyzer/speedtest-cli -net-fs/davfs2 -net-misc/aria2 -net-misc/iaxmodem -net-misc/iperf -net-nds/shelldap -sys-apps/iucode_tool -sys-apps/lshw -sys-apps/setserial -sys-auth/nss_ldap -sys-auth/pam_ldap -sys-block/fio -sys-fs/avfs -sys-fs/cryptsetup -sys-fs/e4rat -sys-fs/nilfs-utils -sys-process/atop -sys-process/nmon -#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 b0995b5..a1a4a97 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, CLS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS)!=# net-wireless/wireless-tools net-wireless/wpa_supplicant sys-firmware/b43-firmware @@ -12,10 +12,6 @@ sys-firmware/ipw2200-firmware net-wireless/broadcom-sta #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# net-wireless/blueman #in# - -#?in(os_linux_pkglist, CLDX+)!=# -net-wireless/aircrack-ng -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ b/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ deleted file mode 100644 index 732246d..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ +++ /dev/null @@ -1,17 +0,0 @@ -# Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= - -x11-wm/afterstep -x11-wm/awesome -x11-wm/blackbox -x11-wm/dwm -x11-wm/enlightenment -x11-wm/enlightenment:0.17 -x11-wm/evilwm -x11-wm/fluxbox -x11-wm/fvwm -x11-wm/i3 -x11-wm/icewm -x11-wm/jwm -x11-wm/oroborus -x11-wm/twm -x11-wm/windowmaker diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/xfce b/profiles/templates/3.2/6_ac_update_sync/world/create/xfce index 3f244a2..09c51a8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/xfce @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDX)!=# app-arch/xarchiver dev-util/catfish media-sound/pavucontrol @@ -22,47 +22,3 @@ xfce-extra/xfce4-screenshooter xfce-extra/xfce4-taskmanager xfce-extra/xfce4-xkb-plugin #in# - -#?in(os_linux_pkglist, CLDX+)!=# -xfce-extra/xfce4-battery-plugin -xfce-extra/xfce4-cellmodem-plugin -xfce-extra/xfce4-cpufreq-plugin -xfce-extra/xfce4-cpugraph-plugin -xfce-extra/xfce4-dict -xfce-extra/xfce4-diskperf-plugin -xfce-extra/xfce4-embed-plugin -xfce-extra/xfce4-equake-plugin -xfce-extra/xfce4-eyes-plugin -xfce-extra/xfce4-fsguard-plugin -xfce-extra/xfce4-genmon-plugin -xfce-extra/xfce4-gvfs-mount -xfce-extra/xfce4-hdaps -xfce-extra/xfce4-kbdleds-plugin -xfce-extra/xfce4-linelight-plugin -xfce-extra/xfce4-mailwatch-plugin -xfce-extra/xfce4-messenger-plugin -xfce-extra/xfce4-mixer -xfce-extra/xfce4-modemlights-plugin -xfce-extra/xfce4-mount-plugin -xfce-extra/xfce4-mpc-plugin -xfce-extra/xfce4-netload-plugin -xfce-extra/xfce4-netspeed-plugin -xfce-extra/xfce4-notes-plugin -xfce-extra/xfce4-places-plugin -xfce-extra/xfce4-playercontrol-plugin -xfce-extra/xfce4-pulseaudio-plugin -xfce-extra/xfce4-sensors-plugin -xfce-extra/xfce4-smartbookmark-plugin -xfce-extra/xfce4-soundmenu-plugin -xfce-extra/xfce4-time-out-plugin -xfce-extra/xfce4-timer-plugin -xfce-extra/xfce4-verve-plugin -xfce-extra/xfce4-volumed -xfce-extra/xfce4-volumed-pulse -xfce-extra/xfce4-wavelan-plugin -xfce-extra/xfce4-weather-plugin -xfce-extra/xfce4-whiskermenu-plugin -xfce-extra/xfce4-windowck-plugin -xfce-extra/xfce4-wmdock-plugin -xfce-extra/xfdashboard -#in# 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 6cd17f5..f174618 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,13 +1,13 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS)!=# app-misc/xorg-meta #in# -#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=# +#?in(os_linux_pkglist, CLDM, CLDX)!=# x11-misc/lightdm #in# -#?in(os_linux_pkglist, CMC, CLDX+)!=# +#?in(os_linux_pkglist, CMC)!=# x11-base/xorg-server #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249 b/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249 new file mode 100644 index 0000000..0d02fd2 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/201-300/249 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<249 + +#-ini(overlay-distros.world,249)-# + +#?in(os_linux_pkglist, CLD)!=# +kde-apps/okular +#in#