From 00693844789151a458c90ed08ee163b895418506 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 16 Jan 2018 16:43:36 +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=20app-admin/system-config-printer=20=D0=B2=20CLDM,=20CLD?= =?UTF-8?q?X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- profiles/templates/3.5/6_ac_update_sync/world/create/kde | 1 - .../templates/3.5/6_ac_update_sync/world/create/printer | 4 ++++ .../world/update/2018/.calculate_directory | 1 + .../3.5/6_ac_update_sync/world/update/2018/20180116 | 7 +++++++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180116 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini index ea8893c..c3f8693 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 20171206 +world = 20180116 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/kde b/profiles/templates/3.5/6_ac_update_sync/world/create/kde index fb98e6c..214eb90 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/kde +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/kde @@ -1,6 +1,5 @@ # Calculate name=world format=world in(os_linux_pkglist,CLD)!= -app-admin/system-config-printer kde-apps/akonadi-import-wizard kde-apps/ark kde-apps/dolphin diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/printer b/profiles/templates/3.5/6_ac_update_sync/world/create/printer index 1671896..f6b9d18 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.5/6_ac_update_sync/world/create/printer @@ -14,6 +14,10 @@ net-print/hplip-plugin media-gfx/xsane #in# +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +app-admin/system-config-printer +#in# + #?in(os_linux_pkglist, CLDC)!=# media-gfx/simple-scan #in# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory new file mode 100644 index 0000000..7726d50 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-distros.world)<20190101 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180116 b/profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180116 new file mode 100644 index 0000000..78c23c9 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180116 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# + +#-ini(overlay-distros.world,#-cut()-#)-# + +#?in(os_linux_pkglist, CLDM, CLDX)!=# +app-admin/system-config-printer +#in#