diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/.calculate_directory deleted file mode 100644 index 88568bdf6..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-calculate.remerge)<20190101 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180111 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180111 deleted file mode 100644 index 097a123a3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180111 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180116.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180116.1 deleted file mode 100644 index a1042a27b..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180116.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-admin/system-config-printer - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180118 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180118 deleted file mode 100644 index 326efdea3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180118 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/openrc - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180202 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180202 deleted file mode 100644 index a694300e9..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180202 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-fs/samba - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180213 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180213 deleted file mode 100644 index 2196c9f49..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180213 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-fs/eudev,sys-fs/udev,sys-fs/udev-init-scripts,sys-apps/openrc,sys-apps/calculate-utils,x11-misc/lightdm,x11-base/xorg-server,sys-auth/consolekit - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180214 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180214 deleted file mode 100644 index 8d675120d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180214 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-fs/eudev,sys-fs/udev - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.1 deleted file mode 100644 index f2bb97005..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-auth/elogind,media-gfx/splashutils,sys-kernel/dracut,net-dns/bind - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.2 deleted file mode 100644 index c69cab576..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.2 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-admin/syslog-ng - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180226 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180226 deleted file mode 100644 index 8d675120d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180226 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-fs/eudev,sys-fs/udev - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180301 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180301 deleted file mode 100644 index 880e41fd7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180301 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-misc/netifrc - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.1 deleted file mode 100644 index 097a123a3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.2 deleted file mode 100644 index 2c63067f1..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.2 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/kwin - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180307 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180307 deleted file mode 100644 index 0ee17faea..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180307 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-gfx/splashutils - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180327 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180327 deleted file mode 100644 index 2eea689fd..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180327 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=xfce-base/xfce4-session - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180409 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180409 deleted file mode 100644 index 43ae1f838..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180409 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-extra/cinnamon - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180412 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180412 deleted file mode 100644 index f5dbdc18e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180412 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-auth/pambase - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180507 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180507 deleted file mode 100644 index 1731eb971..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180507 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-irc/hexchat - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180514 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180514 deleted file mode 100644 index 872260220..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180514 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/calculate-utils,sys-boot/grub - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180530 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180530 deleted file mode 100644 index eb5ca4d12..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180530 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/systemsettings - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180601 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180601 deleted file mode 100644 index da1478fc0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180601 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/portage - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180608 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180608 deleted file mode 100644 index 736b45da8..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180608 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-libs/fontconfig - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180618 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180618 deleted file mode 100644 index 72acb9397..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180618 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-libs/openimageio - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180621 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180621 deleted file mode 100644 index b6cf8bdbb..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180621 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut,sys-fs/eudev,x11-drivers/nvidia-drivers,sys-boot/grub - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180625 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180625 deleted file mode 100644 index c30bc7dcc..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180625 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-gfx/splashutils,sys-kernel/calculate-sources - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180813 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180813 deleted file mode 100644 index dbdcc311c..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180813 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-auth/consolekit - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180830 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180830 deleted file mode 100644 index 8cea5f9fa..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180830 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-misc/lightdm-gtk-greeter - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180919 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180919 deleted file mode 100644 index 18ccc8650..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180919 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/gnome-themes-standard,sys-boot/grub - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180921 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180921 deleted file mode 100644 index e84253e1d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180921 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=dev-libs/openobex - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180925 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180925 deleted file mode 100644 index 0c18593cf..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180925 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/calculate-icon-theme - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180926 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180926 deleted file mode 100644 index 117f8cc93..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180926 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/plasma-workspace - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181003 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181003 deleted file mode 100644 index 097a123a3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181003 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181004.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181004.1 deleted file mode 100644 index 8cea5f9fa..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181004.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-misc/lightdm-gtk-greeter - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181005 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181005 deleted file mode 100644 index 8cea5f9fa..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181005 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-misc/lightdm-gtk-greeter - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181008 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181008 deleted file mode 100644 index 95ed561da..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181008 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-sound/alsa-utils - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009 deleted file mode 100644 index 6038b77f4..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/viber - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181010 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181010 deleted file mode 100644 index cfe958421..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181010 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/viber,sys-auth/pambase - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181011 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181011 deleted file mode 100644 index 097a123a3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181011 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181012 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181012 deleted file mode 100644 index 704e3f53c..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181012 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=xfce-extra/xfce4-power-manager - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181108 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181108 deleted file mode 100644 index 17d92533e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181108 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=lxqt-base/lxqt-runner,lxqt-base/lxqt-panel,lxqt-base/lxqt-session - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181109 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181109 deleted file mode 100644 index 5ce200856..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181109 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-admin/system-config-printer,x11-misc/qt5ct - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181110 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181110 deleted file mode 100644 index e07ac34bd..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181110 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-sound/pavucontrol-qt - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181114 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181114 deleted file mode 100644 index 097a123a3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181114 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181120 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181120 deleted file mode 100644 index 8f3f705eb..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181120 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-misc/qlipper - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181121 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181121 deleted file mode 100644 index 8e7ac7443..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181121 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-misc/compton - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181122 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181122 deleted file mode 100644 index 11ac85e39..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181122 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-gfx/gimp,app-office/libreoffice,media-video/smplayer - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181123 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181123 deleted file mode 100644 index 17196e340..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181123 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=www-client/firefox,www-client/chromium,www-client/qupzilla,www-client/opera,www-client/epiphany,www-client/qutebrowser - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181128 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181128 deleted file mode 100644 index 43f6f612e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181128 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=lxqt-base/liblxqt - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181129 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181129 deleted file mode 100644 index e8c6c2fd3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181129 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/gnome-themes-standard - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181130 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181130 deleted file mode 100644 index 1851e9480..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181130 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut,app-backup/rsnapshot - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181204 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181204 deleted file mode 100644 index 154a4a98b..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181204 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/plasma-pa,gnome-extra/cinnamon - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181205 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181205 deleted file mode 100644 index a694300e9..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181205 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-fs/samba - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181207 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181207 deleted file mode 100644 index a0eb215b5..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181207 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-sound/pulseaudio - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181210 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181210 deleted file mode 100644 index 43ae1f838..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181210 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-extra/cinnamon - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181218 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181218 deleted file mode 100644 index 98cd0c9e9..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181218 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-print/hplip - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181220 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181220 deleted file mode 100644 index cbc5c7039..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181220 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/gajim - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181224 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181224 deleted file mode 100644 index da1478fc0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181224 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/portage - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 deleted file mode 100644 index c5a2eb2b7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/sysvinit - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 deleted file mode 100644 index e821c1745..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/baselayout - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181228 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181228 deleted file mode 100644 index 6ff185ca1..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181228 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-libs/gtk+ - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory deleted file mode 100644 index 997969b3a..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-calculate.remerge)<20200101 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 deleted file mode 100644 index c5a2eb2b7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/sysvinit - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190214 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190214 deleted file mode 100644 index 95ed561da..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190214 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-sound/alsa-utils - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190318 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190318 deleted file mode 100644 index da1478fc0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190318 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/portage - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190325 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190325 deleted file mode 100644 index 9ad4848b8..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190325 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-boot/plymouth-calculate-plugin,dev-lang/python-exec - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190410 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190410 deleted file mode 100644 index cbc5c7039..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190410 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/gajim - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190411 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190411 deleted file mode 100644 index cbc5c7039..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190411 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/gajim - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190412 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190412 deleted file mode 100644 index 220dd6961..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190412 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/elementary-xfce-icon-theme - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190416.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190416.2 deleted file mode 100644 index 4745f356d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190416.2 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-editors/vim,sys-apps/openrc - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190425 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190425 deleted file mode 100644 index da7e1b97b..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190425 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-base/gnome-session - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190429.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190429.1 deleted file mode 100644 index 37e4e9f3b..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190429.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-base/xorg-server,net-im/riot-web - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190507 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190507 deleted file mode 100644 index d4ae7d392..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190507 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-libs/glibc - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190729 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190729 deleted file mode 100644 index f93768576..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190729 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-plugins/alsa-plugins - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190916 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190916 deleted file mode 100644 index 326efdea3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190916 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/openrc - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191004 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191004 deleted file mode 100644 index a93ec2ca0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191004 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/calculate-icon-theme,x11-themes/gnome-themes-standard - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191113 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191113 deleted file mode 100644 index e86a9fa99..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191113 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-misc/tmux - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191116 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191116 deleted file mode 100644 index bde269af1..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191116 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/calculate-utils - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191117 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191117 deleted file mode 100644 index 222b1ad86..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191117 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-print/cndrvcups-lb - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191118 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191118 deleted file mode 100644 index e8c6c2fd3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191118 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/gnome-themes-standard - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191119 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191119 deleted file mode 100644 index cbc5c7039..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191119 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/gajim - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191212 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191212 deleted file mode 100644 index fb33fe9c0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191212 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/calculate-utils,sys-apps/portage - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.1 deleted file mode 100644 index 2e2bfef81..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.1 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-shells/bash - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.3 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.3 deleted file mode 100644 index da1478fc0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.3 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/portage - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191219 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191219 deleted file mode 100644 index 59077e87f..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191219 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-video/mpv - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 deleted file mode 100644 index 117f8cc93..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/plasma-workspace - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191226 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191226 deleted file mode 100644 index 152ee8165..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191226 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=mail-client/evolution - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 deleted file mode 100644 index 586f46102..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-base/gnome-keyring - -[overlay-calculate] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/2018/.calculate_directory deleted file mode 100644 index e95a8a25e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-calculate.revision)<20190101 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180110-rebuild_gajim b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180110-rebuild_gajim deleted file mode 100644 index f1a6405dd..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180110-rebuild_gajim +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=net-im/gajim - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources deleted file mode 100644 index edfb10f39..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba cl_chroot_status==on ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=sys-kernel/calculate-sources - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd deleted file mode 100644 index fd55bf366..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd +++ /dev/null @@ -1,10 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -if grep sha512.25000.8DF15E2BA53446.*11CA3D4BA57AA.*F0CFAC740 /etc/grub.d/07_passwd &>/dev/null -then - rm -f /etc/grub.d/07_passwd -fi - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean deleted file mode 100644 index 2634a4aa2..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=dev-libs/klibc,net-dns/bind,net-im/ejabberd,net-mail/dovecot,mail-mta/postfix,x11-misc/shared-mime-info,net-fs/nfs-utils,media-libs/fontconfig,sys-fs/lvm2,net-nds/openldap,net-dialup/ppp - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean deleted file mode 100644 index 0c135f2c7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -# -env-update -for i in /usr/share/info/*.info*;do install-info --info-dir=/usr/share/info $i;done - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180126-rescan_mirrors b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180126-rescan_mirrors deleted file mode 100644 index e281a9b81..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180126-rescan_mirrors +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# name=calculate.env - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?cl_chroot_status==off# -[update] -!cl_update_binhost= diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel deleted file mode 100644 index dcbac467c..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -rm -f /etc/runlevels/boot/swapfiles /etc/runlevels/boot/tmpfiles.setup /etc/runlevels/sysinit/tmpfiles.dev - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken deleted file mode 100644 index b5ce851f3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-libs/libqtxdg,lxqt-base/lxqt-session - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall deleted file mode 100644 index 807437c90..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=net-firewall/shorewall - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon deleted file mode 100644 index f923888d3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=contents pkg(gnome-extra/cinnamon-settings-daemon)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -gnome-extra/cinnamon-settings-daemon,gnome-extra/cinnamon-translations /usr/share/locale/*/LC_MESSAGES/cinnamon-settings-daemon.mo diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils deleted file mode 100644 index 89301d5b3..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils +++ /dev/null @@ -1,30 +0,0 @@ -# Calculate format=diff path=/root/.porthole name=prefs.xml ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# ---- a/usr/lib/python2.7/site-packages/calculate/lib/cl_template.py -+++ b/usr/lib/python2.7/site-packages/calculate/lib/cl_template.py -@@ -3325,9 +3325,9 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction, - :param nameTemp: - :return: - """ -- terms = funArgv.replace(" ", "").split(",") -- funcPkg = terms[0] -- funcMerge = terms[0].partition(":")[0].partition("[")[0] -+ term = funArgv.replace(" ", "") -+ funcPkg = term -+ funcMerge = term.partition(":")[0].partition("[")[0] - replace = self.funcMerge(funcMerge, resS, localVars, "", nameTemp) - if replace == "1": - replace = self.funcPkg(funcPkg, resS, localVars, "", nameTemp) -@@ -3371,10 +3371,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction, - return True - return False - -- terms = funArgv.replace(" ", "").split(",") -- if len(terms) != 1: -- raise self.raiseErrTemplate() -- funcPkg = terms[0] -+ term = funArgv.replace(" ", "") -+ funcPkg = term - funcPkg, spl, uses = funcPkg.partition('[') - if uses: - uses = uses.rstrip("]") diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild deleted file mode 100644 index 16d6a39bd..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=net-firewall/shorewall - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180621-kernel_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180621-kernel_rebuild deleted file mode 100644 index 4533eebc8..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180621-kernel_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=sys-kernel/calculate-sources - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180701-firefox_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180701-firefox_rebuild deleted file mode 100644 index d87f64ce7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180701-firefox_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&in(os_linux_pkglist,builder)== rebuild=www-client/firefox - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180809-revdep_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180809-revdep_rebuild deleted file mode 100644 index ad13c993a..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180809-revdep_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&in(os_linux_pkglist,builder)== rebuild=app-cdr/cdrtools,net-fs/samba,sci-libs/blas-reference,sci-libs/lapack-reference,dev-python/numpy,sci-libs/hdf5 - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180911-protobuf-c_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180911-protobuf-c_rebuild deleted file mode 100644 index b5a6b0d7e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180911-protobuf-c_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-libs/protobuf-c - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180917-fix_postfix_calculate_server b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180917-fix_postfix_calculate_server deleted file mode 100644 index ded458892..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180917-fix_postfix_calculate_server +++ /dev/null @@ -1,10 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?pkg(mail-mta/postfix)!=&&grep(/var/lib/calculate/calculate.env,sr_mail_set\s+=\s+on)!=&&grep(/etc/postfix/main.cf,^smtpd_relay_restrictions)==# -echo >>/etc/postfix/main.cf -echo "smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination" >>/etc/postfix/main.cf -#pkg# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.3-rebuild_lightdm-gtk-greeter b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.3-rebuild_lightdm-gtk-greeter deleted file mode 100644 index 1feb86f4d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.3-rebuild_lightdm-gtk-greeter +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-misc/lightdm-gtk-greeter - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.4-rebuild_thunar b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.4-rebuild_thunar deleted file mode 100644 index e31f4b2dd..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180919.4-rebuild_thunar +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=xfce-base/thunar - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181002-rebuild_cinnamon b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181002-rebuild_cinnamon deleted file mode 100644 index fe7b79138..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181002-rebuild_cinnamon +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=gnome-extra/cinnamon - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181030-rebuild_lightdm b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181030-rebuild_lightdm deleted file mode 100644 index 10fa260b8..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181030-rebuild_lightdm +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=x11-misc/lightdm - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181102-rebuild_libfm-qt b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181102-rebuild_libfm-qt deleted file mode 100644 index 6045945b1..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181102-rebuild_libfm-qt +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&cl_chroot_status==on rebuild=x11-libs/libfm-qt - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181108-fix-network b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181108-fix-network deleted file mode 100644 index 2c656e705..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181108-fix-network +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=contents pkg(sys-apps/openrc)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/baselayout /etc/hosts -!sys-apps/openrc /etc/conf.d/hostname -!sys-apps/openrc /etc/conf.d/net diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181109-fix_shadow b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181109-fix_shadow deleted file mode 100644 index 2779bf957..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181109-fix_shadow +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=contents pkg(sys-apps/shadow)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/shadow /etc/subuid -!sys-apps/shadow /etc/subgid diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181113-mate_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181113-mate_rebuild deleted file mode 100644 index 80c41eaa2..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181113-mate_rebuild +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#&&in(os_linux_pkglist,builder)== rebuild=mate-extra/mate-power-manager,mate-base/mate-applets - - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181114-gnat_gpl b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181114-gnat_gpl deleted file mode 100644 index a6066aab5..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181114-gnat_gpl +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=app-accessibility/freetts,app-doc/gnucash-docs,app-editors/mousepad,app-xemacs/ebuild-mode,dev-games/tiled,dev-python/asciimatics,dev-python/Kivy,dev-python/pyfiglet,dev-python/virtualenv-clone,media-libs/libextractor,media-libs/libifp,media-libs/libopenshot,media-libs/opencv,media-plugins/kodi-audiodecoder-timidity,media-plugins/kodi-pvr-stalker,media-plugins/kodi-screensaver-rsxs,media-video/ffmpeg,sci-chemistry/autodock_vina,sci-chemistry/clashlist,sci-chemistry/cluster,sci-chemistry/dssp,sci-chemistry/eden,sci-chemistry/gperiodic,sci-chemistry/moldy,sci-chemistry/mustang,sci-chemistry/probe,sci-chemistry/reduce,sys-apps/calculate-utils,x11-drivers/xf86-input-elographics,x11-drivers/xf86-input-joystick,x11-drivers/xf86-input-mtrack,x11-drivers/xf86-input-vmmouse,x11-drivers/xf86-input-void,x11-drivers/xf86-video-ast,x11-drivers/xf86-video-dummy,x11-drivers/xf86-video-fbdev,x11-drivers/xf86-video-glint,x11-drivers/xf86-video-mga,x11-drivers/xf86-video-r128,x11-drivers/xf86-video-siliconmotion,x11-drivers/xf86-video-tdfx,x11-drivers/xf86-video-voodoo,x11-libs/xforms,x11-misc/gtkdialog,x11-themes/gtk-engines-xfce,xfce-base/xfce4-appfinder,xfce-base/xfce4-session,xfce-base/xfce4-settings,xfce-extra/thunar-shares-plugin,xfce-extra/transd,xfce-extra/tumbler,xfce-extra/xfce4-battery-plugin,xfce-extra/xfce4-cellmodem-plugin,xfce-extra/xfce4-clipman-plugin,xfce-extra/xfce4-composite-editor,xfce-extra/xfce4-cpufreq-plugin,xfce-extra/xfce4-cpugraph-plugin,xfce-extra/xfce4-dict,xfce-extra/xfce4-embed-plugin,xfce-extra/xfce4-eyes-plugin,xfce-extra/xfce4-hdaps,xfce-extra/xfce4-kbdleds-plugin,xfce-extra/xfce4-linelight-plugin,xfce-extra/xfce4-mailwatch-plugin,xfce-extra/xfce4-messenger-plugin,xfce-extra/xfce4-modemlights-plugin,xfce-extra/xfce4-mount-plugin,xfce-extra/xfce4-notifyd,xfce-extra/xfce4-pulseaudio-plugin,xfce-extra/xfce4-screenshooter,xfce-extra/xfce4-sensors-plugin,xfce-extra/xfce4-taskmanager,xfce-extra/xfce4-verve-plugin,xfce-extra/xfce4-weather-plugin,xfce-extra/xfce4-whiskermenu-plugin - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181121-fix_portage b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181121-fix_portage deleted file mode 100644 index 15dc9b81d..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181121-fix_portage +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=contents pkg(sys-apps/portage)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/portage /etc/portage/sets/custom diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181122-rebuild_adwaita_qt b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181122-rebuild_adwaita_qt deleted file mode 100644 index ae43df749..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181122-rebuild_adwaita_qt +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-themes/adwaita-qt - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181123-rebuild_for_cldl b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181123-rebuild_for_cldl deleted file mode 100644 index 4419dc3de..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181123-rebuild_for_cldl +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=lxqt-base/lxqt-session,x11-misc/qlipper,x11-misc/pcmanfm-qt - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181128-rebuild_pcmanfm_qtwidgets b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181128-rebuild_pcmanfm_qtwidgets deleted file mode 100644 index 384c98881..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181128-rebuild_pcmanfm_qtwidgets +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-misc/pcmanfm-qt,dev-qt/qtwidgets - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181129-fix_mate_applet b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181129-fix_mate_applet deleted file mode 100644 index e50c9a7be..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181129-fix_mate_applet +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?pkg(mate-base/mate-applets)!=# -rm -f /var/db/pkg/mate-base/mate-applets-1.20*/autodeps -#pkg# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.1-drop_fastlogin b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.1-drop_fastlogin deleted file mode 100644 index 9a62e3c0f..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.1-drop_fastlogin +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?pkg(x11-misc/pcmanfm-qt)!=# -rm -f /var/lib/calculate/calculate-desktop/fastlogin/* -#pkg# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.2-rebuild_openbox b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.2-rebuild_openbox deleted file mode 100644 index 8072548a4..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181206.2-rebuild_openbox +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-wm/openbox - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181207-rebuild_libqtxdg b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181207-rebuild_libqtxdg deleted file mode 100644 index 211646e56..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181207-rebuild_libqtxdg +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-libs/libqtxdg - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.1-rebuild_calculate-sources b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.1-rebuild_calculate-sources deleted file mode 100644 index 547aaba3e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.1-rebuild_calculate-sources +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<20181210&&os_arch_machine==i686 rebuild=sys-kernel/calculate-sources - -[overlay-calculate] -revision = 20181210 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.2-drop_fastlogin b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.2-drop_fastlogin deleted file mode 100644 index 8137234e0..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181210.2-drop_fastlogin +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?pkg(gnome-extra/cinnamon)!=# -rm -f /var/lib/calculate/calculate-desktop/fastlogin/* -#pkg# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181224-custom_migrate b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181224-custom_migrate deleted file mode 100644 index 02c6b0343..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181224-custom_migrate +++ /dev/null @@ -1,32 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?cl_chroot_status==on# -# удаление сетов custom -rm -f /etc/portage/sets/custom -sed -ri '/^@custom$/d' /var/lib/portage/world_sets -#!cl_chroot_status# -# переименование custom в custom.[short] -for fn in /etc/portage/package.{unmask,use,keywords}/custom -do - [[ -f $fn ]] && mv $fn $(dirname $fn)/zz-autounmask -done - -makeconf="/etc/portage/make.conf/custom" -[[ -f $makeconf ]] && mv $makeconf $makeconf.#-case(lower,os_linux_shortname)-# -#?load(empty,/etc/portage/sets/custom)==# -rm -f /etc/portage/sets/custom -#!load# -mv /etc/portage/sets/custom /etc/portage/sets/custom.#-case(lower,os_linux_shortname)-# -#load# - -#?load(empty,/etc/portage/package.mask/custom)==# -rm -f /etc/portage/package.mask/custom -#!load# -mv /etc/portage/package.mask/custom /etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-# -#load# -sed -ri '/^@custom$/d' /var/lib/portage/world_sets -#cl_chroot_status# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181227-rebuild_lxqtpanel b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181227-rebuild_lxqtpanel deleted file mode 100644 index 3cbdca483..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2018/20181227-rebuild_lxqtpanel +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=lxqt-base/lxqt-panel - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/2019/.calculate_directory deleted file mode 100644 index 2f8154f25..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-calculate.revision)<20200101 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190109-rebuild_mate-themes-meta b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190109-rebuild_mate-themes-meta deleted file mode 100644 index 8fb861d37..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190109-rebuild_mate-themes-meta +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-themes/mate-themes-meta - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190218-rebuild_dracut_plymouth b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190218-rebuild_dracut_plymouth deleted file mode 100644 index 2cc0c4d0e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190218-rebuild_dracut_plymouth +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=sys-kernel/dracut,sys-boot/plymouth,sys-boot/plymouth-openrc-plugin,sys-boot/plymouth-calculate-plugin - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190221-rebuild_dracut_plymouth b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190221-rebuild_dracut_plymouth deleted file mode 100644 index 4a1cbf5c6..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190221-rebuild_dracut_plymouth +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=sys-kernel/dracut,sys-boot/plymouth-calculate-plugin,sys-boot/plymouth - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190312-change_CLDXS_profile b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190312-change_CLDXS_profile deleted file mode 100644 index 268d20e62..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190312-change_CLDXS_profile +++ /dev/null @@ -1,17 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -for arch in x86 amd64 -do - for pname in CLDXE - do - if [[ "$(readlink -f /etc/portage/make.profile)" =~ .*distros/profiles/${pname}/${arch}$ ]] - then - rm /etc/portage/make.profile - ln -sf ../../var/lib/layman/distros/profiles/CLDXS/${arch} /etc/portage/make.profile - fi - done -done - -exit 0 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190318-fix_portage b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190318-fix_portage deleted file mode 100644 index 30382375e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190318-fix_portage +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=contents pkg(sys-apps/portage)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/portage /var/lib/portage/world_sets diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190321-rebuild_mate-notification-daemon b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190321-rebuild_mate-notification-daemon deleted file mode 100644 index 035899590..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190321-rebuild_mate-notification-daemon +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-misc/mate-notification-daemon - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190507-locale-gen b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190507-locale-gen deleted file mode 100644 index 866638956..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190507-locale-gen +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?cl_chroot_status==on# -/usr/sbin/locale-gen -#cl_chroot_status# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190613-rebuild_libclc b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190613-rebuild_libclc deleted file mode 100644 index ab8602a1c..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190613-rebuild_libclc +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-libs/libclc - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190627-rebuild_lightdm b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190627-rebuild_lightdm deleted file mode 100644 index afeb0270a..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190627-rebuild_lightdm +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-misc/lightdm - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190705-rebuild_wxgtk b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190705-rebuild_wxgtk deleted file mode 100644 index faa98d973..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20190705-rebuild_wxgtk +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-libs/wxGTK - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191003-fix_calculate-browser b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191003-fix_calculate-browser deleted file mode 100644 index 8ea96e9eb..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191003-fix_calculate-browser +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate format=contents pkg(sys-apps/portage)!= ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# merge=www-client/firefox,www-client/chromium,www-client/qupzilla,www-client/opera,www-client/epiphany,www-client/qutebrowser - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!www-client/firefox /usr/share/applications/calculate-browser.desktop -!www-client/chromium /usr/share/applications/calculate-browser.desktop -!www-client/qupzilla /usr/share/applications/calculate-browser.desktop -!www-client/opera /usr/share/applications/calculate-browser.desktop -!www-client/epiphany /usr/share/applications/calculate-browser.desktop -!www-client/qutebrowser /usr/share/applications/calculate-browser.desktop diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191004-drop_fastlogin b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191004-drop_fastlogin deleted file mode 100644 index f37bd4f8e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191004-drop_fastlogin +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?pkg(media-sound/volumeicon)!=# -rm -f /var/lib/calculate/calculate-desktop/fastlogin/* -#pkg# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191015-rebuild_sudsds b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191015-rebuild_sudsds deleted file mode 100644 index bfb96fd8b..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191015-rebuild_sudsds +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-python/sudsds - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191016-rebuild_dslib b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191016-rebuild_dslib deleted file mode 100644 index 62610d00e..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191016-rebuild_dslib +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=net-libs/dslib - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191021-rebuild_myspell-ru b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191021-rebuild_myspell-ru deleted file mode 100644 index b55680041..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191021-rebuild_myspell-ru +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# rebuild=app-dicts/myspell-ru - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.0-fix_lib64 b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.0-fix_lib64 deleted file mode 100644 index bbf8d7519..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.0-fix_lib64 +++ /dev/null @@ -1,23 +0,0 @@ -# Calculate format=contents os_arch_machine==x86_64 ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# merge=app-office/libreoffice - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/portage /usr/lib/python2.7/site-packages/portage/dbapi/bintree.py -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/draw.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/base.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/calc.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/impress.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/startcenter.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/math.desktop -!app-office/libreoffice /usr/lib/libreoffice/share/xdg/writer.desktop -!net-print/cndrvcups-common-lb /usr/lib/libc3pl.so -!net-print/cndrvcups-lb /usr/lib/libcnlbcm.so -!sys-auth/pam_keystore /lib/security/pam_keystore.so -!sys-auth/pam_update /lib/security/pam_update.so -!sys-auth/pam_client /lib/security/pam_client.so -sys-auth/pam_keystore /lib64/security/pam_keystore.so -sys-auth/pam_update /lib64/security/pam_update.so -sys-auth/pam_client /lib64/security/pam_client.so -!sys-auth/consolekit /usr/lib/ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0 -!sys-auth/consolekit /usr/lib/ConsoleKit/run-session.d -!sys-auth/consolekit /usr/lib/ConsoleKit -sys-auth/consolekit /usr/lib64/ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.1-create_unsymlink-lib b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.1-create_unsymlink-lib deleted file mode 100644 index 82ba085e6..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.1-create_unsymlink-lib +++ /dev/null @@ -1,830 +0,0 @@ -# Calculate path=/usr/local/sbin name=unsymlink-lib format=raw chmod=0755 os_arch_machine==x86_64 ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# -#!/usr/bin/python -# -*- coding: utf-8 -*- - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -from __future__ import print_function - -import argparse -import errno -import os -import os.path -import pickle -import subprocess -import sys - - -if sys.hexversion >= 0x03050000: - decode_error_handler = 'backslashreplace' -else: - decode_error_handler = 'replace' - - -def decode(value): - if isinstance(value, bytes): - return value.decode('utf-8', errors=decode_error_handler) - return value - - -def _log(template, *args, **kwargs): - print( - template.format(*(decode(arg) for arg in args)), - **kwargs - ) - - -def log(template, *args, **kwargs): - kwargs['file'] = sys.stderr - _log(template, *args, **kwargs) - - -def out(template, *args, **kwargs): - kwargs['file'] = sys.stdout - _log(template, *args, **kwargs) - - -def verify_initial(prefix): - if not os.path.isdir(prefix): - log('{} does not exist! wtf?!', prefix) - raise SystemExit(1) - - lib64 = os.path.join(prefix, b'lib64') - lib32 = os.path.join(prefix, b'lib32') - lib = os.path.join(prefix, b'lib') - lib_new = os.path.join(prefix, b'lib.new') - - if not os.path.isdir(lib64) and not os.path.islink(lib64): - log('{} needs to exist as a real directory!', lib64) - raise SystemExit(1) - - if os.path.islink(lib32): - log('{} is a symlink! was the migration done already?', lib32) - raise SystemExit(1) - - if os.path.isdir(lib) and not os.path.islink(lib): - log('{} is a real directory! was the migration done already?', lib) - raise SystemExit(1) - - if os.path.islink(lib) and os.readlink(lib) == b'lib.new': - log('{} is a symlink to lib.new! did you want to --finish?', lib) - raise SystemExit(1) - - if not os.path.islink(lib) or os.readlink(lib) not in (b'lib64', - os.path.join(prefix, b'lib64')): - log('{} needs to be a symlink to lib64!', lib) - raise SystemExit(1) - - if os.path.isdir(lib_new): - log('{} exists! do you need to remove failed migration?', lib_new) - raise SystemExit(1) - - -def verify_migrated(prefix): - if not os.path.isdir(prefix): - log('{} does not exist! wtf?!', prefix) - raise SystemExit(1) - - lib64 = os.path.join(prefix, b'lib64') - lib32 = os.path.join(prefix, b'lib32') - lib = os.path.join(prefix, b'lib') - lib_new = os.path.join(prefix, b'lib.new') - - if not os.path.isdir(lib64) and not os.path.islink(lib64): - log('{} needs to exist as a real directory!', lib64) - raise SystemExit(1) - - if os.path.islink(lib32): - log('{} is a symlink! was the migration finished already?', lib32) - raise SystemExit(1) - - if os.path.isdir(lib) and not os.path.islink(lib): - log('{} is a real directory! was the migration finished already?', lib) - raise SystemExit(1) - - if os.path.islink(lib) and os.readlink(lib) == b'lib64': - log('{} is a symlink to lib64! did the migration succeed?', lib) - raise SystemExit(1) - - if not os.path.isdir(lib_new): - log('{} does not exist! did you --migrate?', lib_new) - raise SystemExit(1) - - if not os.path.islink(lib) or os.readlink(lib) != b'lib.new': - log('{} needs to be a symlink to lib.new!', lib) - raise SystemExit(1) - - -def path_get_leftmost_dirs(paths): - for p in paths: - if b'/' in p: - yield p.split(b'/', 1)[0] - - -def path_get_top_files(paths): - for p in paths: - if b'/' not in p: - yield p - - -def path_starts_with(haystack, needle): - return (haystack + b'/').startswith(needle + b'/') - - -def nonfatal_remove(fp): - try: - os.remove(fp) - except OSError as e: - if e.errno in (errno.EISDIR, errno.EPERM): - try: - os.rmdir(fp) - except OSError as e: - if e.errno not in (errno.EEXIST, errno.ENOTEMPTY): - log('Removing {} failed: {}', fp, e) - return False - elif e.errno == errno.ENOENT: - pass - else: - log('Removing {} failed: {}', fp, e) - return False - return True - - -def is_lib64_candidate(path): - if os.path.splitext(path)[1] in (b'.a', b'.chk', b'.la', b'.so'): - return True - if b'.so.' in path: - return True - if path in (b'locale',): - return True - return False - - -class MigrationState(object): - __slots__ = ('eroot', 'excludes', 'includes', 'prefixes', 'has_lib32') - - def __init__(self, eroot): - self.eroot = eroot - - def analyze(self, usr_merge, real_prefixes): - from portage import create_trees, _encodings - - log('Analyzing files installed into lib & lib64...') - - # use all canonical prefixes that could be present in vdb - usr_prefix = os.path.join(self.eroot, b'usr') - subprefixes = ( - self.eroot, - usr_prefix, - os.path.join(usr_prefix, b'local'), - ) - - lib_path = dict((prefix, os.path.join(prefix, b'lib/')) for prefix in subprefixes) - lib32_path = dict((prefix, os.path.join(prefix, b'lib32/')) for prefix in subprefixes) - lib64_path = dict((prefix, os.path.join(prefix, b'lib64/')) for prefix in subprefixes) - - lib_paths = dict((prefix, set()) for prefix in subprefixes) - lib32_paths = dict((prefix, set()) for prefix in subprefixes) - lib64_paths = dict((prefix, set()) for prefix in subprefixes) - - trees = create_trees(config_root=self.eroot) - vardb = trees[max(trees)]['vartree'].dbapi - missing_files = set() - for p in vardb.cpv_all(): - for f, details in vardb._dblink(p).getcontents().items(): - # skip directories; we will get them implicitly via - # files contained within them - if details[0] == 'dir': - continue - f = os.path.join(self.eroot, f.encode(_encodings['fs']).lstrip(b'/')) - for prefix in subprefixes: - for libdir, dest in ( - (lib_path[prefix], lib_paths[prefix]), - (lib32_path[prefix], lib32_paths[prefix]), - (lib64_path[prefix], lib64_paths[prefix])): - if f.startswith(libdir): - if not os.path.exists(f): - missing_files.add(f) - else: - dest.add(f[len(libdir):]) - break - - pure_lib = {} - mixed_lib = {} - - if usr_merge: - log('') - log('/usr merge detected!') - - # figure out which of the prefixes is real, and the other - # will be the aliased one - real_prefix = real_prefixes[0] - if real_prefix == usr_prefix: - alias_prefix = self.eroot - else: - alias_prefix = usr_prefix - - for d in lib_paths, lib32_paths, lib64_paths: - d[real_prefix].update(d[alias_prefix]) - del d[alias_prefix] - - self.prefixes = real_prefixes - self.excludes = {} - self.includes = {} - - for prefix in real_prefixes: - log('') - lib_paths[prefix] = frozenset(lib_paths[prefix]) - lib32_paths[prefix] = frozenset(lib32_paths[prefix]) - lib64_paths[prefix] = frozenset(lib64_paths[prefix]) - - lib_prefixes = frozenset(path_get_leftmost_dirs(lib_paths[prefix])) - lib64_prefixes = frozenset(path_get_leftmost_dirs(lib64_paths[prefix])) - lib_files = frozenset(path_get_top_files(lib_paths[prefix])) - lib64_files = frozenset(path_get_top_files(lib64_paths[prefix])) - - pure_lib = lib_prefixes - lib64_prefixes - mixed_lib = lib_prefixes & lib64_prefixes - - unowned_files = (frozenset(os.listdir(lib_path[prefix])) - - lib_prefixes - lib64_prefixes - - lib_files - lib64_files) - # library symlinks go to lib64 - lib64_unowned = frozenset(x for x in unowned_files - if is_lib64_candidate(x)) - lib_unowned = unowned_files - lib64_unowned - - log('directories that will be moved to {}:', lib_path[prefix]) - for p in sorted(pure_lib): - log('\t{}', p) - log('\t(+ {} files)', len(lib_files)) - log('') - - log('directories whose contents will be split between {} and {}:', lib_path[prefix], lib64_path[prefix]) - for p in sorted(mixed_lib): - log('\t{}', p) - - if lib_unowned: - log('') - log('orphan dirs/files (not owned by any package) that will be moved to {}:', lib_path[prefix]) - for p in sorted(lib_unowned): - log('\t{}', p) - - if lib64_unowned: - log('') - log('orphan dirs/files (not owned by any package) that will be kept in {}:', lib64_path[prefix]) - for p in sorted(lib64_unowned): - log('\t{}', p) - - # prepare the exclude lists - excludes = set() - for p in lib64_paths[prefix]: - for tp in mixed_lib: - if path_starts_with(p, tp): - excludes.add(p) - break - - # store the data - self.includes[prefix] = lib_prefixes | lib_files | lib_unowned - self.excludes[prefix] = frozenset(excludes) - - # verify for conflicts - # 1. lib/foo and lib32/foo are going to be the same path now - conflicts = ((lib_paths[prefix] | lib_unowned) - & lib32_paths[prefix]) - if conflicts: - log('') - log('') - log('One or more files are both in {} and {}, making the conversion impossible.', - lib_path[prefix], lib32_path[prefix]) - log('') - for p in sorted(conflicts): - log('\t{}', p) - log('') - log('Please report a bug at https://bugs.gentoo.org/, and do not proceed with') - log('the migration until a proper solution is found.') - raise SystemExit(1) - - # 2. lib/foo and lib64/foo were *supposed* to be the same path now - # so we must not have two entries for each - conflicts = lib_paths[prefix] & lib64_paths[prefix] - if conflicts: - log('') - log('') - log('One or more files are both in {} and {}, making the conversion impossible.', - lib_path[prefix], lib64_path[prefix]) - log('') - for p in sorted(conflicts): - log('\t{}', p) - log('') - log('Please report a bug at https://bugs.gentoo.org/, and do not proceed with') - log('the migration until a proper solution is found.') - raise SystemExit(1) - - self.has_lib32 = any(lib32_paths.values()) - if not self.has_lib32: - log('') - log('') - log('Warning: no lib32 paths found. This is fine if you are running no-multilib,') - log('otherwise this is suspicious.') - - if missing_files: - log('') - log('') - log('One or more package files are missing from the system. This should not') - log('cause any problems but you may want to reinstall the packages') - log('that installed them. The missing files are:') - log('') - for p in sorted(missing_files): - log('\t{}', p) - - # check for mountpoints, they are trouble - mountpoints_staying = set() - mountpoints_moved = set() - for prefix in real_prefixes: - for topdir in (lib64_path[prefix], lib32_path[prefix]): - if not os.path.isdir(topdir): - continue - for dirpath, dirnames, _ in os.walk(topdir): - for d in list(dirnames): - dp = os.path.join(dirpath, d) - if os.path.ismount(dp): - for x in self.includes[prefix]: - if path_starts_with(os.path.relpath(dp, topdir), x): - mountpoints_moved.add(dp) - break - else: - mountpoints_staying.add(dp) - # do not process filesystems recursively - dirnames.remove(d) - - if mountpoints_staying: - log('') - log('') - log('One or more mount points (or subvolumes) detected:') - log('') - for p in sorted(mountpoints_staying): - log('\t{}', p) - log('') - log('Those directories do not need to be migrated. However, please make sure') - log('that fstab is using correct (real) paths to them.') - - if mountpoints_moved: - log('') - log('') - log('One or more mount points (or subvolumes) need to be migrated:') - log('') - for p in sorted(mountpoints_moved): - log('\t{}', p) - log('') - log('Migration of mount points is not supported by the script. The files from them') - log('will be copied to the parent filesystem. The --finish subcommand will fail') - log('at their removal, and will have to be resumed after unmounting the cleansed') - log('file system (or removing the subvolume).') - log('') - log('If this is acceptable, you can proceed with the migration. Alternatively, you') - log('can unmount the relevant file systems, rerun the script (including rerunning') - log('--analyze!) and migrate them manually afterwards.') - - def migrate(self, pretend): - try: - # create the lib.new directories - for prefix in self.prefixes: - lib = os.path.join(prefix, b'lib') - lib32 = os.path.join(prefix, b'lib32') - lib_new = os.path.join(prefix, b'lib.new') - - if pretend: - out('mkdir {}', lib_new) - else: - os.mkdir(lib_new) - - if not pretend: - log('[{}] & {} -> {} ...', lib32, lib, lib_new) - cmd = [b'cp', b'-a', b'--reflink=auto', b'--'] - if os.path.isdir(lib32): - cmd.append(os.path.join(lib32, b'.')) - # include all appropriate pure&mixed lib stuff - for p in self.includes[prefix]: - assert not p.endswith(b'/') - cmd.append(os.path.join(lib, p)) - cmd.append(lib_new + b'/') - - if len(cmd) > 5: - if pretend: - out('{}', b' '.join(cmd)) - else: - p = subprocess.Popen(cmd) - if p.wait() != 0: - log('Non-successful return from cp: {}', p.returncode) - raise SystemExit(1) - - if self.excludes[prefix]: - if not pretend: - log('Remove extraneous files from {} ...', lib_new) - # remove excluded stuff - for p in self.excludes[prefix]: - fp = os.path.join(lib_new, p) - if pretend: - out('rm {}', fp) - out('rmdir -p --ignore-fail-on-non-empty {}', - os.path.dirname(fp)) - else: - os.unlink(fp) - - try: - os.removedirs(os.path.dirname(fp)) - except OSError as e: - if e.errno not in (errno.ENOTEMPTY, errno.EEXIST): - raise - except: - log('') - log('An error occurred while creating the "lib.new" directories. Please look') - log('at the backtrace following this message for details. The partially') - log('created "lib.new" directories were left in case they were useful') - log('for determining the cause of the error.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --force-rollback action to reset your system.') - log('') - raise - - try: - for prefix in self.prefixes: - lib = os.path.join(prefix, b'lib') - lib_tmp = os.path.join(prefix, b'lib.tmp') - if pretend: - out('ln -s -f -T lib.new {}', lib) - else: - log('Updating: {} -> lib.new ...', lib) - os.symlink(b'lib.new', lib_tmp) - os.rename(lib_tmp, lib) - except: - log('') - log('An error occurred while updating the "lib" symlinks. Please look') - log('at the backtrace following this message for details. The "lib.new"') - log('directories are complete now but the "lib" symlinks were not updated') - log('completely.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --force-rollback action to reset your system.') - log('') - raise - - def rollback(self, pretend): - try: - # restore the old 'lib' symlink - for prefix in self.prefixes: - lib = os.path.join(prefix, b'lib') - lib_tmp = os.path.join(prefix, b'lib.tmp') - if pretend: - out('ln -s -f -T lib64 {}', lib) - else: - log('Updating: {} -> lib64 ...', lib) - os.symlink(b'lib64', lib_tmp) - os.rename(lib_tmp, lib) - except: - log('') - log('An error occurred while restoring the "lib" symlinks. Please look') - log('at the backtrace following this message for details.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --force-rollback action to reset your system.') - log('') - raise - - # clean up lib.new - rm_failed = False - for prefix in self.prefixes: - lib_new = os.path.join(prefix, b'lib.new') - if pretend: - out('rm -rf -- {}', lib_new) - else: - log('Removing: {} ...', lib_new) - p = subprocess.Popen([b'rm', b'-rf', b'--', lib_new]) - if p.wait() != 0: - rm_failed = True - - if rm_failed: - log('') - log('An error occurred while cleaning up the "lib.new" directories.') - log('This message should be preceded by error messages from the "rm"') - log('utility.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --force-rollback action to reset your system.') - - def finish(self, pretend, resume): - try: - # replace the 'lib' symlink with the directory - for prefix in self.prefixes: - lib = os.path.join(prefix, b'lib') - lib_new = os.path.join(prefix, b'lib.new') - # if lib.new does not exist, it has probably been moved already - if resume and not os.path.isdir(lib_new): - continue - if pretend: - out('mv -f -T {} {}', lib_new, lib) - else: - log('Renaming {} -> {} ...', lib_new, lib) - # when resuming, 'lib' may have already been unlinked - # (otherwise, it must exist at this point) - if not resume or os.path.islink(lib): - os.unlink(lib) - os.rename(lib_new, lib) - except: - log('') - log('An error occurred while replacing the "lib" symlinks. Please look') - log('at the backtrace following this message for details.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --resume-finish action.') - log('') - raise - - try: - # replace 'lib32' with a symlink - for prefix in self.prefixes: - lib32 = os.path.join(prefix, b'lib32') - if os.path.isdir(lib32): - # if resuming, it can be a symlink already - if resume and os.path.islink(lib32): - continue - if pretend: - out('rm -rf -- {}', lib32) - out('ln -s lib {}', lib32) - else: - log('Removing: {} ...', lib32) - if subprocess.Popen([b'rm', b'-rf', b'--', lib32]).wait() != 0: - if os.path.ismount(lib32): - log('') - log('Note: lib32 looks like a mount point. If all files inside it were removed') - log('successfully, you need to unmount it to let the program replace it with') - log('a symlink. You can remove or reuse the backing device afterwards.') - raise SystemExit(1) - else: - log('Updating: {} -> lib ...', lib32) - try: - os.symlink(b'lib', lib32) - except OSError: - log('Symlinking failed for {}, please symlink it manually to lib.') - except: - log('') - log('An error occurred while replacing the "lib32" directories. Please look') - log('at the backtrace following this message for details.') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --resume-finish action.') - log('') - raise - - # clean up extraneous files from 'lib64' - rm_failed = False - for prefix in self.prefixes: - lib64 = os.path.join(prefix, b'lib64') - if not pretend: - out('Removing stale files from {} ...', lib64) - for p in self.includes[prefix]: - if not os.path.islink(os.path.join(lib64, p)): - for root, dirs, files in os.walk(os.path.join(lib64, p), topdown=False): - for f in dirs + files: - fp = os.path.join(root, f) - rp = os.path.relpath(fp, lib64) - if rp not in self.excludes[prefix]: - if pretend: - out('rm -d {}', fp) - elif not nonfatal_remove(fp): - rm_failed = True - if pretend: - out('rm -d {}', os.path.join(lib64, p)) - elif not nonfatal_remove(os.path.join(lib64, p)): - rm_failed = True - - if rm_failed: - log('') - log('An error occurred while cleaning up the "lib64" directories.') - log('This message should be preceded by more specific error messages') - log('(interspersed with progress output).') - log('') - log('Once you determine the cause of the error and would like to retry,') - log('please use the --resume-finish action.') - raise SystemExit(1) - - def save_state(self): - with open(os.path.expanduser(b'~/.symlink_lib_migrate.state'), 'wb') as f: - pickle.dump((self.eroot, self.prefixes, self.excludes, self.includes, self.has_lib32), f) - - def load_state(self): - try: - with open(os.path.expanduser(b'~/.symlink_lib_migrate.state'), 'rb') as f: - orig_eroot, self.prefixes, self.excludes, self.includes, self.has_lib32 = pickle.load(f) - except (OSError, IOError) as e: - if e.errno == errno.ENOENT: - return False - else: - raise - - if self.eroot != orig_eroot: - raise NotImplementedError('The same --root must be passed to each invocation') - - return True - - def clear_state(self): - try: - os.unlink(os.path.expanduser(b'~/.symlink_lib_migrate.state')) - except OSError as e: - if e.errno != errno.ENOENT: - raise - - -def argv_to_bytes(arg): - if sys.hexversion >= 0x03000000: - return os.fsencode(arg) - else: - return arg - - -def main(): - if sys.hexversion < 0x03000000: - reload(sys) - sys.setdefaultencoding('utf-8') - os.umask(0o22) - - argp = argparse.ArgumentParser() - argp.add_argument('-p', '--pretend', action='store_true', - help='Do not modify the system, only print what would happen') - argp.add_argument('--root', default='/', - help='Run on specified alternate system root') - g = argp.add_argument_group('basic actions') - g.add_argument('--analyze', action='store_const', dest='action', - const='analyze', help='Analyze and store system state', - default='analyze') - g.add_argument('--migrate', action='store_const', dest='action', - const='migrate', help='Perform the migration') - g.add_argument('--rollback', action='store_const', dest='action', - const='rollback', help='Revert the migration (after --migrate)') - g.add_argument('--finish', action='store_const', dest='action', - const='finish', help='Finish the migration (clean up)') - g = argp.add_argument_group('recovery actions (NO SAFETY!)') - g.add_argument('--force-rollback', action='store_const', dest='action', - const='rollback_force', - help='Force resetting "lib" symlink and removing "lib.new"') - g.add_argument('--resume-finish', action='store_const', dest='action', - const='finish_resume', - help='Attempt resuming failed --finish action') - g = argp.add_argument_group('expert options') - g.add_argument('-P', '--prefix', - help='Migrate only the specified prefix directory (EXPERT)') - args = argp.parse_args() - - is_root = os.geteuid() == 0 - - if not is_root: - if args.action != 'analyze': - argp.error('Requested action requires root privileges') - else: - log('[Running as unprivileged user, results will not be saved]') - - top_dir = argv_to_bytes(args.root) - - if args.prefix: - usr_merge = False - prefixes = [argv_to_bytes(args.prefix)] - else: - # helpful consts - usr_dir = os.path.join(top_dir, b'usr') - lib64_dir = os.path.join(top_dir, b'lib64') - usr_lib64_dir = os.path.join(usr_dir, b'lib64') - - # if /lib64 and /usr/lib64 are the same directory, we're dealing - # with /usr merge most likely - if os.path.samefile(lib64_dir, usr_lib64_dir): - usr_merge = True - # use whichever prefix has the real directories - if not os.path.islink(lib64_dir): - prefixes = [top_dir] - else: - prefixes = [usr_dir] - else: - usr_merge = False - prefixes = [top_dir, usr_dir] - - # add /usr/local too - prefixes.append(os.path.join(usr_dir, b'local')) - - if args.action == 'analyze': - for p in prefixes: - verify_initial(p) - - m = MigrationState(top_dir) - m.analyze(usr_merge, prefixes) - - # safety check - assert m.prefixes == prefixes - - if is_root: - m.save_state() - log('') - log('') - log('The state has been saved and the migration is ready to proceed.') - log('To initiate it, please run:') - log('') - log('\t{} --migrate', sys.argv[0]) - log('') - log('Please do not perform any changes to the system at this point.') - log('If you performed any changes, please rerun the analysis.') - else: - log('') - log('') - log('Everything looks good from here. However, you need to rerun') - log('the process as root to confirm.') - elif args.action == 'migrate': - for p in prefixes: - verify_initial(p) - - m = MigrationState(top_dir) - if not m.load_state(): - log('State file could not be loaded. Did you run --analyze?') - return 1 - if args.pretend: - log('Those are the actions that would be performed:') - m.migrate(pretend=args.pretend) - if not args.pretend: - log('') - log('') - log('Initial migration complete. Please now test whether your system works') - log('correctly. It might be a good idea to try rebooting it. Once tested,') - log('complete the migration and clean up backup files via calling:') - log('') - log('\t{} --finish', sys.argv[0]) - log('') - log('If you wish to revert the changes, run:') - log('') - log('\t{} --rollback', sys.argv[0]) - elif args.action.startswith('rollback'): - if not args.action.endswith('force'): - for p in prefixes: - verify_migrated(p) - - m = MigrationState(top_dir) - if not m.load_state(): - log('State file could not be loaded. Did you run --analyze?') - return 1 - if args.pretend: - log('Those are the actions that would be performed:') - m.rollback(pretend=args.pretend) - if not args.pretend: - m.clear_state() - log('') - log('') - log('Rollback complete. Your system should now be as before the migration.') - log('Please look into fixing your issues and try again.') - elif args.action.startswith('finish'): - if not args.action.endswith('resume'): - for p in prefixes: - verify_migrated(p) - - m = MigrationState(top_dir) - if not m.load_state(): - log('State file could not be loaded. Did you run --analyze?') - return 1 - if args.pretend: - log('Those are the actions that would be performed:') - m.finish(pretend=args.pretend, resume=args.action.endswith('resume')) - if not args.pretend: - m.clear_state() - log('') - log('') - log('Migration complete. Please switch to the new profiles, or add') - log('the following to your make.conf (or equivalent):') - log('') - log('\tSYMLINK_LIB=no') - if m.has_lib32: - log('\tLIBDIR_x86=lib') - log('') - log('Afterwards, please rebuild all installed GCC versions', end='') - if m.has_lib32: - log(' and all\npackages installing into lib32', end='') - log(', e.g.:') - log('') - log('\temerge -1v {}', os.path.join(top_dir, b'usr/lib/gcc'), end='') - if m.has_lib32: - log(' {} {}', - os.path.join(top_dir, b'lib32'), - os.path.join(top_dir, b'usr/lib32'), - end='') - log('') - if m.has_lib32: - log('') - log('When the rebuilds are complete, the package manager should remove') - log('the lib32 symlink. If it does not, do:') - log('') - log('\trm {} {}', - os.path.join(top_dir, b'lib32'), - os.path.join(top_dir, b'usr/lib32')) - else: - raise NotImplementedError() - - -if __name__ == '__main__': - main() diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.2-force_fix b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.2-force_fix deleted file mode 100644 index f47130c71..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.2-force_fix +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=samba os_arch_machine==x86_64&&ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# path=/var/lib/calculate name=calculate.env - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -[update] -cl_update_force_fix_set = on diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.3-unsymlink-migrate b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.3-unsymlink-migrate deleted file mode 100644 index 804bff4d2..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.3-unsymlink-migrate +++ /dev/null @@ -1,57 +0,0 @@ -# Calculate run=/bin/bash os_arch_machine==x86_64 ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -migrate_need_space() { - /usr/local/sbin/unsymlink-lib --migrate -p 2>/dev/null | grep ^cp | sed 's/cp -a --reflink=auto --//' | xargs du -bsc 2>/dev/null | tail -1 | awk '{print $1}' -} - -root_free_space() { - echo "$(df / | tail -1 | awk '{print $4}')000" -} - -not_numbers() { - echo $* | grep -q "[^ 0-9]" -} - -if [[ -d /lib.new ]] -then - echo "Clearing previous failed migration" - /usr/local/sbin/unsymlink-lib --force-rollback &>/dev/null -fi - - -echo "Analyzing files installed into lib & lib64" - -if /usr/local/sbin/unsymlink-lib --analyze &>/dev/null -then - echo "Calculating necessary space for migration" - needspace="$(migrate_need_space)" - freespace="$(root_free_space)" - if not_numbers "$needspace" "$freespace" - then - echo "Failed to calculate migrate need space" 1>&2 - else - if [[ "$(( $needspace + 100000000 ))" -gt "$freespace" ]] - then - echo "Not enough space for migration" 1>&2 - else - echo "Performing unsymlink lib migration" - if /usr/local/sbin/unsymlink-lib --migrate &>/dev/null - then - if /usr/local/sbin/unsymlink-lib --finish &>/dev/null - then - echo "Migration completed successfully" - exit 0 - else - echo "Failed to finish migration" 1>&2 - fi - else - echo "Failed to perform migration" 1>&2 - /usr/local/sbin/unsymlink-lib --force-rollback &>/dev/null - fi - fi - fi - exit 1 -else - echo "Failed to perform unsymlink lib analyze" 1>&2 - exit 1 -fi diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state deleted file mode 100644 index ac81b3161..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=samba os_arch_machine==i686||exists(/lib)!=l ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# path=/var/lib/calculate name=calculate.env - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -[update] -cl_update_force_fix_set=on diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.5-remove_unsymlink-lib b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.5-remove_unsymlink-lib deleted file mode 100644 index 772193346..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.5-remove_unsymlink-lib +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate append=remove path=/usr/local/sbin name=unsymlink-lib chmod=0755 os_arch_machine==x86_64&&ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.1-rebuild_lib32 b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.1-rebuild_lib32 deleted file mode 100644 index 50144ed21..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.1-rebuild_lib32 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba os_arch_machine==x86_64 ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# rebuild=app-accessibility/at-spi2-atk,app-accessibility/at-spi2-core,app-arch/bzip2,app-emulation/wine-vanilla,app-shells/scsh,dev-db/mysql-connector-c,dev-db/sqlite,dev-lang/orc,dev-libs/atk,dev-libs/elfutils,dev-libs/expat,dev-libs/fribidi,dev-libs/glib,dev-libs/gmp,dev-libs/icu,dev-libs/json-c,dev-libs/libcroco,dev-libs/libffi,dev-libs/libgcrypt,dev-libs/libgpg-error,dev-libs/libltdl,dev-libs/libpcre,dev-libs/libpthread-stubs,dev-libs/libtasn1,dev-libs/libunistring,dev-libs/libusb,dev-libs/libusb-compat,dev-libs/libxml2,dev-libs/libxslt,dev-libs/lzo,dev-libs/nettle,dev-libs/ocl-icd,dev-libs/openssl,dev-libs/popt,dev-libs/wayland,gnome-base/librsvg,media-gfx/graphite2,media-gfx/nvidia-cg-toolkit,media-gfx/sane-backends,media-libs/alsa-lib,media-libs/alsa-oss,media-libs/audiofile,media-libs/faac,media-libs/flac,media-libs/fontconfig,media-libs/freeglut,media-libs/freetype,media-libs/gd,media-libs/glu,media-libs/graphene,media-libs/gst-plugins-base,media-libs/gstreamer,media-libs/harfbuzz,media-libs/lcms,media-libs/libaom,media-libs/libdc1394,media-libs/libepoxy,media-libs/libexif,media-libs/libgphoto2,media-libs/libjpeg-turbo,media-libs/libmad,media-libs/libmikmod,media-libs/libmng,media-libs/libogg,media-libs/libpng,media-libs/libsdl,media-libs/libsdl2,media-libs/libsndfile,media-libs/libtheora,media-libs/libv4l,media-libs/libvorbis,media-libs/libvpx,media-libs/libwebp,media-libs/mesa,media-libs/nv-codec-headers,media-libs/openal,media-libs/opencore-amr,media-libs/openjpeg,media-libs/opus,media-libs/portaudio,media-libs/sdl-mixer,media-libs/smpeg,media-libs/speex,media-libs/speexdsp,media-libs/tiff,media-libs/vo-aacenc,media-libs/x264,media-libs/x265,media-libs/xvid,media-plugins/alsa-plugins,media-sound/lame,media-sound/mpg123,media-sound/pulseaudio,media-sound/wavpack,media-video/ffmpeg,net-dns/libidn2,net-libs/gnutls,net-libs/libasyncns,net-libs/srt,net-nds/openldap,net-print/cndrvcups-capt,net-print/cndrvcups-common,net-print/cndrvcups-common-lb,net-print/cndrvcups-lb,net-print/cups,sys-apps/attr,sys-apps/dbus,sys-apps/lm-sensors,sys-apps/sandbox,sys-apps/tcp-wrappers,sys-apps/util-linux,sys-devel/binutils,sys-devel/clang,sys-devel/flex,sys-devel/gcc,sys-devel/gettext,sys-devel/llvm,sys-fs/eudev,sys-libs/binutils-libs,sys-libs/cracklib,sys-libs/db,sys-libs/glibc,sys-libs/gpm,sys-libs/libcap,sys-libs/libraw1394,sys-libs/libstdc++-v3,sys-libs/ncurses,sys-libs/pam,sys-libs/readline,sys-libs/zlib,x11-base/xcb-proto,x11-drivers/nvidia-drivers,x11-libs/cairo,x11-libs/gdk-pixbuf,x11-libs/gtk+,x11-libs/libdrm,x11-libs/libICE,x11-libs/libpciaccess,x11-libs/libSM,x11-libs/libva,x11-libs/libva-intel-driver,x11-libs/libva-vdpau-driver,x11-libs/libvdpau,x11-libs/libX11,x11-libs/libXau,x11-libs/libxcb,x11-libs/libXcomposite,x11-libs/libXcursor,x11-libs/libXdamage,x11-libs/libXdmcp,x11-libs/libXext,x11-libs/libXfixes,x11-libs/libXft,x11-libs/libXi,x11-libs/libXinerama,x11-libs/libxkbcommon,x11-libs/libXmu,x11-libs/libXrandr,x11-libs/libXrender,x11-libs/libXScrnSaver,x11-libs/libxshmfence,x11-libs/libXt,x11-libs/libXtst,x11-libs/libXv,x11-libs/libXvMC,x11-libs/libXxf86dga,x11-libs/libXxf86vm,x11-libs/pango,x11-libs/pixman - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.2-rebuild_gcc_binutils_glibc b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.2-rebuild_gcc_binutils_glibc deleted file mode 100644 index 9148004d1..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.2-rebuild_gcc_binutils_glibc +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate run=/bin/bash os_arch_machine==x86_64 cl_chroot_status==on||cl_update_sync_only_set==off&&cl_update_autocheck_schedule_set==off ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# - -echo "A new set of 17.1 amd64 Gentoo profiles has been selected." -echo "Rebuild sys-devel/gcc" -if emerge -g1O dev-libs/mpfr dev-libs/mpc dev-libs/libbytesize dev-libs/rasqal sys-devel/gcc &>/dev/null -then - echo "Rebuild sys-devel/binutils" - if emerge -g1O sys-devel/binutils &>/dev/null - then - echo "Rebuild sys-libs/glibc" - emerge -g1O sys-libs/glibc &>/dev/null - fi -fi diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.3-disable_force_fix b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.3-disable_force_fix deleted file mode 100644 index f243b3adc..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.3-disable_force_fix +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=samba path=/var/lib/calculate name=calculate.env cl_chroot_status==on||cl_update_sync_only_set==off&&cl_update_autocheck_schedule_set==off ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -[update] -!cl_update_force_fix_set= diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.4-remove_lib32 b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.4-remove_lib32 deleted file mode 100644 index 029739649..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191116.4-remove_lib32 +++ /dev/null @@ -1,37 +0,0 @@ -# Calculate run=/bin/bash os_arch_machine==x86_64 exists(/lib32)==l ini(overlay-calculate.revision)>=20191116.3 - -get_packages() { - awk -F: '{print $1}' | sort -u | sed 's,/CONTENTS,,' -} - -check_lib32() { - cd /var/db/pkg - grep -rn " /lib32/" */*/CONTENTS -} - -check_usrlib32() { - cd /var/db/pkg - grep -rn " /usr/lib32/" */*/CONTENTS -} - -check_llvm32() { - cd /var/db/pkg - grep -rnP " /usr/lib/llvm/.*/lib32/" */*/CONTENTS -} - -downgrade_for_rebuild() { - grep -v _rc73 | while read pf; - do - pv_new="$(sed 's,-r[0-9]\+,,' <<<$pf)_rc73" - mv /var/db/pkg/$pf /var/db/pkg/$pv_new - done -} - -PACKAGES="$((check_lib32;check_usrlib32;check_llvm32) | get_packages)" - -if [[ -n $PACKAGES ]] -then - downgrade_for_rebuild <<<$PACKAGES -else - rm -f /lib32 /usr/lib32 -fi diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191125-rebuild_shorewall b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191125-rebuild_shorewall deleted file mode 100644 index b04cb986f..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191125-rebuild_shorewall +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=net-firewall/shorewall - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191213-update_profile b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191213-update_profile deleted file mode 100644 index 971121989..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191213-update_profile +++ /dev/null @@ -1,31 +0,0 @@ -# Calculate run=/bin/bash pkg(sys-apps/calculate-utils:3)>=3.6.6 ini(overlay-calculate.revision)>=20191116.3 - -is_old_path() { - /usr/libexec/calculate/cl-variable --value main.cl_template_path | grep -q var/lib/layman -} - -if is_old_path -then - current_profile="$(readlink -f /etc/portage/make.profile)" - if [[ -d "${current_profile}/20" ]] - then - echo "Changing profile" - ln -sfT $(realpath --relative-to /etc/portage "${current_profile}/20") /etc/portage/make.profile - fi -fi - -if ! is_old_path && [[ -d /var/lib/layman ]] -then -#?pkg(app-portage/layman)==# - echo "Removing /var/lib/layman" - rm -rf /var/lib/layman -#!pkg# - if find /var/lib/layman -maxdepth 1 -type l &>/dev/null - then - find /var/lib/layman -maxdepth 1 -type l -delete - fi -#pkg# - rm -f /etc/portage/make.conf/0-base -fi - -exit 0 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191216-custom_migrate b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191216-custom_migrate deleted file mode 100644 index 94b208da6..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191216-custom_migrate +++ /dev/null @@ -1,41 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# merge=sys-apps/portage - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -#?cl_chroot_status!=on# -# перенос custom[.short] в custom - -#?load(empty,/etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.unmask/custom -#load# -rm -f /etc/portage/package.unmask/custom.#-case(lower,os_linux_shortname)-# - -#?load(empty,/etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.mask/custom -#load# -rm -f /etc/portage/package.mask/custom.#-case(lower,os_linux_shortname)-# - -#?load(empty,/etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.use/custom -#load# -rm -f /etc/portage/package.use/custom.#-case(lower,os_linux_shortname)-# - -#?load(empty,/etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/package.keywords/custom -#load# -rm -f /etc/portage/package.keywords/custom.#-case(lower,os_linux_shortname)-# - -#?load(empty,/etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/make.conf/custom -#load# -rm -f /etc/portage/make.conf/custom.#-case(lower,os_linux_shortname)-# - -#?load(empty,/etc/portage/sets/custom.#-case(lower,os_linux_shortname)-#)!=# -cat /etc/portage/sets/custom.#-case(lower,os_linux_shortname)-# >>/etc/portage/sets/custom -#load# -rm -f /etc/portage/sets/custom.#-case(lower,os_linux_shortname)-# - -sed -ri '/^@custom.#-case(lower,os_linux_shortname)-#$/d' /var/lib/portage/world_sets -#cl_chroot_status# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191218-fix_modulesync b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191218-fix_modulesync deleted file mode 100644 index 02c2ea0d7..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191218-fix_modulesync +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate format=contents ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# merge=sys-apps/portage - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -!sys-apps/calculate-utils /usr/lib64/python2.7/site-packages/portage/* -!sys-apps/calculate-utils /usr/lib64/python3.5/site-packages/portage/* -!sys-apps/calculate-utils /usr/lib64/python3.6/site-packages/portage/* -!sys-apps/calculate-utils /usr/lib/python2.7/site-packages/portage/* -!sys-apps/calculate-utils /usr/lib/python3.5/site-packages/portage/* -!sys-apps/calculate-utils /usr/lib/python3.6/site-packages/portage/* diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191225-regen_dovecot_dh b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191225-regen_dovecot_dh deleted file mode 100644 index 96a72bccc..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191225-regen_dovecot_dh +++ /dev/null @@ -1,10 +0,0 @@ -# Calculate run=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# pkg(sys-apps/calculate-server)!= merge=sys-apps/portage - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# -#?exists(/etc/ssl/dovecot/dh.pem)!=&&grep(/var/lib/calculate/calculate.env,sr_mail_set\x20=\x20on)!=# -echo "Update dovecot DH key" -openssl dhparam -dsaparam 4096 2>/dev/null 1>/etc/ssl/dovecot/dh.pem.new && - mv /etc/ssl/dovecot/dh.pem.new /etc/ssl/dovecot/dh.pem -#exists# - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191227-rebuild_adwaita-qt b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191227-rebuild_adwaita-qt deleted file mode 100644 index 3cf96cb56..000000000 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191227-rebuild_adwaita-qt +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-themes/adwaita-qt - -[overlay-calculate] -revision = #-cut(0,-,#-cl_pass_file-#)-#