From d2f85eadf4b85e05439e1d4fd11a30546ae73198 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 8 Dec 2015 00:46:06 +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=20adobe-flash=20=D0=B2=20=D0=B4=D0=B5=D1=81=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D0=BF=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B8=20qupzilla?= 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 +- profiles/templates/3.2/6_ac_update_sync/world/create/tools | 5 ++++- .../3.2/6_ac_update_sync/world/update/200-299/234 | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/200-299/234 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 f73ed37..8829ee1 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 = 233 +world = 234 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index 8c7e172..28b8e50 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -74,6 +74,10 @@ sys-apps/acl app-misc/mc #in# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# +www-plugins/adobe-flash +#in# + #?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CMC, CLDX+)!=# sys-devel/prelink #in# @@ -200,7 +204,6 @@ x11-terms/guake x11-terms/terminator x11-terms/tilda x11-themes/geany-themes -www-plugins/adobe-flash #in# #?in(os_linux_pkglist, CDS+)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/234 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/234 new file mode 100644 index 0000000..58cff82 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/234 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<234 + +#-ini(overlay-distros.world,234)-# + +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK)!=&&pkg(www-client/qupzilla)!=# +www-plugins/adobe-flash +#in#