From 333338f27aec7a4bfc5f1c83e457d53fd886e100 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 18 Aug 2015 22:47:30 +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 --- .../3.2/6_ac_update_sync/world/0-ini | 2 +- .../world/create/applications | 5 +++++ .../6_ac_update_sync/world/create/graphics | 2 ++ .../6_ac_update_sync/world/create/multimedia | 4 ++++ .../3.2/6_ac_update_sync/world/create/netapps | 1 + .../3.2/6_ac_update_sync/world/create/science | 1 + .../3.2/6_ac_update_sync/world/create/tools | 1 + .../6_ac_update_sync/world/update/100-199/128 | 20 +++++++++++++++++++ 8 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/128 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 64bdca7..c95d579 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 = 127 +world = 128 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 d254a66..65510bf 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 @@ -18,6 +18,10 @@ app-text/qpdfview sci-calculators/galculator #in# +#?in(os_linux_pkglist, CLD+)!=# +app-text/kchmviewer +#in# + #?in(os_linux_pkglist, CLDX+)!=# app-editors/gvim app-i18n/poedit @@ -28,6 +32,7 @@ app-office/gnumeric app-office/scribus app-office/texmaker app-text/fbless +app-text/kchmviewer app-text/keepnote app-text/xournal dev-db/pgadmin3 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 9260323..60d04bb 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 @@ -19,6 +19,8 @@ media-gfx/digikam #?in(os_linux_pkglist, CLDX+)!=# media-gfx/blender media-gfx/darktable +media-gfx/fotowall +media-gfx/gqview media-gfx/gthumb media-gfx/inkscape media-gfx/pinta diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia index b6151b8..2aaa612 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/multimedia @@ -40,7 +40,11 @@ media-sound/audacity media-sound/easytag media-sound/qmmp media-sound/rhythmbox +media-sound/soundconverter media-video/avidemux +media-video/bombono-dvd +media-video/devede +media-video/istanbul media-video/mpv media-video/openshot media-video/totem 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 7312bce..50596ac 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 @@ -77,6 +77,7 @@ net-misc/modem-manager-gui net-misc/yandex-disk net-p2p/amule net-p2p/qbittorrent +net-p2p/linuxdcpp net-p2p/rtorrent net-p2p/transmission net-voip/ekiga diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/science b/profiles/templates/3.2/6_ac_update_sync/world/create/science index 951ba4d..e9c7eba 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/science +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/science @@ -2,4 +2,5 @@ #?in(os_linux_pkglist, CLDX+)!=# sci-astronomy/celestia +sci-chemistry/gromacs #in# 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 f951eb3..2dddc72 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 @@ -161,6 +161,7 @@ net-im/mcabber net-misc/clipgrab net-misc/putty net-news/quiterss +sys-apps/gsmartcontrol sys-auth/thinkfinger sys-power/apcupsd x11-misc/gcolor2 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/128 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/128 new file mode 100644 index 0000000..4886c94 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/128 @@ -0,0 +1,20 @@ +# Calculate format=world name=world ini(overlay-distros.world)<128 + +#-ini(overlay-distros.world,128)-# + +#?in(os_linux_pkglist, CLD+)!=# +app-text/kchmviewer +#in# + +#?in(os_linux_pkglist, CLDX+)!=# +app-text/kchmviewer +media-gfx/fotowall +media-gfx/gqview +media-sound/soundconverter +media-video/bombono-dvd +media-video/devede +media-video/istanbul +net-p2p/linuxdcpp +sci-chemistry/gromacs +sys-apps/gsmartcontrol +#in#