From f712e84e7321f74e48b23a05bb99e658db2ae912 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 21 Oct 2021 15:30:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net-misc/wicd/.calculate_directory | 2 - .../1-migrate/net-misc/wicd/ip-down.sh | 1 - .../1-migrate/net-misc/wicd/ip-up.sh | 1 - .../net-misc/wicd/manager-settings.conf | 1 - .../net-misc/wicd/wired-settings.conf | 1 - .../net-misc/wicd/wireless-settings.conf | 1 - .../3.6/2_ac_install_merge/Depends/consolekit | 1 - .../Depends/gnome-icon-theme | 1 - .../3.6/2_ac_install_merge/Depends/ksmserver | 1 - .../app-portage/layman/.calculate_directory | 1 - .../app-portage/layman/layman.cfg | 3 - .../app-portage/layman/layman.make.conf | 1 - .../app-portage/porthole/.calculate_directory | 1 - .../app-portage/porthole/mainwindow.py.32 | 3 - .../app-portage/porthole/mainwindow.py.64 | 3 - .../app-portage/porthole/preferences.py.32 | 3 - .../app-portage/porthole/preferences.py.64 | 3 - .../display-manager-init/boot/display-manager | 2 +- .../boot/display-manager.del | 2 +- .../mail-client/trojita/.calculate_directory | 2 - .../trojita/org.kde.trojita.desktop | 4 - .../calculate/.calculate_directory | 2 - .../calculate/1024x576.cfg | 52 ------- .../calculate/1024x600.cfg | 52 ------- .../calculate/1024x768.cfg | 52 ------- .../calculate/1200x800.cfg | 52 ------- .../calculate/1280x1024.cfg | 52 ------- .../calculate/1280x720.cfg | 52 ------- .../calculate/1280x768.cfg | 52 ------- .../calculate/1280x800.cfg | 52 ------- .../calculate/1360x768.cfg | 52 ------- .../calculate/1366x768.cfg | 52 ------- .../calculate/1368x768.cfg | 52 ------- .../calculate/1400x1050.cfg | 52 ------- .../calculate/1440x900.cfg | 52 ------- .../calculate/1600x1200.cfg | 52 ------- .../calculate/1600x768.cfg | 52 ------- .../calculate/1600x900.cfg | 52 ------- .../calculate/1680x1050.cfg | 52 ------- .../calculate/1680x945.cfg | 52 ------- .../calculate/1920x1080.cfg | 52 ------- .../calculate/1920x1200.cfg | 52 ------- .../calculate/2048x1152.cfg | 52 ------- .../calculate/2560x1440.cfg | 52 ------- .../calculate/2560x1600.cfg | 52 ------- .../calculate/640x480.cfg | 52 ------- .../calculate/800x480.cfg | 52 ------- .../calculate/800x600.cfg | 52 ------- .../gtk-recordmydesktop/.calculate_directory | 2 - .../gtk-recordmydesktop.desktop | 4 - .../qt-recordmydesktop/.calculate_directory | 2 - .../qt-recordmydesktop.desktop | 4 - .../media-video/smtube/.calculate_directory | 2 - .../media-video/smtube/smtube.desktop | 4 - .../net-im/skype/.calculate_directory | 2 - .../2_ac_install_merge/net-im/skype/99skype | 3 - .../net-nds/portmap/.calculate_directory | 2 - .../portmap/default/.calculate_directory | 2 - .../net-nds/portmap/default/portmap | 1 - .../sys-apps/openrc/killprocs | 11 -- .../sys-auth/consolekit/.calculate_directory | 2 - .../consolekit/boot/.calculate_directory | 2 - .../sys-auth/consolekit/boot/consolekit | 1 - .../sys-auth/consolekit/consolekit | 13 -- .../dbus.system.d/.calculate_directory | 1 - .../consolekit/dbus.system.d/ConsoleKit.conf | 16 -- .../consolekit/rules.d/.calculate_directory | 1 - .../consolekit/rules.d/40-consolekit.rules | 11 -- .../rules.d/50-consolekit-multiuser.rules | 14 -- .../dracut/dracut.conf.d/50-calculate.conf | 3 - .../sys-process/cronie/cronie-migrate | 29 ---- .../vixie-cron/.calculate_directory | 2 - .../vixie-cron/default/.calculate_directory | 2 - .../sys-process/vixie-cron/default/vixie-cron | 1 - .../x11-apps/xinit/env.d/90xsession | 3 - .../x11-base/xorg-server/boot/xdm | 2 +- .../x11-base/xorg-server/boot/xdm.del | 2 +- .../3.6/2_ac_install_merge/x11-misc/sddm/sddm | 8 - .../gnome-icon-theme/.calculate_directory | 1 - .../remove-start-here/.calculate_directory | 1 - .../16x16/places/start-here.png | 1 - .../22x22/places/start-here.png | 1 - .../24x24/places/start-here.png | 1 - .../32x32/places/start-here.png | 1 - .../48x48/places/start-here.png | 1 - .../gnome-icon-theme/start-calculate.svg.old | 1 - .../gnome-icon-theme/start-here.svg | 1 - .../hicolor-icon-theme/.calculate_directory | 2 - .../hicolor-icon-theme/update-icons-cache | 6 - .../30-qupzilla/.calculate_directory | 2 - .../30-qupzilla/install/.calculate_directory | 1 - .../30-qupzilla/install/mimeapps.list | 33 ---- .../30-qupzilla/install/qupzilla.desktop | 6 - .../100-Browser/30-qupzilla/uninstall | 5 - .../99-browser/.calculate_directory | 2 +- .../zzz-Desktop/100-Browser/mimeapps.list | 2 +- .../110-Mail/40-trojita/.calculate_directory | 2 - .../40-trojita/install/.calculate_directory | 1 - .../110-Mail/40-trojita/install/mimeapps.list | 11 -- .../40-trojita/install/trojita-0.7.desktop | 6 - .../zzz-Desktop/110-Mail/40-trojita/uninstall | 5 - .../zzz-Desktop/110-Mail/mimeapps.list | 2 +- .../130-IM/30-qutim/.calculate_directory | 2 - .../30-qutim/install/.calculate_directory | 1 - .../130-IM/30-qutim/install/mimeapps.list | 5 - .../130-IM/30-qutim/install/qutim-0.3.desktop | 6 - .../zzz-Desktop/130-IM/30-qutim/uninstall | 5 - .../zzz-Desktop/130-IM/mimeapps.list | 2 +- .../70-mirage/.calculate_directory | 1 - .../70-mirage/install/.calculate_directory | 1 - .../70-mirage/install/mimeapps.list | 49 ------ .../70-mirage/install/mirage-0.9.desktop | 6 - .../320-ImageView/70-mirage/uninstall | 5 - .../zzz-Desktop/320-ImageView/mimeapps.list | 2 +- .../10-amarok/.calculate_directory | 1 - .../10-amarok/install/.calculate_directory | 1 - .../10-amarok/install/amarok-2.5.desktop | 9 -- .../10-amarok/install/mimeapps.list | 19 --- .../400-AudioPlayer/10-amarok/uninstall | 5 - .../zzz-Desktop/400-AudioPlayer/mimeapps.list | 2 +- .../30-gnome-mplayer/.calculate_directory | 1 - .../install/.calculate_directory | 1 - .../install/gnome-mplayer-1.0.desktop | 6 - .../30-gnome-mplayer/install/mimeapps.list | 27 ---- .../30-gnome-mplayer/uninstall | 5 - .../zzz-Desktop/500-VideoPlayer/mimeapps.list | 2 +- .../conf.d/display-manager | 20 +-- .../kdebase-startkde/.calculate_directory | 2 - .../kde-base/kdebase-startkde/startkde | 10 -- .../networkmanagement/.calculate_directory | 2 - .../plasma-applet-networkmanagement.desktop | 8 - .../lxqt-common/.calculate_directory | 2 - .../calculate/.calculate_directory | 1 - .../lxqt-common/calculate/arrow-right.svg | 1 - .../calculate/calendar-popup/left-arrow.svg | 1 - .../calculate/calendar-popup/right-arrow.svg | 1 - .../calculate/lxqt-notificationd.qss | 1 - .../calculate/lxqt-notificationd/cancel.svg | 1 - .../lxqt-common/calculate/lxqt-panel.qss | 1 - .../lxqt-common/calculate/lxqt-runner.qss | 1 - .../calculate/lxqt-runner/close.svg | 1 - .../calculate/lxqt-runner/down-arrow.svg | 1 - .../lxqt-common/calculate/mainmenu.svg | 1 - .../lxqt-common/calculate/preview.png | 1 - .../calculate/spacer-plugin/spacer-dots.svg | 1 - .../calculate/spacer-plugin/spacer-line.svg | 1 - .../lxqt-common/calculate/wallpaper.cfg | 2 - .../lxqt-common/calculate/wallpaper.jpg | 1 - .../sys-auth/consolekit/.calculate_directory | 1 - .../consolekit/rules.d/.calculate_directory | 1 - .../rules.d/50-laptop-suspend.rules | 12 -- .../upower-pm-utils/.calculate_directory | 2 - .../upower-pm-utils/80-upower-suspend.rules | 12 -- .../org.freedesktop.upower.policy | 32 ---- .../1-merge/x11-base/xorg-server/conf.d/xdm | 20 +-- .../libxfcegui4/.calculate_directory | 2 - .../libxfcegui4/xfce4-keyboard-shortcuts.xml | 15 -- .../2-root/dev-qt/qtgui-4.8/Trolltech.conf | 2 +- .../fbreader-0.12/FBReader/external.xml | 9 +- .../media-gfx/gqview-2.1/.calculate/ini.env | 7 - .../media-gfx/gqview-2.1/.calculate_directory | 1 - .../2-user/media-gfx/gqview-2.1/gqviewrc | 8 - .../kdenlive-0.7.8/.calculate_directory | 1 - .../2-user/media-video/kdenlive-0.7.8/ini.env | 7 - .../media-video/kdenlive-0.7.8/kdenliverc | 8 - .../smtube-15.5/.calculate_directory | 1 - .../2-user/media-video/smtube-15.5/ini.env | 7 - .../media-video/smtube-15.5/smtube2.ini | 4 - .../.calculate_directory | 1 - .../gajim/.calculate_directory | 1 - .../gajim-httpupload-20171025/gajim/config | 5 - .../net-im/gajim-httpupload-20171025/ini.env | 7 - .../pluginsconfig/.calculate_directory | 1 - .../pluginsconfig/httpupload | 2 - .../pluginsconfig/image | 2 - .../pluginsconfig/url_image_preview | 12 -- .../net-im/skype-2.2/.calculate/ini.env | 7 - .../net-im/skype-2.2/.calculate_directory | 1 - .../skype-2.2/Logs/.calculate_directory | 1 - .../extensions/uBlock0@raymondhill.net.xpi | 1 - .../qupzilla-1.8/.calculate_directory | 1 - .../www-client/qupzilla-1.8/bookmarks.json | 111 -------------- .../www-client/qupzilla-1.8/customlist.txt | 5 - .../2-user/www-client/qupzilla-1.8/ini.env | 6 - .../www-client/qupzilla-1.8/profiles.ini | 3 - .../www-client/qupzilla-1.8/settings.ini | 69 --------- .../Xfce-4.10/.config/xfce4/helpers.rc | 3 - .../xfce-perchannel-xml/xfce4-panel.xml | 6 - .../.calculate_directory | 1 - .../xfce4-statusnotifier-plugin/ini.env | 7 - .../xfce4-panel.xml | 7 - .../python-twitter/.calculate_directory | 1 - .../python-twitter/message_len.patch | 14 -- .../dev-python/sudsds/.calculate_directory | 1 - .../dev-python/sudsds/openssl-1.1.patch | 37 ----- .../games-action/oolite/.calculate_directory | 1 - .../oolite/oolite-1.86-mozilla_gcc6.patch | 141 ------------------ .../media-gfx/ufraw/.calculate_directory | 1 - .../media-gfx/ufraw/ufraw-fix_include.patch | 13 -- .../net-print/cnijfilter/.calculate_directory | 1 - .../net-print/cnijfilter/libpng15.patch | 14 -- .../3.6/6_ac_install_unmerge/clean_runlevels | 8 - .../warning/2019/20190927-check_vixie-cron | 16 -- 203 files changed, 27 insertions(+), 2497 deletions(-) delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf delete mode 100644 profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf delete mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/consolekit delete mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme delete mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.make.conf delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64 delete mode 100644 profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/org.kde.trojita.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype delete mode 100644 profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/50-consolekit-multiuser.rules delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/cronie-migrate delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/50-laptop-suspend.rules delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy delete mode 100644 profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-68/calculate.default/extensions/uBlock0@raymondhill.net.xpi delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-statusnotifier-plugin/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-statusnotifier-plugin/ini.env delete mode 100644 profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-extra/xfce4-statusnotifier-plugin/xfce4-panel.xml delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/message_len.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/games-action/oolite/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/games-action/oolite/oolite-1.86-mozilla_gcc6.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/ufraw/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/media-gfx/ufraw/ufraw-fix_include.patch delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/.calculate_directory delete mode 100644 profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/libpng15.patch delete mode 100644 profiles/templates/3.6/6_ac_update_sync/warning/2019/20190927-check_vixie-cron diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory deleted file mode 100644 index 0b008d72b..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/etc - diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh deleted file mode 100644 index cb18b3035..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/ip-down.sh mirror force diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh deleted file mode 100644 index 0e1c7bec8..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/ip-up.sh mirror force diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf deleted file mode 100644 index ada93e32f..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/manager-settings.conf mirror force diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf deleted file mode 100644 index 905b16174..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/wired-settings.conf mirror force diff --git a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf deleted file mode 100644 index c0ed9f76b..000000000 --- a/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/wireless-settings.conf mirror force diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit b/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit deleted file mode 100644 index 111f4a551..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,x11-misc/sddm,sys-auth/elogind diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme deleted file mode 100644 index eb38cb57e..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(x11-themes/gnome-icon-theme)!= merge=x11-themes/calculate-icon-theme,x11-themes/hicolor-icon-theme diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver b/profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver deleted file mode 100644 index c27ca6361..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(kde-base/ksmserver)!= merge=x11-apps/xinit diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory deleted file mode 100644 index 1480412a4..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate mergepkg()!= path=/etc diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg deleted file mode 100644 index 92b406e10..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate comment=# format=patch multiline -^#?(git_command\s*:\s*)/.*$ -\1/usr/libexec/calculate/cl-git-wrapper diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.make.conf b/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.make.conf deleted file mode 100644 index 5ed71c04e..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.make.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove name=make.conf path=/var/lib/layman diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory deleted file mode 100644 index 05cba41bf..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip mergepkg()!= diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 deleted file mode 100644 index 76184ddcf..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=patch path=/usr/lib/python2.7/site-packages/porthole name=mainwindow.py os_install_arch_machine!=x86_64 -sync \+= " --nospinner.* -sync += "" diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 deleted file mode 100644 index 003f48f5b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=patch path=/usr/lib64/python2.7/site-packages/porthole name=mainwindow.py os_install_arch_machine==x86_64 -sync \+= " --nospinner.* -sync += "" diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32 deleted file mode 100644 index d6d6d6e1c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32 +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=patch path=/usr/lib/python2.7/site-packages/porthole/config name=preferences.py os_install_arch_machine!=x86_64 -emerge --sync -cl-update --sync-only --no-progress diff --git a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64 deleted file mode 100644 index 080ffe003..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64 +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=patch path=/usr/lib64/python2.7/site-packages/porthole/config name=preferences.py os_install_arch_machine==x86_64 -emerge --sync -cl-update --sync-only --no-progress diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager index a6c59875b..c1895211d 100644 --- a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager +++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager @@ -1 +1 @@ -# Calculate link=/etc/init.d/display-manager symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd +# Calculate link=/etc/init.d/display-manager symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del index d83999dc5..3462ce23b 100644 --- a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del +++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del @@ -1 +1 @@ -# Calculate append=remove name=display-manager pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd +# Calculate append=remove name=display-manager pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd diff --git a/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory deleted file mode 100644 index 38b058bb0..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= append=skip - diff --git a/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/org.kde.trojita.desktop b/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/org.kde.trojita.desktop deleted file mode 100644 index e4b5e7434..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/org.kde.trojita.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde path=/usr/share/applications - -[Desktop Entry] -Categories=Qt;Network;Email; diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory deleted file mode 100644 index 4a43951d8..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate path=/etc/splash pkg(media-gfx/splash-themes-calculate)<14 - diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg deleted file mode 100644 index 16b6fcef6..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1024x576.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=24 -ty=20 -tw=978 -th=486 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1024x576.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=5 -text_y=556 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=512 -text_y=501 -text_align middle middle -#pkg# - -# system messages font size -text_size=11 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 571 0 576 #FFF596 -box silent 0 571 1024 576 #FFF596 - -#rectangle around text window in verbose mode -box 19 13 19 507 #8C9096 -box 19 13 1003 13 #8C9096 -box 1003 13 1003 507 #eef4ff -box 19 507 1003 507 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg deleted file mode 100644 index f095e71e5..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1024x600.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=24 -ty=21 -tw=978 -th=506 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1024x600.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=5 -text_y=579 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=512 -text_y=522 -text_align middle middle -#pkg# - -# system messages font size -text_size=11 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 595 0 600 #FFF596 -box silent 0 595 1024 600 #FFF596 - -#rectangle around text window in verbose mode -box 19 14 19 528 #8C9096 -box 19 14 1003 14 #8C9096 -box 1003 14 1003 528 #eef4ff -box 19 528 1003 528 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg deleted file mode 100644 index e12ff98cc..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1024x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=24 -ty=27 -tw=978 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1024x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=5 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=512 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1024 768 #FFF596 - -#rectangle around text window in verbose mode -box 19 18 19 676 #8C9096 -box 19 18 1003 18 #8C9096 -box 1003 18 1003 676 #eef4ff -box 19 676 1003 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg deleted file mode 100644 index bce4ac83c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1200x800.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=28 -ty=28 -tw=1146 -th=675 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1200x800.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=6 -text_y=772 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=600 -text_y=696 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 793 0 800 #FFF596 -box silent 0 793 1200 800 #FFF596 - -#rectangle around text window in verbose mode -box 22 19 22 705 #8C9096 -box 22 19 1176 19 #8C9096 -box 1176 19 1176 705 #eef4ff -box 22 705 1176 705 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg deleted file mode 100644 index 76bc79e23..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1280x1024.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=30 -ty=36 -tw=1223 -th=864 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1280x1024.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=6 -text_y=988 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=640 -text_y=891 -text_align middle middle -#pkg# - -# system messages font size -text_size=17 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1015 0 1024 #FFF596 -box silent 0 1015 1280 1024 #FFF596 - -#rectangle around text window in verbose mode -box 24 24 24 902 #8C9096 -box 24 24 1254 24 #8C9096 -box 1254 24 1254 902 #eef4ff -box 24 902 1254 902 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg deleted file mode 100644 index d1fe853e7..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1280x720.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=30 -ty=26 -tw=1223 -th=608 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1280x720.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=6 -text_y=695 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=640 -text_y=627 -text_align middle middle -#pkg# - -# system messages font size -text_size=12 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 714 0 720 #FFF596 -box silent 0 714 1280 720 #FFF596 - -#rectangle around text window in verbose mode -box 24 17 24 634 #8C9096 -box 24 17 1254 17 #8C9096 -box 1254 17 1254 634 #eef4ff -box 24 634 1254 634 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg deleted file mode 100644 index 53e4317ad..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1280x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=30 -ty=27 -tw=1223 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1280x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=6 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=640 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1280 768 #FFF596 - -#rectangle around text window in verbose mode -box 24 18 24 676 #8C9096 -box 24 18 1254 18 #8C9096 -box 1254 18 1254 676 #eef4ff -box 24 676 1254 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg deleted file mode 100644 index 8bda8a5f7..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1280x800.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=30 -ty=28 -tw=1223 -th=675 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1280x800.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=6 -text_y=772 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=640 -text_y=696 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 793 0 800 #FFF596 -box silent 0 793 1280 800 #FFF596 - -#rectangle around text window in verbose mode -box 24 19 24 705 #8C9096 -box 24 19 1254 19 #8C9096 -box 1254 19 1254 705 #eef4ff -box 24 705 1254 705 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg deleted file mode 100644 index 249f9e495..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1360x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=32 -ty=27 -tw=1299 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1360x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=7 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=680 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1360 768 #FFF596 - -#rectangle around text window in verbose mode -box 25 18 25 676 #8C9096 -box 25 18 1333 18 #8C9096 -box 1333 18 1333 676 #eef4ff -box 25 676 1333 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg deleted file mode 100644 index febbe0004..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1366x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=32 -ty=27 -tw=1305 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1366x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=7 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=683 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1366 768 #FFF596 - -#rectangle around text window in verbose mode -box 25 18 25 676 #8C9096 -box 25 18 1338 18 #8C9096 -box 1338 18 1338 676 #eef4ff -box 25 676 1338 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg deleted file mode 100644 index c06277d16..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1368x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=32 -ty=27 -tw=1307 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1368x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=7 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=684 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1368 768 #FFF596 - -#rectangle around text window in verbose mode -box 25 18 25 676 #8C9096 -box 25 18 1340 18 #8C9096 -box 1340 18 1340 676 #eef4ff -box 25 676 1340 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg deleted file mode 100644 index 9555af330..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1400x1050.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=33 -ty=37 -tw=1338 -th=886 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1400x1050.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=7 -text_y=1014 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=700 -text_y=914 -text_align middle middle -#pkg# - -# system messages font size -text_size=17 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1041 0 1050 #FFF596 -box silent 0 1041 1400 1050 #FFF596 - -#rectangle around text window in verbose mode -box 26 25 26 925 #8C9096 -box 26 25 1372 25 #8C9096 -box 1372 25 1372 925 #eef4ff -box 26 925 1372 925 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg deleted file mode 100644 index 75f9f56c1..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1440x900.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=34 -ty=32 -tw=1376 -th=760 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1440x900.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=7 -text_y=869 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=720 -text_y=783 -text_align middle middle -#pkg# - -# system messages font size -text_size=15 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 892 0 900 #FFF596 -box silent 0 892 1440 900 #FFF596 - -#rectangle around text window in verbose mode -box 27 21 27 793 #8C9096 -box 27 21 1411 21 #8C9096 -box 1411 21 1411 793 #eef4ff -box 27 793 1411 793 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg deleted file mode 100644 index dba45bf5c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1600x1200.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=38 -ty=43 -tw=1529 -th=1013 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1600x1200.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=8 -text_y=1158 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=800 -text_y=1044 -text_align middle middle -#pkg# - -# system messages font size -text_size=18 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1189 0 1200 #FFF596 -box silent 0 1189 1600 1200 #FFF596 - -#rectangle around text window in verbose mode -box 30 28 30 1057 #8C9096 -box 30 28 1568 28 #8C9096 -box 1568 28 1568 1057 #eef4ff -box 30 1057 1568 1057 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg deleted file mode 100644 index cd0be97ad..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1600x768.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=38 -ty=27 -tw=1529 -th=648 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1600x768.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=8 -text_y=741 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=800 -text_y=668 -text_align middle middle -#pkg# - -# system messages font size -text_size=13 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 761 0 768 #FFF596 -box silent 0 761 1600 768 #FFF596 - -#rectangle around text window in verbose mode -box 30 18 30 676 #8C9096 -box 30 18 1568 18 #8C9096 -box 1568 18 1568 676 #eef4ff -box 30 676 1568 676 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg deleted file mode 100644 index 3ef33bb75..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1600x900.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=38 -ty=32 -tw=1529 -th=760 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1600x900.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=8 -text_y=869 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=800 -text_y=783 -text_align middle middle -#pkg# - -# system messages font size -text_size=15 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 892 0 900 #FFF596 -box silent 0 892 1600 900 #FFF596 - -#rectangle around text window in verbose mode -box 30 21 30 793 #8C9096 -box 30 21 1568 21 #8C9096 -box 1568 21 1568 793 #eef4ff -box 30 793 1568 793 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg deleted file mode 100644 index 92869ed68..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1680x1050.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=40 -ty=37 -tw=1605 -th=886 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1680x1050.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=8 -text_y=1014 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=840 -text_y=914 -text_align middle middle -#pkg# - -# system messages font size -text_size=17 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1041 0 1050 #FFF596 -box silent 0 1041 1680 1050 #FFF596 - -#rectangle around text window in verbose mode -box 31 25 31 925 #8C9096 -box 31 25 1646 25 #8C9096 -box 1646 25 1646 925 #eef4ff -box 31 925 1646 925 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg deleted file mode 100644 index da478e110..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1680x945.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=40 -ty=34 -tw=1605 -th=798 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1680x945.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=8 -text_y=912 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=840 -text_y=823 -text_align middle middle -#pkg# - -# system messages font size -text_size=16 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 937 0 945 #FFF596 -box silent 0 937 1680 945 #FFF596 - -#rectangle around text window in verbose mode -box 31 22 31 833 #8C9096 -box 31 22 1646 22 #8C9096 -box 1646 22 1646 833 #eef4ff -box 31 833 1646 833 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg deleted file mode 100644 index 82fe8f043..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1920x1080.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=46 -ty=39 -tw=1835 -th=912 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1920x1080.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=10 -text_y=1043 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=960 -text_y=940 -text_align middle middle -#pkg# - -# system messages font size -text_size=17 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1070 0 1080 #FFF596 -box silent 0 1070 1920 1080 #FFF596 - -#rectangle around text window in verbose mode -box 36 26 36 952 #8C9096 -box 36 26 1882 26 #8C9096 -box 1882 26 1882 952 #eef4ff -box 36 952 1882 952 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg deleted file mode 100644 index 14360c80b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-1920x1200.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=46 -ty=43 -tw=1835 -th=1013 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-1920x1200.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=10 -text_y=1158 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=960 -text_y=1044 -text_align middle middle -#pkg# - -# system messages font size -text_size=18 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1189 0 1200 #FFF596 -box silent 0 1189 1920 1200 #FFF596 - -#rectangle around text window in verbose mode -box 36 28 36 1057 #8C9096 -box 36 28 1882 28 #8C9096 -box 1882 28 1882 1057 #eef4ff -box 36 1057 1882 1057 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg deleted file mode 100644 index 9f76208e2..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-2048x1152.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=49 -ty=41 -tw=1957 -th=972 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-2048x1152.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=10 -text_y=1112 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=1024 -text_y=1003 -text_align middle middle -#pkg# - -# system messages font size -text_size=18 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1142 0 1152 #FFF596 -box silent 0 1142 2048 1152 #FFF596 - -#rectangle around text window in verbose mode -box 38 27 38 1015 #8C9096 -box 38 27 2007 27 #8C9096 -box 2007 27 2007 1015 #eef4ff -box 38 1015 2007 1015 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg deleted file mode 100644 index ce1615dd7..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-2560x1440.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=61 -ty=52 -tw=2446 -th=1216 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-2560x1440.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=13 -text_y=1390 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=1280 -text_y=1253 -text_align middle middle -#pkg# - -# system messages font size -text_size=21 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1427 0 1440 #FFF596 -box silent 0 1427 2560 1440 #FFF596 - -#rectangle around text window in verbose mode -box 48 34 48 1269 #8C9096 -box 48 34 2509 34 #8C9096 -box 2509 34 2509 1269 #eef4ff -box 48 1269 2509 1269 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg deleted file mode 100644 index 59bc8b619..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-2560x1600.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=61 -ty=57 -tw=2446 -th=1351 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-2560x1600.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=13 -text_y=1545 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=1280 -text_y=1393 -text_align middle middle -#pkg# - -# system messages font size -text_size=23 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 1586 0 1600 #FFF596 -box silent 0 1586 2560 1600 #FFF596 - -#rectangle around text window in verbose mode -box 48 38 48 1410 #8C9096 -box 48 38 2509 38 #8C9096 -box 2509 38 2509 1410 #eef4ff -box 48 1410 2509 1410 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg deleted file mode 100644 index 584da9398..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-640x480.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=15 -ty=17 -tw=611 -th=405 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-640x480.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=3 -text_y=463 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=320 -text_y=418 -text_align middle middle -#pkg# - -# system messages font size -text_size=10 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 476 0 480 #FFF596 -box silent 0 476 640 480 #FFF596 - -#rectangle around text window in verbose mode -box 12 11 12 423 #8C9096 -box 12 11 627 11 #8C9096 -box 627 11 627 423 #eef4ff -box 12 423 627 423 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg deleted file mode 100644 index 56516f05d..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-800x480.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=19 -ty=17 -tw=764 -th=405 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-800x480.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=4 -text_y=463 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=400 -text_y=418 -text_align middle middle -#pkg# - -# system messages font size -text_size=10 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 476 0 480 #FFF596 -box silent 0 476 800 480 #FFF596 - -#rectangle around text window in verbose mode -box 15 11 15 423 #8C9096 -box 15 11 784 11 #8C9096 -box 784 11 784 423 #eef4ff -box 15 423 784 423 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg deleted file mode 100644 index c4be1fb23..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate -# Full path to background image JPG/PNG -# Image must has 240 colors, 16 need for fbcon. -pic=/etc/splash/calculate/images/verbose-800x600.jpg - -# transparent background color from fbcon. Usually is 0. -bgcolor=0 - -# Coordinates text window -#tx,ty - top left corner -#tw,th - width and height of text window, cann't be more screen resolution -tx=19 -ty=21 -tw=764 -th=506 - -# Full path to background image JPG/PNG silend mode. -# Image must has 256 colors. -silentpic=/etc/splash/calculate/images/silent-800x600.jpg - -# Coords of system messages -#?pkg(media-gfx/splashutils)<1.5.4.4-r2# -text_x=4 -text_y=579 -#pkg# -#?pkg(media-gfx/splashutils)>=1.5.4.4-r2# -text_x=400 -text_y=522 -text_align middle middle -#pkg# - -# system messages font size -text_size=11 - -# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa -text_color=0xffffff - -# Path to TTF font, for system messages. Path may be: -#- absolute (starts with '/') -#- relative THEME_DIR (example /etc/splash) -#- relative THEME_DIR/ (example: /etc/splash/default) -#text_font= - -#progress bar for silent mode -box silent inter 0 595 0 600 #FFF596 -box silent 0 595 800 600 #FFF596 - -#rectangle around text window in verbose mode -box 15 14 15 528 #8C9096 -box 15 14 784 14 #8C9096 -box 784 14 784 528 #eef4ff -box 15 528 784 528 #eef4ff diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory deleted file mode 100644 index 38b058bb0..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= append=skip - diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop deleted file mode 100644 index 439d1911f..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde path=/usr/share/applications - -[Desktop Entry] -Categories=Utility;Recorder; diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory deleted file mode 100644 index 38b058bb0..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= append=skip - diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop deleted file mode 100644 index 439d1911f..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde path=/usr/share/applications - -[Desktop Entry] -Categories=Utility;Recorder; diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory deleted file mode 100644 index 38b058bb0..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= append=skip - diff --git a/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop deleted file mode 100644 index 755d3a2d5..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde path=/usr/share/applications - -[Desktop Entry] -Categories=Network; diff --git a/profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory deleted file mode 100644 index 17df04ac9..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/etc name=env.d - diff --git a/profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype deleted file mode 100644 index dbaf71624..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate comment=# -# discard /opt/bin/skype, because prelink call segfault -PRELINK_PATH_MASK=/opt/bin/skype diff --git a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory deleted file mode 100644 index 637ef8656..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= name=etc - diff --git a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory deleted file mode 100644 index 0f7257bce..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate path=/etc/runlevels - diff --git a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap deleted file mode 100644 index dbeba8c52..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/etc/init.d/portmap symbolic ini(runlevels.portmap)!=on&&ini(runlevels.portmap,on)==||grep(/var/lib/calculate/-runlevels-portmap,/portmap)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs deleted file mode 100644 index 815b57e1c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs +++ /dev/null @@ -1,11 +0,0 @@ -# Calculate comment=# path=/etc/conf.d -# If you wish to pass any options to killall5 during shutdown, -# you should do so here. -killall5_opts="" - -#?pkg(media-gfx/splashutils)!=# -if pgrep -f fbsplashd &>/dev/null -then - killall5_opts="${killall5_opts} -o $(pgrep -f fbsplashd)" -fi -#pkg# diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory deleted file mode 100644 index 637ef8656..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= name=etc - diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory deleted file mode 100644 index 0f7257bce..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate path=/etc/runlevels - diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit deleted file mode 100644 index b6da82965..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/etc/init.d/consolekit symbolic ini(runlevels.consolekit)!=on&&ini(runlevels.consolekit,on)==||grep(/var/lib/calculate/-runlevels-consolekit,/consolekit)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit deleted file mode 100644 index d05ee5933..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate format=patch path=/etc/init.d -(start-stop-daemon --start -q \\ -\s*--pidfile /var/run/ConsoleKit/pid \\ -\s*--exec /usr/sbin/console-kit-daemon --\s*)( -\s*eend)\s+\$\? -\1 - res=$? - for waiting in {0..24} - do - [[ -f /var/run/ConsoleKit/pid ]] && break - sleep 0.1 - done -\2 $res diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory deleted file mode 100644 index 40c2ccf5a..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/etc/dbus-1 name=system.d ini(container.type)==desktop diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf deleted file mode 100644 index e11c6705e..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf +++ /dev/null @@ -1,16 +0,0 @@ -# Calculate dotall format=patch -<policy user="root".*?</policy> -<policy user="root"> - <allow own="org.freedesktop.ConsoleKit"/> - - <!-- Allow all methods on interfaces --> - <allow send_destination="org.freedesktop.ConsoleKit"/> - - <!-- Exclude Stop method --> - <deny send_destination="org.freedesktop.ConsoleKit" - send_interface="org.freedesktop.ConsoleKit.Manager" - send_member="Stop"/> - <deny send_destination="org.freedesktop.ConsoleKit" - send_interface="org.freedesktop.ConsoleKit.Manager" - send_member="CanStop"/> - </policy> diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory deleted file mode 100644 index f3e3a3a85..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/etc/polkit-1 chown=polkitd:root chmod=700 diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules deleted file mode 100644 index be07fbafb..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules +++ /dev/null @@ -1,11 +0,0 @@ -# Calculate comment=// ini(container.type)==desktop -/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ - -// Disable reboot, shudown, hybernate, suspend for user session -// - -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0 ) { - return polkit.Result.NO; - } -}); diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/50-consolekit-multiuser.rules b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/50-consolekit-multiuser.rules deleted file mode 100644 index faec79000..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/50-consolekit-multiuser.rules +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate comment=// ini(container.type)!=desktop -// Stop, restart, suspend, hybernate for multiple users -// - -polkit.addRule(function(action, subject) { - if ((action.id == "org.freedesktop.consolekit.system.stop-multiple-users" || - action.id == "org.freedesktop.consolekit.system.restart-multiple-users" || - action.id == "org.freedesktop.consolekit.system.suspend-multiple-users" || - action.id == "org.freedesktop.consolekit.system.hibernate-multiple-users" || - action.id == "org.freedesktop.consolekit.system.hybridsleep-multiple-users") && - subject.active) { - return polkit.Result.YES; - } -}); diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf index dffe4db13..dbe70d9fd 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf +++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf @@ -9,9 +9,6 @@ add_dracutmodules+=" plymouth" omit_dracutmodules+=" gensplash" #pkg# omit_dracutmodules+=" biosdevname" -#?pkg(media-gfx/splashutils)!=&&pkg(sys-boot/plymouth)==# -add_dracutmodules+=" gensplash" -#pkg# i18n_default_font="ter-v18n" add_drivers+=" sunrpc crc32c_generic " diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/cronie-migrate b/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/cronie-migrate deleted file mode 100644 index dfe6dd512..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/cronie-migrate +++ /dev/null @@ -1,29 +0,0 @@ -# Calculate run=/bin/bash pkg(sys-process/vixie-cron)!= -# Шаблон миграции с vixie-cron на cronie -# Если пользователь не менял основной файл /etc/crontab, то замещает его на -# новый от cronie -# Завершает процесс vixie-cron и запускает службу cronie - -origcrontab=/etc/crontab -cfgcrontab1=/etc/._cfg0000_crontab -cfgcrontab2=/etc/._cfg0001_crontab - -origmd5sum="b4c104b60b829977a8898a9102cf5a79" - -md5sumcrontab_current() { - grep -v -e "^#" -e "^$" /etc/crontab | sed -r 's/ +$//' | md5sum | awk '{ print $1 }' -} - -crontab_changed() { - [[ "$(md5sumcrontab_current)" != "$origmd5sum" ]] -} - -if [[ -f $cfgcrontab1 ]] && ! [[ -f $cfgcrontab2 ]] && ! crontab_changed -then - mv $cfgcrontab1 $origcrontab -elif crontab_changed -then - echo "Need to update /etc/crontab for correct work of cronie" 1>&2 - echo "and reconfigure cronie by command:" 1>&2 - echo " cl-core-setup --pkg-name cronie" 1>&2 -fi diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory deleted file mode 100644 index 637ef8656..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= name=etc - diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory deleted file mode 100644 index 0f7257bce..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate path=/etc/runlevels - diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron deleted file mode 100644 index da13a1853..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/etc/init.d/vixie-cron symbolic ini(runlevels.vixie-cron)!=on&&ini(runlevels.vixie-cron,on)==||grep(/var/lib/calculate/-runlevels-vixie-cron,vixie-cron)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession index 3386760ae..52779d0bf 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession +++ b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession @@ -21,9 +21,6 @@ XSESSION="Xfce4" #?pkg(mate-base/mate-session-manager)!=# XSESSION="Mate" #pkg# -#?pkg(kde-base/ksmserver)!=# -XSESSION="KDE-4" -#pkg# #?pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=# XSESSION="Plasma" #pkg# diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm index 7c0b7f939..c933c90fa 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm +++ b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm @@ -1 +1 @@ -# Calculate link=/etc/init.d/xdm symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd +# Calculate link=/etc/init.d/xdm symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del index e292e997a..30ce0b51c 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del +++ b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del @@ -1 +1 @@ -# Calculate append=remove name=xdm pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd +# Calculate append=remove name=xdm pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm deleted file mode 100644 index 406ddd1f7..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate pkg(sys-auth/consolekit)<1.0 -#%PAM-1.0 - -auth include system-login -account include system-login -password include system-login -session optional pam_ck_connector.so -session include system-login diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory deleted file mode 100644 index 208e64176..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r7 diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory deleted file mode 100644 index 2d6a81337..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/usr/share/icons name=gnome diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old deleted file mode 100644 index 2a0be871a..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/usr/share/icons/gnome/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg deleted file mode 100644 index 1a8afa1b2..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/usr/share/icons/gnome/scalable/apps link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory deleted file mode 100644 index b8e46dc04..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!=||mergepkg(x11-themes/gnome-icon-theme)!= append=skip - diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache b/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache deleted file mode 100644 index 6a2d8c1e1..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate exec=/bin/bash ac_install_disk==off - -echo "Updating icon cache" -for i in /usr/share/icons/*;do gtk-update-icon-cache -ft $i &>/dev/null; done - -true diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory deleted file mode 100644 index a01a00af7..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate append=skip merge(www-client/qupzilla)!= - diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory deleted file mode 100644 index e8f0eeb74..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(www-client/qupzilla)!= ini(desktop.browser)==||ini(desktop.browser)==qupzilla diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list deleted file mode 100644 index 78d1e3694..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list +++ /dev/null @@ -1,33 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.browser, qupzilla)-# - -[Added Associations] -application/rss+xml=qupzilla.desktop; -application/vnd.mozilla.xul+xml=qupzilla.desktop; -application/x-font-ttx=qupzilla.desktop; -application/xhtml+xml=qupzilla.desktop; -application/xml=qupzilla.desktop; -application/xml-external-parsed-entity=qupzilla.desktop; -application/xsd=qupzilla.desktop; -application/xslt+xml=qupzilla.desktop; -application/x-ufraw=qupzilla.desktop; -text/html=qupzilla.desktop; -x-scheme-handler/http=qupzilla.desktop; -x-scheme-handler/https=qupzilla.desktop; - -[Default Applications] -application/rss+xml=qupzilla.desktop; -application/vnd.mozilla.xul+xml=qupzilla.desktop; -application/x-font-ttx=qupzilla.desktop; -application/xhtml+xml=qupzilla.desktop; -application/xml=qupzilla.desktop; -application/xml-external-parsed-entity=qupzilla.desktop; -application/xsd=qupzilla.desktop; -application/xslt+xml=qupzilla.desktop; -application/x-ufraw=qupzilla.desktop; -text/html=qupzilla.desktop; -x-scheme-handler/http=qupzilla.desktop; -x-scheme-handler/https=qupzilla.desktop; diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop deleted file mode 100644 index bcf7ac4f8..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/qupzilla.desktop name=calculate-browser.desktop mirror pkg(www-client/qupzilla)>=1.8 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall deleted file mode 100644 index 14b89d92b..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/qupzilla)==&&ini(desktop.browser)==qupzilla - -[desktop] -!browser= -browser-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/99-browser/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/99-browser/.calculate_directory index 2f29e70af..4d0b5b9c6 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/99-browser/.calculate_directory +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/99-browser/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate append=skip mergepkg(www-client/firefox)!=||mergepkg(www-client/chromium)!=||mergepkg(www-client/qupzilla)!=||mergepkg(www-client/opera)!=||mergepkg(www-client/epiphany)!=||mergepkg(www-client/qutebrowser)!= +# Calculate append=skip mergepkg(www-client/firefox)!=||mergepkg(www-client/chromium)!=||mergepkg(www-client/opera)!=||mergepkg(www-client/epiphany)!=||mergepkg(www-client/qutebrowser)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list index 133ef5396..5738c678c 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.browser-removing)==on merge=www-client/firefox,www-client/chromium,www-client/qupzilla,www-client/opera,www-client/epiphany,www-client/qutebrowser +# Calculate format=compiz protected ini(desktop.browser-removing)==on merge=www-client/firefox,www-client/chromium,www-client/opera,www-client/epiphany,www-client/qutebrowser #-ini(desktop.browser-removing,)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory deleted file mode 100644 index 91c98296a..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate append=skip merge(mail-client/trojita)!= - diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory deleted file mode 100644 index 2aceec158..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(mail-client/trojita)!= ini(desktop.mail)==||ini(desktop.mail)==trojita diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list deleted file mode 100644 index 669d78e81..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list +++ /dev/null @@ -1,11 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.mail, trojita)-# - -[Added Associations] -x-scheme-handler/mailto=trojita.desktop; - -[Default Applications] -x-scheme-handler/mailto=trojita.desktop; diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop deleted file mode 100644 index 4e73bb749..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/trojita.desktop name=calculate-mail.desktop mirror pkg(mail-client/trojita)>=0.7 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall deleted file mode 100644 index 9a1c7f44d..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(mail-client/trojita)==&&ini(desktop.mail)==trojita - -[desktop] -!mail= -mail-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list index cb312d06f..5272c90c9 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.mail-removing)==on merge=kde-apps/kmail,mail-client/evolution,mail-client/claws-mail,mail-client/trojita +# Calculate format=compiz protected ini(desktop.mail-removing)==on merge=kde-apps/kmail,mail-client/evolution,mail-client/claws-mail #-ini(desktop.mail-removing,)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory deleted file mode 100644 index 34e16858c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate append=skip merge(net-im/qutim)!= - diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory deleted file mode 100644 index fa3af70d1..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(net-im/qutim)!= ini(desktop.im)==||ini(desktop.im)==qutim diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list deleted file mode 100644 index 134e6973e..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.im, qutim)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop deleted file mode 100644 index 7b54a29b5..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/qutim.desktop name=calculate-im.desktop mirror pkg(net-im/qutim)>=0.3 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall deleted file mode 100644 index 2173bab23..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(net-im/qutim)==&&ini(desktop.im)==qutim - -[desktop] -!im= -im-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list index 2ef118ec0..c4ecebd4e 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.im-removing)==on merge=kde-apps/kopete,kde-apps/ktp-contact-list,net-im/pidgine,net-im/qutim,net-im/gajim +# Calculate format=compiz protected ini(desktop.im-removing)==on merge=kde-apps/kopete,kde-apps/ktp-contact-list,net-im/pidgine,net-im/gajim #-ini(desktop.im-removing,)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory deleted file mode 100644 index 79d353681..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(media-gfx/mirage)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory deleted file mode 100644 index ca885f498..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(media-gfx/mirage)!= ini(desktop.imageview)==||ini(desktop.imageview)==mirage diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list deleted file mode 100644 index d8356eae3..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list +++ /dev/null @@ -1,49 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.imageview, mirage)-# - -[Added Associations] -image/bmp=mirage.desktop; -image/gif=mirage.desktop; -image/jpeg=mirage.desktop; -image/jpg=mirage.desktop; -image/png=mirage.desktop; -image/svg+xml=mirage.desktop; -image/svg+xml-compressed=mirage.desktop; -image/tiff=mirage.desktop; -image/vnd.microsoft.icon=mirage.desktop; -image/vnd.wap.wbmp=mirage.desktop; -image/x-gray=mirage.desktop; -image/x-pcx=mirage.desktop; -image/x-png=mirage.desktop; -image/x-portable-anymap=mirage.desktop; -image/x-portable-bitmap=mirage.desktop; -image/x-portable-graymap=mirage.desktop; -image/x-portable-pixmap=mirage.desktop; -image/x-tga=mirage.desktop; -image/x-xbitmap=mirage.desktop; -image/x-xpixmap=mirage.desktop; - -[Default Applications] -image/bmp=mirage.desktop; -image/gif=mirage.desktop; -image/jpeg=mirage.desktop; -image/jpg=mirage.desktop; -image/png=mirage.desktop; -image/svg+xml=mirage.desktop; -image/svg+xml-compressed=mirage.desktop; -image/tiff=mirage.desktop; -image/vnd.microsoft.icon=mirage.desktop; -image/vnd.wap.wbmp=mirage.desktop; -image/x-gray=mirage.desktop; -image/x-pcx=mirage.desktop; -image/x-png=mirage.desktop; -image/x-portable-anymap=mirage.desktop; -image/x-portable-bitmap=mirage.desktop; -image/x-portable-graymap=mirage.desktop; -image/x-portable-pixmap=mirage.desktop; -image/x-tga=mirage.desktop; -image/x-xbitmap=mirage.desktop; -image/x-xpixmap=mirage.desktop; diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop deleted file mode 100644 index cce009d89..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/mirage.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/mirage)>=0.9 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall deleted file mode 100644 index 66007784a..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/mirage)==&&ini(desktop.imageview)==mirage - -[desktop] -!imageview= -imageview-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list index afabf3483..fd193e4a3 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.imageview-removing)==on merge=kde-apps/gwenview,media-gfx/eom,media-gfx/eog,media-gfx/nomacs,media-gfx/geeqie,media-gfx/lximage-qt,media-gfx/mirage +# Calculate format=compiz protected ini(desktop.imageview-removing)==on merge=kde-apps/gwenview,media-gfx/eom,media-gfx/eog,media-gfx/nomacs,media-gfx/geeqie,media-gfx/lximage-qt #-ini(desktop.imageview-removing,)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory deleted file mode 100644 index 6c557eb13..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(media-sound/amarok)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory deleted file mode 100644 index 1edfd9e8c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(media-sound/amarok)!= ini(desktop.audioplayer)==||ini(desktop.audioplayer)==amarok diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop deleted file mode 100644 index dbadf0fc0..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/kde4/amarok.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/amarok)>=2.5 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= -#-exists(/usr/share/icons/hicolor/64x64/apps/amarok.png)-# -Icon=/usr/share/icons/hicolor/64x64/apps/amarok.png -#exists# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list deleted file mode 100644 index 9eee8caf1..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list +++ /dev/null @@ -1,19 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.audioplayer, amarok)-# - -[Added Associations] -audio/mp4=amarok.desktop; -audio/mpeg=amarok.desktop; -audio/x-flac=amarok.desktop; -audio/x-ms-wma=amarok.desktop; -audio/x-wav=amarok.desktop; - -[Default Applications] -audio/mp4=amarok.desktop; -audio/mpeg=amarok.desktop; -audio/x-flac=amarok.desktop; -audio/x-ms-wma=amarok.desktop; -audio/x-wav=amarok.desktop; diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall deleted file mode 100644 index 063b9bf97..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/amarok)==&&ini(desktop.audioplayer)==amarok - -[desktop] -!audioplayer= -audioplayer-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list index cb87388e6..2eb098429 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.audioplayer-removing)==on merge=media-sound/amarok,media-sound/rhythmbox,media-sound/audacious,media-sound/clementine +# Calculate format=compiz protected ini(desktop.audioplayer-removing)==on merge=media-sound/rhythmbox,media-sound/audacious,media-sound/clementine #-ini(desktop.audioplayer-removing,)-# diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory deleted file mode 100644 index 3ffc7d773..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(media-video/gnome-mplayer)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory deleted file mode 100644 index 42209195c..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip pkg(media-video/gnome-mplayer)!= ini(desktop.videoplayer)==||ini(desktop.videoplayer)==gnome-mplayer diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop deleted file mode 100644 index 3d596fc1f..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/gnome-mplayer.desktop name=calculate-videoplayer.desktop mirror pkg(media-video/gnome-mplayer)>=1.0 - -# Hide icon -[Desktop Entry] -NoDisplay=true -!MimeType= diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list deleted file mode 100644 index 6bb829ca8..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list +++ /dev/null @@ -1,27 +0,0 @@ -# Calculate format=compiz protected - -# Update info -#-ini(desktop.updating, on)-# -#-ini(desktop.videoplayer, gnome-mplayer)-# - -[Added Associations] -video/mp4=gnome-mplayer.desktop; -video/mpeg=gnome-mplayer.desktop; -video/ogg=gnome-mplayer.desktop; -video/quicktime=gnome-mplayer.desktop; -video/quicktime=gnome-mplayer.desktop; -video/vnd.mpegurl=gnome-mplayer.desktop; -video/x-m4v=gnome-mplayer.desktop; -video/x-msvideo=gnome-mplayer.desktop; -video/x-sgi-movie=gnome-mplayer.desktop; - -[Default Applications] -video/mp4=gnome-mplayer.desktop; -video/mpeg=gnome-mplayer.desktop; -video/ogg=gnome-mplayer.desktop; -video/quicktime=gnome-mplayer.desktop; -video/quicktime=gnome-mplayer.desktop; -video/vnd.mpegurl=gnome-mplayer.desktop; -video/x-m4v=gnome-mplayer.desktop; -video/x-msvideo=gnome-mplayer.desktop; -video/x-sgi-movie=gnome-mplayer.desktop; diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall deleted file mode 100644 index 4c65caaa4..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=ini.env ac_install_unmerge==on&&pkg(media-video/gnome-mplayer)==&&ini(desktop.videoplayer)==gnome-mplayer - -[desktop] -!videoplayer= -videoplayer-removing=on diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list index e513855ef..9e2f41670 100644 --- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list +++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.videoplayer-removing)==on merge=media-video/totem,media-video/smplayer,media-video/gnome-mplayer +# Calculate format=compiz protected ini(desktop.videoplayer-removing)==on merge=media-video/totem,media-video/smplayer #-ini(desktop.videoplayer-removing,)-# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager index 1f36badb4..45b8c8374 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager @@ -7,19 +7,15 @@ CHECKVT=7 DISPLAYMANAGER="sddm" START_STOP_ARGS= #pkg# -#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==# -DISPLAYMANAGER="kdm" -START_STOP_ARGS= -#pkg# -#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="lightdm" START_STOP_ARGS= #pkg# -#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# +#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="gdm" START_STOP_ARGS= #pkg# -#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="slim" START_STOP_ARGS= #pkg# @@ -43,19 +39,15 @@ START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT" DISPLAYMANAGER="sddm" START_STOP_ARGS= #pkg# -#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==# -DISPLAYMANAGER="kdm" -START_STOP_ARGS= -#pkg# -#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="lightdm" START_STOP_ARGS= #pkg# -#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# +#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="gdm" START_STOP_ARGS= #pkg# -#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="slim" START_STOP_ARGS= #pkg# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory deleted file mode 100644 index fce7db323..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/usr name=bin - diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde deleted file mode 100644 index 1c118e644..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde +++ /dev/null @@ -1,10 +0,0 @@ -# Calculate format=patch os_install_root_type==livecd -(test -n "\$KDEWM" && KDEWM="--windowmanager \$KDEWM") -(kwrapper4 ksmserver \$KDEWM\s*) -(if test \$\? -eq 255; then - # [^\n]* - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -) -\1 -ksmserver $KDEWM -\3 diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory deleted file mode 100644 index 0b008d72b..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/etc - diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop deleted file mode 100644 index b64bce00a..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate path=/usr/share/kde4/services format=kde - -[Desktop Entry] -#?os_install_net_conf==networkmanager# -X-KDE-Library=plasma_applet_networkmanagement -#!os_install_net_conf# -X-KDE-Library= -#os_install_net_conf# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory deleted file mode 100644 index be50354c4..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()=>0.10,0.11 append=skip - diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory deleted file mode 100644 index 7df9b1a63..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/usr/share/lxqt/themes diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg deleted file mode 100644 index 5ca40fdf4..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/arrow-right.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg deleted file mode 100644 index 79fe80d92..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/calendar-popup/left-arrow.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg deleted file mode 100644 index 40fa5870e..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/calendar-popup/right-arrow.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss deleted file mode 100644 index 7ff343e8d..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-notificationd.qss diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg deleted file mode 100644 index 300463eb5..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-notificationd/cancel.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss deleted file mode 100644 index c43c265a2..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-panel.qss diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss deleted file mode 100644 index dbd1cfa86..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner.qss diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg deleted file mode 100644 index 9086f4796..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner/close.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg deleted file mode 100644 index 37de435ed..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner/down-arrow.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg deleted file mode 100644 index dda31e49f..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate symbolic link=/usr/share/pixmaps/calculate/start-here-blue.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png deleted file mode 100644 index 1f27c9cf0..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png +++ /dev/null @@ -1 +0,0 @@ -# Calculate symbolic link=/usr/share/pixmaps/calculate/avatar-default.png diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg deleted file mode 100644 index 1cc3ae61c..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/spacer-plugin/spacer-dots.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg deleted file mode 100644 index 7f94b631c..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg +++ /dev/null @@ -1 +0,0 @@ -# Calculate link=/usr/share/lxqt/themes/dark/spacer-plugin/spacer-line.svg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg deleted file mode 100644 index a19157a2b..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg +++ /dev/null @@ -1,2 +0,0 @@ -wallpapers/size=1 -wallpapers/1/file=wallpaper.jpg diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg deleted file mode 100644 index e91c62d50..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg +++ /dev/null @@ -1 +0,0 @@ -# Calculate symbolic link=#-wallpaper(#-install.os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory deleted file mode 100644 index 754b26e82..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip mergepkg()!=&&pkg(sys-auth/polkit)!= diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/.calculate_directory deleted file mode 100644 index f3e3a3a85..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/etc/polkit-1 chown=polkitd:root chmod=700 diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/50-laptop-suspend.rules b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/50-laptop-suspend.rules deleted file mode 100644 index 27734c949..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/consolekit/rules.d/50-laptop-suspend.rules +++ /dev/null @@ -1,12 +0,0 @@ -# Calculate comment=// ini(container.type)!=desktop&&hr_laptop!= -// Suspend, hybernate for laptop -// - -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.consolekit.system.suspend-multiple-users" || - action.id == "org.freedesktop.consolekit.system.hibernate-multiple-users" || - action.id == "org.xfce.session.xfsm-shutdown-helper" || - action.id == "org.freedesktop.consolekit.system.hybridsleep-multiple-users") { - return polkit.Result.YES; - } -}); diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory deleted file mode 100644 index ba19aa238..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/usr/share/polkit-1 name=actions - diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules deleted file mode 100644 index daf2dd627..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules +++ /dev/null @@ -1,12 +0,0 @@ -# Calculate comment=// path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!= -/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ - -// Allow to use the suspend and the hibernation with block session in XFCE -// - -polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.upower\.(suspend|hibernate)$/.test(action.id) && - subject.local) { - return polkit.Result.YES; - } -}); diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy deleted file mode 100644 index dc51acfec..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy +++ /dev/null @@ -1,32 +0,0 @@ - - - - The DeviceKit-power Project - http://hal.freedesktop.org/docs/DeviceKit-power/ - system-suspend - - - Suspend the system - Authentication is required to suspend the system - - no - yes - - - - - Hibernate the system - Authentication is required to hibernate the system - - no -#?os_install_root_type==livecd# - no -#!os_install_root_type# - yes -#os_install_root_type# - - - - diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm index 1f36badb4..45b8c8374 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm @@ -7,19 +7,15 @@ CHECKVT=7 DISPLAYMANAGER="sddm" START_STOP_ARGS= #pkg# -#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==# -DISPLAYMANAGER="kdm" -START_STOP_ARGS= -#pkg# -#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="lightdm" START_STOP_ARGS= #pkg# -#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# +#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="gdm" START_STOP_ARGS= #pkg# -#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="slim" START_STOP_ARGS= #pkg# @@ -43,19 +39,15 @@ START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT" DISPLAYMANAGER="sddm" START_STOP_ARGS= #pkg# -#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==# -DISPLAYMANAGER="kdm" -START_STOP_ARGS= -#pkg# -#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="lightdm" START_STOP_ARGS= #pkg# -#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# +#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="gdm" START_STOP_ARGS= #pkg# -#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# +#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==# DISPLAYMANAGER="slim" START_STOP_ARGS= #pkg# diff --git a/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory deleted file mode 100644 index a81aad9d9..000000000 --- a/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg()!= path=/etc/xdg/xfce4/xfconf name=xfce-perchannel-xml - diff --git a/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index 6d3a61d05..000000000 --- a/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,15 +0,0 @@ -# Calculate format=xml_xfce - - - - - -#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42# - - - -#load# - - - - diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf index 598fb9774..8abbc6739 100644 --- a/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf +++ b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf @@ -4,7 +4,7 @@ font="Droid Sans,10,-1,5,50,0,0,0,0,0" #?pkg(gnome-base/gnome-core-libs)!=||pkg(xfce-base/xfdesktop)!=||pkg(mate-base/mate-settings-daemon)!=||pkg(kde-plasma/breeze-gtk)!=# style=GTK+ #pkg# -#?pkg(kde-base/kdelibs)!=&&pkg(kde-plasma/breeze)==# +#?pkg(kde-plasma/breeze)==# Palette\active=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #43ace8, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff Palette\inactive=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #94caef, #221f1e, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff Palette\disabled=#908d8b, #d6d2ce, #eceae9, #d7d3d1, #746f6c, #afa8a4, #a9a7a7, #ffffff, #969391, #f4f4f4, #cdc8c6, #454240, #cdc8c6, #908d8b, #97bcdf, #c1b6d7, #eeece9, #000000, #181513, #e7fdff diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml index ac56aec10..a27d98fd4 100644 --- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml +++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml @@ -1,4 +1,4 @@ -# Calculate pkg(xfce-base/exo)!=||pkg(www-client/qupzilla)!=||pkg(www-client/chromium)!=||pkg(www-client/firefox)!= +# Calculate pkg(xfce-base/exo)!=||pkg(www-client/chromium)!=||pkg(www-client/firefox)!= #?os_locale_language!=ru# @@ -9,13 +9,10 @@ #?pkg(xfce-base/exo)!=#