Merge branch 'develop' of git.calculate.ru:/repo/calculate into develop

profiles/default/package.keywords/depends

@@ -906,8 +906,10 @@
 ~media-tv/linuxtv-dvb-apps-1.1.1.20140321 amd64 x86
 ~media-tv/plex-media-server-1.14.1 amd64
 ~media-video/baka-mplayer-2.0.4 amd64 x86
+~media-video/ffdiaporama-2.2_pre20140701 amd64 x86
 ~media-video/kamerka-0.12_p20161002 amd64 x86
 ~media-video/mkvtoolnix-18.0.0 amd64 x86
+~media-video/motion-4.1.1 amd64 x86
 ~media-video/pitivi-0.98.1 amd64 x86
 ~media-video/replex-0.1.6.8 amd64 x86
 ~media-video/subtitleeditor-0.54.0 amd64 x86

profiles/default/package.use/unnecessary-dependence

@@ -24,7 +24,7 @@ mate-extra/mate-sensors-applet -video_cards_nvidia
 media-fonts/terminus-font -pcf
 media-gfx/imagemagick -raw
 media-gfx/inkscape -spell
-media-video/ffmpeg -samba
+media-video/ffmpeg -samba -video_cards_nvidia
 net-analyzer/net-snmp -X
 net-analyzer/nmap -gtk
 net-analyzer/vnstat -gd

profiles/default/server/package.use

@@ -8,7 +8,6 @@ dev-lang/mono minimal
 dev-libs/libxml2 -icu
 media-gfx/imagemagick -djvu -svg -wmf
 media-libs/imlib2 -shm
-media-video/ffmpeg -video_cards_nvidia
 media-video/vlc -svg
 sys-kernel/calculate-sources -themes
 sys-libs/glibc -gd