From 8df9f2560af98cfcec2bcdd60b5a503857857ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Mon, 21 Jun 2010 09:08:37 +0400 Subject: [PATCH] Added belong() in templates --- templates/desktop/20-kde-4.3-4.4/.calculate_directory | 2 +- templates/desktop/20-kde-4.3/.calculate_directory | 2 +- templates/desktop/20-kde-4.4/.calculate_directory | 2 +- templates/desktop/20-kde-always/.calculate_directory | 2 +- templates/desktop/20-kmail-4.4/.calculate_directory | 2 +- templates/desktop/30-evolution-2.6/.calculate_directory | 2 +- templates/desktop/30-gnome-2.6/.calculate_directory | 2 +- templates/desktop/30-gnome-always/.calculate_directory | 2 +- templates/desktop/40-claws-mail-3.7/.calculate_directory | 2 +- templates/desktop/40-cldx-10.2-10.4/.calculate_directory | 2 +- templates/desktop/40-xfce-4.6/.calculate_directory | 2 +- templates/desktop/40-xfce-always/.calculate_directory | 2 +- templates/desktop/60-bash-3.0/.calculate_directory | 2 +- templates/desktop/60-chromium-5.0/.calculate_directory | 2 +- templates/desktop/60-compiz-0.8.4/.calculate_directory | 2 +- templates/desktop/60-compiz-always/.calculate_directory | 2 +- templates/desktop/60-fbreader-0.1/.calculate_directory | 2 +- templates/desktop/60-firefox-3.5/.calculate_directory | 2 +- templates/desktop/60-firefox-always/.calculate_directory | 2 +- templates/desktop/60-gimp-2.6/.calculate_directory | 2 +- templates/desktop/60-konversation-1.2/.calculate_directory | 2 +- templates/desktop/60-konversation-always/.calculate_directory | 2 +- templates/desktop/60-mc-4.7/.calculate_directory | 2 +- templates/desktop/60-openoffice-3.2/.calculate_directory | 2 +- templates/desktop/60-pidgin-2.6/.calculate_directory | 2 +- templates/desktop/60-stardict-3.0/.calculate_directory | 2 +- templates/desktop/60-transmission-1.8/.calculate_directory | 2 +- templates/desktop/60-vim-7.0/.calculate_directory | 2 +- templates/desktop/60-xchat-2.8/.calculate_directory | 2 +- templates/desktop/60-xchat-always/.calculate_directory | 2 +- templates/desktop/60-xscreensaver-5.10/.calculate_directory | 2 +- templates/desktop/80-patch-2.1.16/.calculate_directory | 2 +- templates/desktop/80-patch-2.1.17/.calculate_directory | 2 +- templates/desktop/80-patch-2.1.18/.calculate_directory | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/templates/desktop/20-kde-4.3-4.4/.calculate_directory b/templates/desktop/20-kde-4.3-4.4/.calculate_directory index 16d6192..d8395f5 100644 --- a/templates/desktop/20-kde-4.3-4.4/.calculate_directory +++ b/templates/desktop/20-kde-4.3-4.4/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)!=&&ini(ver.kde)>=4.3&&ini(ver.kde)<4.4&&pkg(kde-base/kdelibs)>=4.4&&pkg(kde-base/kdelibs)<4.5 +# Calculate append=skip belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)!=&&ini(ver.kde)>=4.3&&ini(ver.kde)<4.4&&pkg(kde-base/kdelibs)>=4.4&&pkg(kde-base/kdelibs)<4.5 diff --git a/templates/desktop/20-kde-4.3/.calculate_directory b/templates/desktop/20-kde-4.3/.calculate_directory index f154003..3ce4dfb 100644 --- a/templates/desktop/20-kde-4.3/.calculate_directory +++ b/templates/desktop/20-kde-4.3/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)>=4.3&&pkg(kde-base/kdelibs)<4.4 +# Calculate append=skip belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)>=4.3&&pkg(kde-base/kdelibs)<4.4 diff --git a/templates/desktop/20-kde-4.4/.calculate_directory b/templates/desktop/20-kde-4.4/.calculate_directory index 70463a0..a051616 100644 --- a/templates/desktop/20-kde-4.4/.calculate_directory +++ b/templates/desktop/20-kde-4.4/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)>=4.4 +# Calculate append=skip belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)>=4.4 diff --git a/templates/desktop/20-kde-always/.calculate_directory b/templates/desktop/20-kde-always/.calculate_directory index 8d29573..5cff41b 100644 --- a/templates/desktop/20-kde-always/.calculate_directory +++ b/templates/desktop/20-kde-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.kde)!=off&&pkg(kde-base/kdelibs)>=4.4 +# Calculate append=skip belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&pkg(kde-base/kdelibs)>=4.4 diff --git a/templates/desktop/20-kmail-4.4/.calculate_directory b/templates/desktop/20-kmail-4.4/.calculate_directory index 6b3bd69..796a52c 100644 --- a/templates/desktop/20-kmail-4.4/.calculate_directory +++ b/templates/desktop/20-kmail-4.4/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.kmail)!=off&&ini(ver.kmail)==&&pkg(kde-base/kmail)>=4.4 +# Calculate append=skip belong(kmail)!=&&ini(main.update)!=off&&ini(update.kmail)!=off&&ini(ver.kmail)==&&pkg(kde-base/kmail)>=4.4 diff --git a/templates/desktop/30-evolution-2.6/.calculate_directory b/templates/desktop/30-evolution-2.6/.calculate_directory index 5e739b3..1486af9 100644 --- a/templates/desktop/30-evolution-2.6/.calculate_directory +++ b/templates/desktop/30-evolution-2.6/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26 +# Calculate append=skip belong(evolution)!=&&ini(main.update)!=off&&ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26 diff --git a/templates/desktop/30-gnome-2.6/.calculate_directory b/templates/desktop/30-gnome-2.6/.calculate_directory index 2b0138e..ae6eaac 100644 --- a/templates/desktop/30-gnome-2.6/.calculate_directory +++ b/templates/desktop/30-gnome-2.6/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26 +# Calculate append=skip belong(libgnome)!=&&ini(main.update)!=off&&ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26 diff --git a/templates/desktop/30-gnome-always/.calculate_directory b/templates/desktop/30-gnome-always/.calculate_directory index 302c7cb..f840ef4 100644 --- a/templates/desktop/30-gnome-always/.calculate_directory +++ b/templates/desktop/30-gnome-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&&env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-# +# Calculate append=skip belong(libgnome)!=&&ini(main.update)!=off&&ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&&env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-# diff --git a/templates/desktop/40-claws-mail-3.7/.calculate_directory b/templates/desktop/40-claws-mail-3.7/.calculate_directory index 4ea0287..a6fdefe 100644 --- a/templates/desktop/40-claws-mail-3.7/.calculate_directory +++ b/templates/desktop/40-claws-mail-3.7/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.claws-mail)!=off&&ini(ver.claws-mail)==&&pkg(mail-client/claws-mail)>=3.7 +# Calculate append=skip belong(claws-mail)!=&&ini(main.update)!=off&&ini(update.claws-mail)!=off&&ini(ver.claws-mail)==&&pkg(mail-client/claws-mail)>=3.7 diff --git a/templates/desktop/40-cldx-10.2-10.4/.calculate_directory b/templates/desktop/40-cldx-10.2-10.4/.calculate_directory index 8fe1510..1376321 100644 --- a/templates/desktop/40-cldx-10.2-10.4/.calculate_directory +++ b/templates/desktop/40-cldx-10.2-10.4/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.xfce)!=off&&pkg(xfce-base/xfdesktop)>=4.6&&ini(newsystem)==on&&ini(main.ver)>10.3&&ini(main.ver)<=10.4 +# Calculate append=skip belong(xfdesktop)!=&&ini(main.update)!=off&&ini(update.xfce)!=off&&pkg(xfce-base/xfdesktop)>=4.6&&ini(newsystem)==on&&ini(main.ver)>10.3&&ini(main.ver)<=10.4 diff --git a/templates/desktop/40-xfce-4.6/.calculate_directory b/templates/desktop/40-xfce-4.6/.calculate_directory index 1d910af..7ae8e07 100644 --- a/templates/desktop/40-xfce-4.6/.calculate_directory +++ b/templates/desktop/40-xfce-4.6/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6 +# Calculate append=skip belong(xfdesktop)!=&&ini(main.update)!=off&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6 diff --git a/templates/desktop/40-xfce-always/.calculate_directory b/templates/desktop/40-xfce-always/.calculate_directory index d9b33dd..1192a2d 100644 --- a/templates/desktop/40-xfce-always/.calculate_directory +++ b/templates/desktop/40-xfce-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)>=4.6 +# Calculate append=skip belong(xfdesktop)!=&&ini(main.update)!=off&&env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)>=4.6 diff --git a/templates/desktop/60-bash-3.0/.calculate_directory b/templates/desktop/60-bash-3.0/.calculate_directory index c642ced..fa24ec8 100644 --- a/templates/desktop/60-bash-3.0/.calculate_directory +++ b/templates/desktop/60-bash-3.0/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg(app-shells/bash)>=3.0 +# Calculate append=skip belong(bash)!=&&ini(main.update)!=off&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg(app-shells/bash)>=3.0 diff --git a/templates/desktop/60-chromium-5.0/.calculate_directory b/templates/desktop/60-chromium-5.0/.calculate_directory index df4bd3a..677383f 100644 --- a/templates/desktop/60-chromium-5.0/.calculate_directory +++ b/templates/desktop/60-chromium-5.0/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg(www-client/chromium)>=5.0 +# Calculate append=skip belong(chromium)!=&&ini(main.update)!=off&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg(www-client/chromium)>=5.0 diff --git a/templates/desktop/60-compiz-0.8.4/.calculate_directory b/templates/desktop/60-compiz-0.8.4/.calculate_directory index 7c3051c..330af50 100644 --- a/templates/desktop/60-compiz-0.8.4/.calculate_directory +++ b/templates/desktop/60-compiz-0.8.4/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.compiz)!=off&&ini(ver.compiz)==&&pkg(x11-wm/compiz)>=0.8.4 +# Calculate append=skip belong(compiz)!=&&ini(main.update)!=off&&ini(update.compiz)!=off&&ini(ver.compiz)==&&pkg(x11-wm/compiz)>=0.8.4 diff --git a/templates/desktop/60-compiz-always/.calculate_directory b/templates/desktop/60-compiz-always/.calculate_directory index 5f29e7f..0794d61 100644 --- a/templates/desktop/60-compiz-always/.calculate_directory +++ b/templates/desktop/60-compiz-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.compiz)!=off&&pkg(x11-wm/compiz)>=0.8.4 +# Calculate append=skip belong(compiz)!=&&ini(main.update)!=off&&ini(update.compiz)!=off&&pkg(x11-wm/compiz)>=0.8.4 diff --git a/templates/desktop/60-fbreader-0.1/.calculate_directory b/templates/desktop/60-fbreader-0.1/.calculate_directory index 5f51e70..89c49f3 100644 --- a/templates/desktop/60-fbreader-0.1/.calculate_directory +++ b/templates/desktop/60-fbreader-0.1/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.fbreader)!=off&&ini(ver.fbreader)==&&pkg(app-text/fbreader)>=0.1 +# Calculate append=skip belong(fbreader)!=&&ini(main.update)!=off&&ini(update.fbreader)!=off&&ini(ver.fbreader)==&&pkg(app-text/fbreader)>=0.1 diff --git a/templates/desktop/60-firefox-3.5/.calculate_directory b/templates/desktop/60-firefox-3.5/.calculate_directory index f9f22a0..a015a62 100644 --- a/templates/desktop/60-firefox-3.5/.calculate_directory +++ b/templates/desktop/60-firefox-3.5/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.firefox)!=off&&ini(ver.firefox)==&&pkg(www-client/mozilla-firefox)>=3.5 +# Calculate append=skip belong(mozilla-firefox)!=&&ini(main.update)!=off&&ini(update.firefox)!=off&&ini(ver.firefox)==&&pkg(www-client/mozilla-firefox)>=3.5 diff --git a/templates/desktop/60-firefox-always/.calculate_directory b/templates/desktop/60-firefox-always/.calculate_directory index 9519867..515ab3f 100644 --- a/templates/desktop/60-firefox-always/.calculate_directory +++ b/templates/desktop/60-firefox-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.firefox)!=off&&pkg(www-client/mozilla-firefox)>=3.5&&ini(newsystem)==on +# Calculate append=skip belong(mozilla-firefox)!=&&ini(main.update)!=off&&ini(update.firefox)!=off&&pkg(www-client/mozilla-firefox)>=3.5&&ini(newsystem)==on diff --git a/templates/desktop/60-gimp-2.6/.calculate_directory b/templates/desktop/60-gimp-2.6/.calculate_directory index 32039b8..49e4f63 100644 --- a/templates/desktop/60-gimp-2.6/.calculate_directory +++ b/templates/desktop/60-gimp-2.6/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.gimp)!=off&&ini(ver.gimp)==&&pkg(media-gfx/gimp)>=2.6 +# Calculate append=skip belong(gimp)!=&&ini(main.update)!=off&&ini(update.gimp)!=off&&ini(ver.gimp)==&&pkg(media-gfx/gimp)>=2.6 diff --git a/templates/desktop/60-konversation-1.2/.calculate_directory b/templates/desktop/60-konversation-1.2/.calculate_directory index d952915..d183135 100644 --- a/templates/desktop/60-konversation-1.2/.calculate_directory +++ b/templates/desktop/60-konversation-1.2/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.konversation)!=off&&ini(ver.konversation)==&&pkg(net-irc/konversation)>=1.2 +# Calculate append=skip belong(konversation)!=&&ini(main.update)!=off&&ini(update.konversation)!=off&&ini(ver.konversation)==&&pkg(net-irc/konversation)>=1.2 diff --git a/templates/desktop/60-konversation-always/.calculate_directory b/templates/desktop/60-konversation-always/.calculate_directory index 9c51f10..8e4d31e 100644 --- a/templates/desktop/60-konversation-always/.calculate_directory +++ b/templates/desktop/60-konversation-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.konversation)!=off&&pkg(net-irc/konversation)>1.2&&ini(newsystem)==on +# Calculate append=skip belong(konversation)!=&&ini(update.konversation)!=off&&pkg(net-irc/konversation)>1.2&&ini(newsystem)==on diff --git a/templates/desktop/60-mc-4.7/.calculate_directory b/templates/desktop/60-mc-4.7/.calculate_directory index ac7e97f..9a7263e 100644 --- a/templates/desktop/60-mc-4.7/.calculate_directory +++ b/templates/desktop/60-mc-4.7/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.mc)!=off&&ini(ver.mc)==&&pkg(app-misc/mc)>=4.7 +# Calculate append=skip belong(mc)!=&&ini(update.mc)!=off&&ini(ver.mc)==&&pkg(app-misc/mc)>=4.7 diff --git a/templates/desktop/60-openoffice-3.2/.calculate_directory b/templates/desktop/60-openoffice-3.2/.calculate_directory index d4bac7f..33590ef 100644 --- a/templates/desktop/60-openoffice-3.2/.calculate_directory +++ b/templates/desktop/60-openoffice-3.2/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.openoffice)!=off&&ini(ver.openoffice)==&&pkg(app-office/openoffice)>=3.2&&pkg(kde-base/kdelibs)!= +# Calculate append=skip belong(openoffice)!=&&ini(update.openoffice)!=off&&ini(ver.openoffice)==&&pkg(app-office/openoffice)>=3.2&&pkg(kde-base/kdelibs)!= diff --git a/templates/desktop/60-pidgin-2.6/.calculate_directory b/templates/desktop/60-pidgin-2.6/.calculate_directory index 3f895d3..3992f2e 100644 --- a/templates/desktop/60-pidgin-2.6/.calculate_directory +++ b/templates/desktop/60-pidgin-2.6/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.pidgin)!=off&&ini(ver.pidgin)==&&pkg(net-im/pidgin)>=2.6 +# Calculate append=skip belong(pidgin)!=&&ini(update.pidgin)!=off&&ini(ver.pidgin)==&&pkg(net-im/pidgin)>=2.6 diff --git a/templates/desktop/60-stardict-3.0/.calculate_directory b/templates/desktop/60-stardict-3.0/.calculate_directory index cc0bc8d..2e924a4 100644 --- a/templates/desktop/60-stardict-3.0/.calculate_directory +++ b/templates/desktop/60-stardict-3.0/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.stardict)!=off&&ini(ver.stardict)==&&pkg(app-text/stardict)>=3.0 +# Calculate append=skip belong(stardict)!=&&ini(update.stardict)!=off&&ini(ver.stardict)==&&pkg(app-text/stardict)>=3.0 diff --git a/templates/desktop/60-transmission-1.8/.calculate_directory b/templates/desktop/60-transmission-1.8/.calculate_directory index 7a29453..474d475 100644 --- a/templates/desktop/60-transmission-1.8/.calculate_directory +++ b/templates/desktop/60-transmission-1.8/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.transmission)!=off&&ini(ver.transmission)==&&pkg(net-p2p/transmission)>=1.8 +# Calculate append=skip belong(transmission)!=&&ini(update.transmission)!=off&&ini(ver.transmission)==&&pkg(net-p2p/transmission)>=1.8 diff --git a/templates/desktop/60-vim-7.0/.calculate_directory b/templates/desktop/60-vim-7.0/.calculate_directory index 9c11bee..8d8cbce 100644 --- a/templates/desktop/60-vim-7.0/.calculate_directory +++ b/templates/desktop/60-vim-7.0/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.vim)!=off&&ini(ver.vim)==&&pkg(app-editors/vim)>=7.0 +# Calculate append=skip belong(vim)!=&&ini(update.vim)!=off&&ini(ver.vim)==&&pkg(app-editors/vim)>=7.0 diff --git a/templates/desktop/60-xchat-2.8/.calculate_directory b/templates/desktop/60-xchat-2.8/.calculate_directory index 00463a7..b88f871 100644 --- a/templates/desktop/60-xchat-2.8/.calculate_directory +++ b/templates/desktop/60-xchat-2.8/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.xchat)!=off&&ini(ver.xchat)==&&pkg(net-irc/xchat)>=2.8 +# Calculate append=skip belong(xchat)!=&&ini(update.xchat)!=off&&ini(ver.xchat)==&&pkg(net-irc/xchat)>=2.8 diff --git a/templates/desktop/60-xchat-always/.calculate_directory b/templates/desktop/60-xchat-always/.calculate_directory index 3fa7195..512352f 100644 --- a/templates/desktop/60-xchat-always/.calculate_directory +++ b/templates/desktop/60-xchat-always/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.xchat)!=off&&pkg(net-irc/xchat)>2.8&&ini(newsystem)==on +# Calculate append=skip belong(xchat)!=&&ini(update.xchat)!=off&&pkg(net-irc/xchat)>2.8&&ini(newsystem)==on diff --git a/templates/desktop/60-xscreensaver-5.10/.calculate_directory b/templates/desktop/60-xscreensaver-5.10/.calculate_directory index b123248..fced3d3 100644 --- a/templates/desktop/60-xscreensaver-5.10/.calculate_directory +++ b/templates/desktop/60-xscreensaver-5.10/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(update.xscreensaver)!=off&&ini(ver.xscreensaver)==&&pkg(x11-misc/xscreensaver)>=5.10 +# Calculate append=skip belong(xscreensaver)!=&&ini(update.xscreensaver)!=off&&ini(ver.xscreensaver)==&&pkg(x11-misc/xscreensaver)>=5.10 diff --git a/templates/desktop/80-patch-2.1.16/.calculate_directory b/templates/desktop/80-patch-2.1.16/.calculate_directory index e451dc6..03e15cc 100644 --- a/templates/desktop/80-patch-2.1.16/.calculate_directory +++ b/templates/desktop/80-patch-2.1.16/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.16 +# Calculate append=skip belong(calculate-desktop)!=&&ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.16 diff --git a/templates/desktop/80-patch-2.1.17/.calculate_directory b/templates/desktop/80-patch-2.1.17/.calculate_directory index 181f753..bfb292e 100644 --- a/templates/desktop/80-patch-2.1.17/.calculate_directory +++ b/templates/desktop/80-patch-2.1.17/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.17 +# Calculate append=skip belong(calculate-desktop)!=&&ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.17 diff --git a/templates/desktop/80-patch-2.1.18/.calculate_directory b/templates/desktop/80-patch-2.1.18/.calculate_directory index 0a6a5d8..730453c 100644 --- a/templates/desktop/80-patch-2.1.18/.calculate_directory +++ b/templates/desktop/80-patch-2.1.18/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.18 +# Calculate append=skip belong(calculate-desktop)!=&&ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.18