From ca5eb6263bf95c509358ee988231525986f4ca45 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 31 Aug 2015 15:37:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.2/6_ac_update_sync/world/0-ini | 2 +- .../3.2/6_ac_update_sync/world/create/netapps | 1 + .../templates/3.2/6_ac_update_sync/world/create/server | 2 ++ .../templates/3.2/6_ac_update_sync/world/create/wm+ | 3 +++ .../6_ac_update_sync/world/update/100-199/{133 => 134} | 10 ++++++++-- 5 files changed, 15 insertions(+), 3 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/100-199/{133 => 134} (58%) diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index 518e9e7..ac7660e 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 133 +world = 134 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps index 50596ac..3b33f4b 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps @@ -89,5 +89,6 @@ www-client/seamonkey #in# #?in(os_linux_pkglist, CDS+)!=# +net-misc/youtube-dl www-client/lynx #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server index 6d5554a..570b394 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server @@ -26,4 +26,6 @@ sys-apps/most #?in(os_linux_pkglist, CDS+)!=# dev-lang/php dev-vcs/gitolite +www-servers/lighttpd +www-servers/nginx #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ b/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ index 312d1de..46d8875 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/wm+ @@ -1,7 +1,10 @@ # Calculate name=world format=world in(os_linux_pkglist,CLDX+)!= +x11-wm/afterstep x11-wm/awesome x11-wm/enlightenment x11-wm/enlightenment:0.17 x11-wm/fluxbox +x11-wm/fvwm x11-wm/i3 +x11-wm/icewm diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/133 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/134 similarity index 58% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/133 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/134 index 7e6a08a..11aefda 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/133 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/134 @@ -1,12 +1,18 @@ -# Calculate format=world name=world ini(overlay-distros.world)<133 +# Calculate format=world name=world ini(overlay-distros.world)<134 -#-ini(overlay-distros.world,133)-# +#-ini(overlay-distros.world,134)-# #?in(os_linux_pkglist, CLDX+)!=# net-print/splix +x11-wm/afterstep +x11-wm/fvwm +x11-wm/icewm #in# #?in(os_linux_pkglist, CDS+)!=# !dev-vcs/gitolite-gentoo dev-vcs/gitolite +net-misc/youtube-dl +www-servers/lighttpd +www-servers/nginx #in#