From 4131bf72e1ad3f305d4e6544e408337d934b727c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=D0=B5=20=D0=98=D0=BC=D1=8F?= Date: Wed, 3 Jun 2020 10:21:40 +0300 Subject: [PATCH 1/3] CLDX: add x11-misc/snixembed --- profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- profiles/templates/3.5/6_ac_update_sync/world/create/xfce | 1 + .../3.5/6_ac_update_sync/world/update/2020/20200603 | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini index e3f4746..58ca3f6 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 20200521 +world = 20200603 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce index 62de2ac..c7b8d23 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce @@ -4,6 +4,7 @@ app-arch/xarchiver dev-util/catfish gnome-extra/polkit-gnome +x11-misc/snixembed x11-misc/sw-notify-send x11-terms/xfce4-terminal xfce-base/xfce4-meta diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 new file mode 100644 index 0000000..8b42bad --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# + +#-ini(overlay-distros.world,#-cut()-#)-# + +#?in(os_linux_pkglist, CLDX, CLDXS)!=# +x11-misc/snixembed +#in# From a57a2445d55bd787ab94fe0ec2dbc3386568bac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=D0=B5=20=D0=98=D0=BC=D1=8F?= Date: Fri, 5 Jun 2020 15:43:12 +0300 Subject: [PATCH 2/3] CLDX: x11-misc/snixembed -> xfce-extra/xfce4-statusnotifier-plugin --- profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- profiles/templates/3.5/6_ac_update_sync/world/create/xfce | 2 +- .../6_ac_update_sync/world/update/2020/{20200603 => 20200604} | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename profiles/templates/3.5/6_ac_update_sync/world/update/2020/{20200603 => 20200604} (73%) diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini index 58ca3f6..ba67a7f 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 20200603 +world = 20200604 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce index c7b8d23..db8e3b8 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce @@ -4,7 +4,6 @@ app-arch/xarchiver dev-util/catfish gnome-extra/polkit-gnome -x11-misc/snixembed x11-misc/sw-notify-send x11-terms/xfce4-terminal xfce-base/xfce4-meta @@ -17,6 +16,7 @@ xfce-extra/xfce4-datetime-plugin xfce-extra/xfce4-notifyd xfce-extra/xfce4-power-manager xfce-extra/xfce4-screenshooter +xfce-extra/xfce4-statusnotifier-plugin xfce-extra/xfce4-taskmanager xfce-extra/xfce4-xkb-plugin #in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200604 similarity index 73% rename from profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 rename to profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200604 index 8b42bad..2cfde1f 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200603 +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200604 @@ -3,5 +3,6 @@ #-ini(overlay-distros.world,#-cut()-#)-# #?in(os_linux_pkglist, CLDX, CLDXS)!=# -x11-misc/snixembed +!x11-misc/snixembed +xfce-extra/xfce4-statusnotifier-plugin #in# From 19a050688bd00627ce5c86e100921be2b5ef7eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=88=D0=B5=20=D0=98=D0=BC=D1=8F?= Date: Fri, 5 Jun 2020 22:23:16 +0300 Subject: [PATCH 3/3] net-p2p/deluge -> net-p2p/qbittorrent all without CLD --- profiles/templates/3.5/6_ac_update_sync/world/create/lxqt | 1 - profiles/templates/3.5/6_ac_update_sync/world/create/netapps | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/lxqt b/profiles/templates/3.5/6_ac_update_sync/world/create/lxqt index fafb05e..7dca415 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/lxqt +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/lxqt @@ -10,7 +10,6 @@ lxqt-base/lxqt-openssh-askpass lxqt-base/lxqt-powermanagement lxqt-base/lxqt-sudo net-irc/kvirc -net-p2p/qbittorrent x11-misc/qlipper x11-misc/screengrab x11-terms/qterminal diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/netapps b/profiles/templates/3.5/6_ac_update_sync/world/create/netapps index 73c77a1..1225981 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/netapps @@ -21,13 +21,10 @@ www-plugins/chrome-ublock #?in(os_linux_pkglist, CLDC, CLDL, CLDM, CLDX, CLDXS)!=# net-im/gajim net-misc/remmina +net-p2p/qbittorrent x11-misc/x11vnc #in# -#?in(os_linux_pkglist, CLDC, CLDM, CLDX, CLDXS)!=# -net-p2p/deluge -#in# - #?in(os_linux_pkglist, CLDL, CLDM, CLDX, CLDXS)!=# mail-client/claws-mail #in#