From 8df64b9685e25d6aa61fb568ba3cc96be9e9b4c1 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 6 Aug 2015 09:50:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=BB=D0=B2=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 | 7 +++++ .../6_ac_update_sync/world/create/graphics | 1 + .../6_ac_update_sync/world/create/multimedia | 2 ++ .../3.2/6_ac_update_sync/world/create/netapps | 7 +++++ .../3.2/6_ac_update_sync/world/create/tools | 5 +++- .../6_ac_update_sync/world/update/100-199/120 | 9 ------ .../6_ac_update_sync/world/update/100-199/122 | 28 +++++++++++++++++++ 8 files changed, 50 insertions(+), 11 deletions(-) delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/120 create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/122 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 8c85192..8a869dd 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 = 121 +world = 122 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 f356b24..a8c53b9 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 @@ -20,10 +20,17 @@ sci-calculators/galculator #?in(os_linux_pkglist, CLDX+)!=# app-editors/gvim +app-misc/rox-filer app-office/abiword app-office/gnumeric app-office/scribus app-office/texmaker +app-text/fbless +app-text/keepnote app-text/xournal dev-db/pgadmin3 #in# + +#?in(os_linux_pkglist, CDS+)!=# +app-text/fbless +#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 cb969db..9260323 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,7 @@ media-gfx/digikam #?in(os_linux_pkglist, CLDX+)!=# media-gfx/blender media-gfx/darktable +media-gfx/gthumb media-gfx/inkscape media-gfx/pinta #in# 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 db011de..b6151b8 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 @@ -37,7 +37,9 @@ media-radio/radiotray media-sound/alsa-utils media-sound/audacious media-sound/audacity +media-sound/easytag media-sound/qmmp +media-sound/rhythmbox media-video/avidemux media-video/mpv media-video/openshot 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 b4e0fc5..06965af 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 @@ -60,6 +60,7 @@ www-client/links net-im/choqok net-im/qutim net-irc/kvirc +www-client/rekonq #in# #?in(os_linux_pkglist, CLDX+)!=# @@ -83,4 +84,10 @@ net-voip/linphone www-client/firefox www-client/midori www-client/qupzilla +www-client/seamonkey +www-plugins/gnash +#in# + +#?in(os_linux_pkglist, CDS+)!=# +www-client/lynx #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 ecb8548..f951eb3 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 @@ -147,12 +147,13 @@ dev-lang/mono dev-python/ipython dev-qt/qt-creator dev-util/android-tools +dev-util/geany dev-util/geany-plugins mail-client/evolution mail-client/mutt mail-client/sylpheed -media-radio/fldigi media-gfx/cellwriter +media-radio/fldigi media-sound/flacon media-sound/mac media-sound/picard @@ -162,6 +163,7 @@ net-misc/putty net-news/quiterss sys-auth/thinkfinger sys-power/apcupsd +x11-misc/gcolor2 x11-misc/slim x11-misc/spacefm x11-misc/sunflower @@ -169,6 +171,7 @@ x11-misc/xsnow x11-terms/guake x11-terms/terminator x11-terms/tilda +x11-themes/geany-themes #in# #?in(os_linux_pkglist, CDS+)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/120 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/120 deleted file mode 100644 index 6894303..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/120 +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate format=world name=world ini(overlay-distros.world)<120 - -#-ini(overlay-distros.world,120)-# - -#?in(os_linux_pkglist, CLDX+)!=# -app-emulation/virtualbox-extpack-oracle -x11-misc/compton -x11-misc/pcmanfm -#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/122 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/122 new file mode 100644 index 0000000..5001c24 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/122 @@ -0,0 +1,28 @@ +# Calculate format=world name=world ini(overlay-distros.world)<122 + +#-ini(overlay-distros.world,122)-# + +#?in(os_linux_pkglist, CLD+)!=# +www-client/rekonq +#in# + +#?in(os_linux_pkglist, CLDX+)!=# +app-emulation/virtualbox-extpack-oracle +app-misc/rox-filer +app-text/keepnote +dev-util/geany +media-gfx/gthumb +media-sound/easytag +media-sound/rhythmbox +www-client/seamonkey +www-plugins/gnash +x11-misc/compton +x11-misc/gcolor2 +x11-misc/pcmanfm +x11-themes/geany-themes +#in# + +#?in(os_linux_pkglist, CDS+)!=# +app-text/fbless +www-client/lynx +#in#