From ad94927599301c97bae75d087df0d2e8a9ea725e Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 8 Jul 2015 23:48:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=80=D0=B5=D0=B7=D0=B0=D0=BD=20=D1=81?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B0=D0=B2=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20CMC.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=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 В CMC удалена поддержка wireless. --- .../3.2/6_ac_update_sync/world/0-ini | 2 +- .../world/create/applications | 1 + .../6_ac_update_sync/world/create/graphics | 1 + .../3.2/6_ac_update_sync/world/create/netapps | 1 + .../3.2/6_ac_update_sync/world/create/network | 2 +- .../3.2/6_ac_update_sync/world/create/tools | 11 +++++-- .../6_ac_update_sync/world/create/wireless | 4 +-- .../3.2/6_ac_update_sync/world/update/69 | 30 +++++++++++++++++++ 8 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/69 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 9461c42..f737b42 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 = 68 +world = 69 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/applications b/profiles/templates/3.2/6_ac_update_sync/world/create/applications index a48b584..eabd74d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/applications +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/applications @@ -25,4 +25,5 @@ app-office/abiword app-office/gnumeric app-office/scribus app-office/texmaker +app-text/xournal #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics index b731bd5..eb82c79 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/graphics +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/graphics @@ -17,4 +17,5 @@ media-gfx/digikam media-gfx/blender media-gfx/darktable media-gfx/inkscape +media-gfx/pinta #in# 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 02c635d..d3f23d7 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 @@ -51,6 +51,7 @@ www-client/links #in# #?in(os_linux_pkglist, CLDX+)!=# +mail-client/geary mail-client/sylpheed mail-client/thunderbird net-misc/dropbox diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network index 3188018..896baa9 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network @@ -1,6 +1,6 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX, CDS, CDS+, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDX, CDS, CDS+)!=# net-dns/bind-tools net-firewall/shorewall net-misc/ntp 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 6cbf2ec..3134aee 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 @@ -124,18 +124,25 @@ sys-process/iotop #in# #?in(os_linux_pkglist, CLDX+)!=# +app-laptop/tpb +app-laptop/tp_smapi +app-misc/anki app-misc/screen +app-mobilephone/wammu app-portage/cpuinfo2cpuflags +app-text/xournal dev-lang/mono dev-python/ipython dev-util/android-tools +dev-util/geany-plugins +media-gfx/cellwriter #in# #?in(os_linux_pkglist, CDS+)!=# +app-misc/screenfetch dev-vcs/bzr dev-vcs/cvs dev-vcs/mercurial dev-vcs/subversion +net-misc/aria2 #in# - - diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless index 5b23d66..446b9a7 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless @@ -1,12 +1,12 @@ # Calculate name=world format=world -#?in(os_linux_pkglist, CLD, CLDX, CLDX+, CLSM, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDX, CLDX+, CLSM, CLS)!=# sys-firmware/b43-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant #in# -#?in(os_linux_pkglist, CLD, CLDX, CLSM, CLS, CMC)!=# +#?in(os_linux_pkglist, CLD, CLDX, CLSM, CLS)!=# net-wireless/broadcom-sta #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/69 b/profiles/templates/3.2/6_ac_update_sync/world/update/69 new file mode 100644 index 0000000..b790be0 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/69 @@ -0,0 +1,30 @@ +# Calculate format=world name=world ini(overlay-distros.world)<69 + +#-ini(overlay-distros.world,69)-# + +#?in(os_linux_pkglist, CMC)!=# +!net-dns/bind-tools +!net-firewall/shorewall +!net-misc/ntp +!net-misc/vconfig +!net-wireless/broadcom-sta +!net-wireless/wireless-tools +!net-wireless/wpa_supplicant +!sys-firmware/b43-firmware +#in# + +#?in(os_linux_pkglist, CDS+)!=# +app-misc/screenfetch +net-misc/aria2 +#in# + +#?in(os_linux_pkglist, CLDX+)!=# +app-laptop/tpb +app-laptop/tp_smapi +app-misc/anki +app-mobilephone/wammu +dev-util/geany-plugins +mail-client/geary +media-gfx/cellwriter +media-gfx/pinta +#in#