From 1aa0d042cc9eb0dbeedd953ce38ef75ad62108a1 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Sat, 5 Dec 2015 02:05:40 +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/netapps | 5 ++++- .../6_ac_update_sync/world/update/200-299/{232 => 233} | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{232 => 233} (82%) 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 f914675..f73ed37 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 = 232 +world = 233 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 eecefed..c34eb0f 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 @@ -57,6 +57,10 @@ net-irc/weechat www-client/links #in# +#?in(os_linux_pkglist, CLD+, CLDX+)!=# +www-client/qupzilla +#in# + #?in(os_linux_pkglist, CLD+)!=# net-im/choqok net-im/qutim @@ -89,7 +93,6 @@ net-voip/ekiga net-voip/linphone www-client/firefox www-client/midori -www-client/qupzilla www-client/seamonkey www-client/uget www-client/vivaldi diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/232 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233 similarity index 82% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/232 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233 index 737b0d0..1cad76f 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/232 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/233 @@ -1,11 +1,15 @@ -# Calculate format=world name=world ini(overlay-distros.world)<232 +# Calculate format=world name=world ini(overlay-distros.world)<233 -#-ini(overlay-distros.world,232)-# +#-ini(overlay-distros.world,233)-# #?in(os_linux_pkglist, CLDX+, CDS+)!=# !net-p2p/bittorrent #in# +#?in(os_linux_pkglist, CLD+)!=# +www-client/qupzilla +#in# + #?in(os_linux_pkglist, CLDX+)!=# !media-sound/ardour !net-im/mcabber