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#