From 5231c27889057e01dec894cf81b22b3c949d07e9 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 23 Nov 2015 10:55:46 +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 +- .../templates/3.2/6_ac_update_sync/world/create/multimedia | 1 + .../templates/3.2/6_ac_update_sync/world/create/netapps | 1 + .../3.2/6_ac_update_sync/world/update/200-299/{221 => 222} | 6 ++++-- 4 files changed, 7 insertions(+), 3 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{221 => 222} (73%) 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 55faa79..389a2e8 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 = 221 +world = 222 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia index 029ae5e..8ebcabd 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia @@ -48,6 +48,7 @@ media-sound/qmmp media-sound/rhythmbox media-sound/soundconverter media-sound/xmms2 +media-sound/ardour media-video/avidemux media-video/bombono-dvd media-video/devede 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 4363abf..8c06fa0 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 @@ -93,6 +93,7 @@ www-client/midori www-client/qupzilla www-client/seamonkey www-client/uget +www-client/vivaldi #in# #?in(os_linux_pkglist, CDS+)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/221 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/222 similarity index 73% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/221 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/222 index 76e3f62..1501444 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/221 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/222 @@ -1,11 +1,13 @@ -# Calculate format=world name=world ini(overlay-distros.world)<221 +# Calculate format=world name=world ini(overlay-distros.world)<222 -#-ini(overlay-distros.world,221)-# +#-ini(overlay-distros.world,222)-# #?in(os_linux_pkglist, CLDX+)!=# media-gfx/freecad media-gfx/librecad +media-sound/ardour media-video/pitivi +www-client/vivaldi #in# #?in(os_linux_pkglist, CDS+)!=#