gentoo resync : 10.11.2017

15 files changed, 550 insertions, 175 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a220a09c6ae6..0e33f11e08c3 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,11 +6,13 @@ DIST ffmpeg-3.2.6.tar.bz2 9623111 SHA256 602b1a8c91bbc87f6e8897c0918d2bf1c7d4820
 DIST ffmpeg-3.2.7.tar.bz2 9622391 SHA256 d5a0f891ed7764876e3c2fd541adcab90641eefe9103ab4d8269a346b10ebc8a SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4 WHIRLPOOL 8c3f36cd1d254ce5ed3917d498124860bb9620a65add1a3461844565fddb6d315914d38cc9760b7e45ebe4e1818e1872eeaebe65a040dd738a5bcc6508233f7d
 DIST ffmpeg-3.3.3.tar.bz2 9940959 SHA256 1069ac8fc7f52e566bea28b41b9c437246aeb5096f82fb26fa96dc7d5a10a473 SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab WHIRLPOOL c90d2cc0d3fa7c3635a00c8039f94ff9e7b8413bd14400ddd6f1cccdc9cbbbfd2254ca2a209cefccd7e6c2f750b4594053d4c664eb2867ee208fe5657e95330b
 DIST ffmpeg-3.3.4.tar.bz2 9944256 SHA256 5ef5e9276c311c74ab2e9d301c2d7ee10e1f2cbd758c6f13d6cb9514dffbac7e SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a WHIRLPOOL b28e0c37a70f7dba8af2599861bc748b2c7f0e56ff6e7eca86f45e94b4f9318c48a1ad8d2c3c5c9446f71f5fc1f20fadd240a9e638d39337158010c2ae00ad41
+DIST ffmpeg-3.3.5.tar.bz2 9945243 SHA256 1b434cff8a327e54fd0f611420996e3419c58b795d51a5b588ace2a674f1060a SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a WHIRLPOOL d58c5df3fc3df25173a1a719f663d2821bbf283e346ddc289640cacd804e5cbc8359539f4b5931677aacb2c9e8a31d036b79492b00dbe2717c0c5563f2a2857a
 DIST ffmpeg-3.4.tar.bz2 10171702 SHA256 5d8911fe6017d00c98a359d7c8e7818e48f2c0cc2c9086a986ea8cb4d478c85e SHA512 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0 WHIRLPOOL a283b2167d3f1ef88bf853ceb5bf87e889dcf61a0af69b610c601edb10ffd88fe6bce69a4cff88cc873440923f58a26f8ecdc43cbd3ca5d790e4950d53f9e7cd
 EBUILD ffmpeg-3.2.6.ebuild 15078 SHA256 8429b0673a250afb791e7ae3e48456d88bbe42017602947957ea24714743d3e0 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869 WHIRLPOOL fb99c0c52c19fd45f997829715466b60e47d077889b30c4d64b8da98255e6006fcb62ea835c5ea68d35843bf385a15eca708d069e84737a97bff6ee1809bad9f
 EBUILD ffmpeg-3.2.7.ebuild 15083 SHA256 c5b9bcbaf74024fba519764852bcd2d800fcc740b13558c555f8ca8a1c8af49c SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e WHIRLPOOL 40092ab775c49ea1b902017ec0bab05a9bc898c88f49a7dd2061b86af89404f4b0bbd1b0f96e8f6cb2f73ec682f83d55e52de3d712d5a22f0bebdad928c4496a
 EBUILD ffmpeg-3.3.3.ebuild 16075 SHA256 69536764659767c709f17df58d698eec5593a74b932c273f3ffd9ae2e15a9e87 SHA512 037ba3846ccdc462945800af3438b4d852f026f0261c0264409f0e5960168457fd37c20bd9f332d2149bcf11af075b130fc7f27adb09fc6887e693fc86090204 WHIRLPOOL 1e28f1b0e98797acd5fe7123b83eb50818c1fb4eacd6b3aa953f776735819bfdd2ab9887457ea8b617b99af467c915eafc1d8acc12aa0d84bfbfcb71fcec0cfa
 EBUILD ffmpeg-3.3.4.ebuild 16107 SHA256 d7f48a8aa67297968bd97ff4e91095cd76db5559f46fbaa888fbb54f617b04a1 SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b WHIRLPOOL 6509b5525e8832dbe8459db8fd48f8ab66fffc5cf9bf724c675b6bd045e9b42c10065a6d9be80b78b51671f3f04ac966b7ad0ec0b659bc39f060d42cc778179f
+EBUILD ffmpeg-3.3.5.ebuild 16114 SHA256 7ae4e1fee06fd027b26e0581a2d2854214202439aae650cd9310b3f5fb2349e7 SHA512 04a231fe59a8393c2bf6094288c05a87abd2d1b36e0d55e56d755d708fcd4c6daa933abf56364b34b4addefbbda33a938d0d9fe6b74a4fafcf23c8b39200ed19 WHIRLPOOL b85799734bb36499a3450de4cb37089404cc8b4f5fb20368e8125ff485347fbad1739a43ad723984821ec4f3b3eebd64e2abaae669a8dabffeeba147f4a09276
 EBUILD ffmpeg-3.4.ebuild 15664 SHA256 c3e195e6126953e12170e8846e6952bfd326561a5c6ec6bc212553effd838ae3 SHA512 2060c89e73a059b6626505c1632f727536f711fb7b723633ac8b8c2a057776a2c7e7b1f98561585addadd6317f4ef506057033097d1c15c5553969e31d07008e WHIRLPOOL a5c034b4264f6076fb7e3b43d73ac0d4f8f177dfef9f5f274b65ce3f8a120f86aa7e46b5692a3be04b4b92f0b71380afe9a634e2602e9cedb4cb657d9ce8d723
 EBUILD ffmpeg-9999.ebuild 15671 SHA256 483e9cb1d91cb9f665f5bc5a2b7ba5cb82fed6223cddb4ac6a4e2006f75a7755 SHA512 31a985156399ca0ae0948fafb49168b76d8bd74c064c600c3630acc3be3ca78413952726bc80af6e919357ebfc43c8fd1a74d30d3e59da5ae5343cac99871f16 WHIRLPOOL b8ec3270ba4301bd1bd93945e6c178e33494eeb6f7ea20ba7a0b8dc086f4a8a1da871aeb749f73648cd4d16af2f66462103b280bc050269fb220f41dfbdf244a
 MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
diff --git a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
new file mode 100644
index 000000000000..4f1bec27fd47
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
@@ -0,0 +1,510 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sofalizer? (
+		>=sci-libs/netcdf-4.3.2-r1[hdf5]
+		>=sci-libs/hdf5-1.8.18[hl]
+	)
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/openjpeg22.patch
+	"${FILESDIR}"/openjpeg23.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r netcdf libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index a93801fd9a28..bbbb87462e2e 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,11 +1,7 @@
 AUX kaffeine-2.0.9-kf5.34.patch 691 SHA256 0ba0e2c82e01ff12ffc09ec1a4d61984c3abefb1a6e7c82362aee1951683254d SHA512 4078bd1542fd344321333d4566c0c9756b7b8bc19624a36b8dc3e622f3048304c256042c283c54b639aae23562af590355240d4bf953959a439cb1c3b54c0b3e WHIRLPOOL bbde8d778aca60178c85f0cb6291c317d8d6d90b5af01c0887e807689bd1b7a2243e75a2f53d67af25d16361b5e7364f7bb20f3c7ae4682239eb5b3f774a69c9
-DIST kaffeine-2.0.12.1.tar.xz 4412824 SHA256 abd3b4a97ae2af930f506652984198e7ec929640f8cb0a6dbb4af6555cd06ec5 SHA512 479b22ed8f11ea452e1788623cfc1e341002a00fa0a0420b8f33e5255844ca4be7d2a95ac2120e0b0793521bae937cd573186b27a803960d2728f3ae8d518137 WHIRLPOOL 030cfe7b5cb01e5c5acdafc9a3f36d2e59bbed48e203497c8c7d9d96284077e97b4b92ca4c952a4d2dce8531340777b79b45bc6c54df3130fc10cd2ee7b87030
-DIST kaffeine-2.0.12.tar.xz 4371652 SHA256 a19eb8262f1f35b013c3ea5aa66fd7cd99d624643db718d2e9d36d9dd7a796ca SHA512 e53206095e6c06a7caca3f81ab198dadb68fecf8ac5f762b39d55b22d1fe33dab558617226ea06f740a3ad8bf1693809a2a0b3e2618600a9a33a17273b6aed86 WHIRLPOOL 1dc51bcb9f1fc0621adce7e805944c336429583f98980b545b4e8050f37d4bcf253715eaa876921f16d56e70b3adba088bf6cdd584e2b0a8d50013c74cb560e7
 DIST kaffeine-2.0.13.tar.xz 4374124 SHA256 1ac52ac811a9c9e88fcd466a7df13860fcd749cd125e7d533f589e6a6ee176fd SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5 WHIRLPOOL 3748a8a01289b14a466d3d6651ade04c712350a78ae539811d01ce681b2b2afb96f0882503eccf3e4195ac474429394f874f08560300841f73bc9b9a6860273f
 DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223
-EBUILD kaffeine-2.0.12.1.ebuild 1463 SHA256 3a123d230c9c98bb409ac09732d8edbb494c92d63ff273f9f4798b916557e0bb SHA512 56617338875149ae8e217e1af458deb486c28f95d3d9789c5a43877aca16883c0e9479eb288ea92ade4e965a5f28cf6fdb20d7e8afa393167ea600fa2da37f77 WHIRLPOOL 9569c230db5e20c04c5a277f014e5cb4f8c312cd24c3fe19791f07dac1fb2b43af82da418a64c9f0d9901f52b3d69e252edfb8ece1a2346288e149b7d03d0610
-EBUILD kaffeine-2.0.12.ebuild 1244 SHA256 bbdc7f1c46a46ea01e7733d32664f3cebfe9c61c6a2164c47e003999564fbba5 SHA512 d98c56497c0780cfc260725689f7394ccd70b8e2d67029681f5277f901c75bc730b57593234e423f9cb0175f4628c65616f9fcff7a250a43bd1690c32e565d3b WHIRLPOOL d3aa2da8a2cce0d1cfe40a6a5fdf9bf3e4e859df51591b64e5233c6525233c190a0703fb6c7515f6935f6d968dffa028dac6c7f1dd975fab1feb305ca39bd6a4
-EBUILD kaffeine-2.0.13.ebuild 1424 SHA256 47e329632d8f899d3d7b4def51e23592892b82d132f0d0c2e714bffcb3e5b0d1 SHA512 65654bf1645b0e0b0e72b1c993b39c4459e426a48db19de18a466650b832a6b104129decd29b26b7d426f208bfcecbb5282739c3eb0e33423ed51732118fe149 WHIRLPOOL 95777ba2e4e713e2c4f5458f6e7492f79d9c8abe1e4d755eb928a5a0a0a0096b6c93322b80e9033a68050593ab8df07859d77bf63fb021920b8bbe4c36c213e4
+EBUILD kaffeine-2.0.13.ebuild 1431 SHA256 0c72a9f5d87a4211dbb4d4e50a95254cba45eee8e2701728306a143927537a27 SHA512 7a89677fd7a5c0f4f820da6a76037ff032ba9bb24e0a92fa529d01dfe8eea88c36830d99e311cb60b26c538ec18999a2d904688c252f50bddf7538a720bbe419 WHIRLPOOL 55dd3ff31b906948c2362c053b902326223dc9abbd746393794729d20c03a9ea649d835ad2613ce91491effe23c0fdde9d6305999af59d7cb87a2d4bb0cbb0bd
 EBUILD kaffeine-2.0.9.ebuild 1516 SHA256 750735c0795a2ef48a125a15ab10d90c00e471632e5ff373ebb52cf21a122d4e SHA512 108f38faafd1fccd302a4ebde30079ee8e2718e57e9335c473249ab4154264c99a395034c6feff9ddded6707c3d95d9885b64bad11cba1602d7afc8c78506832 WHIRLPOOL 6345d6992cdff7746601f6b243547fb60bc57f1c88bf37700ab723880df2aa0d19e008b394b4c4ba79f80160bf5bb013eebbcbff9d3404adc6a7cccc0ef5cd78
 MISC ChangeLog 6300 SHA256 8573c219c0f82aec4a82229257d1f49d8ef8bde6ac65aacd8830cfc1d10aa7ca SHA512 5c0d2711989efdc9686f8c09fef5b21c603454ffab09b83afec1d3afb531a73d778349bd233dc83d179891d5ea94e9344d8116c8163966c2695dd2210c3cdb71 WHIRLPOOL 946878b7e78b4af8acefb9365ca7dd28faf651713ab56c793d3f0eeb12ff252c2b7cdaab7dfcca0c11212e45fdb42fdd9e12670bd64e6319697b46daa64098be
 MISC ChangeLog-2015 19354 SHA256 37ee70db03aa1b08b7afaf3a54df51b0fa1a4702f1a4c269d483a095bef79175 SHA512 34bf6246e25005249fde917b52da4bd019ca382e03627a23b0761f9f6dfc3840b51a45f0f6fda60a74f36561deffa8e17ebe3875d1caecf9f102acf55972ca9d WHIRLPOOL 28fefd3e498dfbc95fe42391b1f1d6043ad63ae7e2555f9c0f69154790d539c85f149aaf7565f4691db66b8b484280a7894807efe857b4c4aa653e1f2a17c49f
diff --git a/media-video/kaffeine/kaffeine-2.0.12.1.ebuild b/media-video/kaffeine/kaffeine-2.0.12.1.ebuild
deleted file mode 100644
index 6c8e28ca7731..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-3)/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_prepare() {
-	default
-
-	if ! use handbook ; then
-		sed -i CMakeLists.txt \
-			-e "/find_package(KF5DocTools CONFIG REQUIRED)/s/^/#/" \
-			-e "/kdoctools_install(po)/s/^/#/" || die
-	fi
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.12.ebuild b/media-video/kaffeine/kaffeine-2.0.12.ebuild
deleted file mode 100644
index eedddad9fe27..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.13.ebuild b/media-video/kaffeine/kaffeine-2.0.13.ebuild
index 47799bf6d333..d6dc589879c8 100644
--- a/media-video/kaffeine/kaffeine-2.0.13.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kaffeine.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
@@ -47,7 +47,7 @@ RDEPEND="${CDEPEND}
 DOCS=( Changelog NOTES README.md )
 
 src_prepare() {
-	default
+	kde5_src_prepare
 
 	if ! use handbook ; then
 		sed -i CMakeLists.txt \
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 58d7593e376e..a0695e45cc28 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -18,7 +18,7 @@ EBUILD mpv-0.18.0-r1.ebuild 8452 SHA256 1113b8fed411f5dd3d3c4a0826f227550653bc6c
 EBUILD mpv-0.25.0-r2.ebuild 10839 SHA256 b490c7b8c8e5eb1da76d61de699fe7ab317c955df8b7bd5bc08a0e795d615f29 SHA512 04dcdc8d8e53bcb765ac3a0526fb5832e9f18b8b2616dd92a1ffa06dd4471343a46a3e2faaf14e85c477828a0e4bf91fdeeec13b87cdc253fb5b88a9bdf28007 WHIRLPOOL d5f980a2870295f12bad3546fd25aeb042b5abab1baf8bd7d629f90092f20f3287d949488f2f3a19dd3c1367354cbdf47748e8fbd40770970ccaa31adc92f992
 EBUILD mpv-0.26.0.ebuild 10557 SHA256 f67bf34142f9d20a0107e7e16036e31d63f6c462e53dd2438e6dad10e27239b9 SHA512 ffda8bdf4691643e6619334fe1b401c367c8ce7a0a3bc61494a27ad888c8121d045d22111bb98c72551a15d5dbf6e3b34252681a8642be8fa92785cb2b40944e WHIRLPOOL e6e04843b78433e096e7a36525892c2603441730bdf457286b15746e051062031373342dd046b02033d08527d010761a46536b0ab64615ddb99c208ecda6ed79
 EBUILD mpv-0.27.0.ebuild 10540 SHA256 07953548001ba9013172cfe5abed1ff6df06c6281076bb37462ebdcc5f743be1 SHA512 6ce840488391688bcb034f1dfd5f8f481c2e910f4c3fdfecb83700d890a3d4776687162afb9bd60bf6562af663a440f3dc48946bffa6fe60ad62c0d4d048032e WHIRLPOOL e6a084ebd10f8f752b176b93391417b199aa21a1f30db89ccc62c94fd112c2c298e1ff9f0bd7b8225ee2cd876ccd3b2188070b3a6da13efe1cadb70549d7bd38
-EBUILD mpv-9999.ebuild 10512 SHA256 81bb3152e0e3fd608bbf222eaa2f2a8f5953ae2e9a3d05da113f34136e07cf31 SHA512 0e4464a132d8823c154b41da707a34899a8a09d2cab38e89bf96523129c95f850a0076b35288f5f268e3e82139d6b6e1b7d61b4202041baa36b7023a0c7926a5 WHIRLPOOL b2644a782625d7cbdabc2d157eb42992fdf2eae7fb548de87d96a91a5eddfeb84dab63da2d0370e69a4e078e1a81b7ba6a2c2c60706f8ec494f0cba005738aed
+EBUILD mpv-9999.ebuild 10312 SHA256 d79bdf6d387d0212a462296323e2ed37113ef056fc7c26ac46a13c6d702d97e3 SHA512 268352b4b52a05a67b2eadc45562edc16f35ef278e687fbeff51f500b784d0c028c33f71c9ea0a368714da21196000f3b6972eda5c819293e0fd6b7b50c620f4 WHIRLPOOL 2e10fa652f33ebefc88d92c6075e4d0ebf888974872881ec1a34a2d3726913ff55b4737484d0ac7968ba5d2268ebbc4e88b1d31c2ef18f7189717f51ea86c36a
 MISC ChangeLog 48965 SHA256 d95e15045be3d79ef0ace6d692812334e9697ba7774baab2dcdc8a97f76dde97 SHA512 78581aa03d45585f41b6dc36507cdbfd7b8988e91e27d511c18e33b3805df7b090489bfa639e34c1126ce980ae008d4ae4d2a8c3e0983c1c74ac4ff22b613e5d WHIRLPOOL d83453527ea927072f94290201f5e551bf1e9a64ad8524db4ca1fcdd8445a83b90282a04208ce12ee6058dc4f02fa03ecc0f6ad3144f5379e864468e0eb33ae4
 MISC ChangeLog-2015 22373 SHA256 fdd3f85ec978ab48e4fa303b0c208cebe282154811e048b587dd5c3f59d3090d SHA512 19b4cff14ab6ffa124f150f9846a50ea83967a8c0c60818a95203cc28b8a24d681b4b51a5fb63b64b0360373f891a01f63fb5ff57e3544b596ff7122ab9c72a8 WHIRLPOOL 698e23043b869f81ce186e06f6ba684fdf6301b49bd964b76fd82819bd27de6b8ba38d02287bc39ded1832da94cecfda9560a14250831f48340fc033dadfbb59
 MISC metadata.xml 2605 SHA256 17337869e777215804da7bacd8f1ee765f44a73738dda112a9aa93ebc9dcb578 SHA512 44088b7e21ef2adb8b69cdb9b7bb3db9874f5c4cf5668d8adca219f0ae7e3b8ae6c0d329ad8489bbf3a95ec5333455d95209d897f239a9c015c6c97acb7f8826 WHIRLPOOL 047a07da6d66e79587865e990d633d9ca6f59faa7181cafce99cd72d9b662d1656a9ee02594c6bc943cebe5a30a6fce341755bc3ea9020523b26022db6ac71de
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 0323a501e934..04475a701ed4 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -57,13 +57,12 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( ~media-video/ffmpeg-${PV}:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( ~media-video/libav-${PV}:0=[encode?,threads,vaapi?,vdpau?] )
 	alsa? ( >=media-libs/alsa-lib-1.0.18 )
 	archive? ( >=app-arch/libarchive-3.0.0:= )
 	bluray? ( >=media-libs/libbluray-0.3.0:= )
 	cdda? ( dev-libs/libcdio-paranoia )
-	cuda? ( >=media-video/ffmpeg-3.3:0 )
 	drm? ( x11-libs/libdrm )
 	dvd? (
 		>=media-libs/libdvdnav-4.2.0
@@ -94,16 +93,8 @@ COMMON_DEPEND="
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[sound,threads,video] )
 	v4l? ( media-libs/libv4l )
-	vaapi? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libva[drm?,X?,wayland?]
-	)
-	vdpau? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libvdpau
-	)
+	vaapi? ( x11-libs/libva[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
 	wayland? (
 		>=dev-libs/wayland-1.6.0
 		>=x11-libs/libxkbcommon-0.3.0
@@ -140,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
 )
 
 pkg_setup() {
@@ -203,6 +193,7 @@ src_configure() {
 		--disable-vapoursynth-lazy
 		$(use_enable archive libarchive)
 
+		--enable-ffmpeg-upstream
 		--enable-libavdevice
 
 		# Audio outputs:
@@ -242,11 +233,11 @@ src_configure() {
 		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
 		--disable-mali-fbdev	# Only available in overlays.
 		$(usex opengl '' '--disable-gl')
+		--disable-vulkan		# Requires glslang and spirv-tools packaged.
+		--disable-shaderc		# Only available in overlays.
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
 		$(use_enable cuda cuda-hwaccel)
 
 		# TV features:
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index e40206cf44a8..0de2e5f7cbd8 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,7 +1,7 @@
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 SHA256 d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133 WHIRLPOOL 06fd296825c06339dd9210d626f503ab8f7bc929fa363106a166882bff3e7531ce11636dd716c1259558301c258c190a7f6e550fd39dae51dea809526b566d8d
-EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2405 SHA256 e5ba8fb84e70388af1db37a62fac305848efa338f64e59f19e62e438d359e43b SHA512 1fbf3d7f6ff0589128c985f88418ce6a6e2dd023ef481fde03dff2561b17ec922b8f492fa7d9afc010598253e19e44a3bf9b358c093d830e9702e548789ecf7b WHIRLPOOL b485d0b72892ec5a395447c22369507d3a5c38b31b0ddb66d4cac111e191d744c56167b55aae4ffe0648fcfa7482ecaa6c42246a03ee5ee2346a9281ba765b36
-EBUILD rtmpdump-2.4_p20161210.ebuild 2384 SHA256 6bae6973ae0f8c0c7910e6f6c6a8ca41d317d94f4fc57b9856a860df21333b37 SHA512 4c7e1e855d6900561a837ed67359a9613a2612951d623de935f44dd92c96cd389a58dbb042d240abfb2ed1eef3be1c97a4cdd3f2c8e3b7fe1b687baae41f1a5e WHIRLPOOL fc866f1966ac8e59729502413c52b685bea15d32a44862824ee32439e0531188daba7a8c31f2c3d69bc584495af24e2cbdaf9e5a6f4083a8235e7357d2563709
-EBUILD rtmpdump-9999.ebuild 2201 SHA256 5481a43f01674566470098fa36485f1b5e1503705f36a99d9eece5d2113f20c7 SHA512 673b263d74786088fe1b823e8be42573ebcf724471004a8cd43ac8c204f6910c3c36fb16740a8167515ee04aad370c5d8e51b38b90776664ea8234030e9e9802 WHIRLPOOL 21676ebe937eaff055936d2fe395136a3d586e9ae278a4a8adda154c4bc27470b2d07aa701a2cdb62feaf8163e9ed0129a824c90fa755f0393c59e910f8c4564
+EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2228 SHA256 93bae7f1c8031375f60f6904816c80968ef63e97c12fef49a05f5be00e139540 SHA512 468e65501ef2bf5d2f725f0424601488bd1ff1004d1736b7204de630ed933ab09afbf19d7363e373ff5be4683a47bd19147bdb6af6af2b127d5e75534ea4bc36 WHIRLPOOL eb4c4e9d2b7821afccd095e95e4572bace5c6f43a34f056017cce130b9e7d38c86085e183311417937e928807791bd94d81e9ca64ccbe4be7803b9dfc5a505a2
+EBUILD rtmpdump-2.4_p20161210.ebuild 2207 SHA256 d7899807d0353f86ca7a6a92cc0ee3a53d67af13bf3add8adabaaf5af2575c73 SHA512 21e9b261d62775f81a32f901bab6636c64424e11b3244e67a96c314c6e03f3843bd74366e8ddb4bfca8242b5434d2dc8a6976f6410127c02534607b2fc928f09 WHIRLPOOL 76a780243a7bafe15aeafa1651c617ae2b33c4cd29e9762a672a8dac4934b7d3b4846ce1a36e0c1588b7958751192a13e57eae7baa65cf221674193163a5fa4b
+EBUILD rtmpdump-9999.ebuild 2024 SHA256 6e620edab0bbe1a0653c0ff6a60691a3c144e5847fd757d0ce24041f7975cc0d SHA512 124051b461a40a907111bf04516d8e1aabaaf72966d0994f90bc6d04136cdccce18a1c5d52e4adf98541cc73d3fd0205b5d67c7236ef9daf0944f356ac5ede30 WHIRLPOOL 8623783261d2cee703c240eb7306c8aac6b05968e163e3151e5825e0790d37fd4cb8a8fa83b98fa33470cd05a79fc81e48abfb9178a5e702b57c0997e019aced
 MISC ChangeLog 5800 SHA256 615426803f182e5e04497bae1880117c8a7fb68b7777881aa1a58367400c22d4 SHA512 03089524161311d4109a4d13ff6f21f71986fb511565947fd2099513c5e74ba820259bf1d21b9f6c0a15eb3618519989b447632b0ed204369f97a1a03664d89c WHIRLPOOL 7febbdf7d5531d275969bb2442a3b36c1b2aed86b941a6147bbbb523d7f65638a40e17231360020e77ea509fc0dacef40ff228ec0b5c818b72a322a0dee84876
 MISC ChangeLog-2015 5697 SHA256 605c94792e832d5820f25e7d8fe41dd7fde5ccd3269579c7c8d9cfbe3221a0a4 SHA512 ad8aeff6ca00fda0145fdb099b99d4afdbb8b8897f943b4f21a6e96698cec0ebbc4fc8b028fc920a9f75e78ac7e732cc413a5f7a120101e6d9896c49dc882ece WHIRLPOOL 2cd753f31e15ed15ee8a7315c75a186da6e41f48cc5a7c204ee15a6ea66895389c60d1d2e72316d0e9f9be1f303a11af6480c516aaf14c2c0633519f08a7bbc2
-MISC metadata.xml 417 SHA256 eb0fb9ba4db50ecdbaf3fd19a969b1d55118ffd711acca9ac570eaa68bbee2ab SHA512 27ef2a72216f581ffc6dbcdd1b1bfd1fbdf435bcd30c03e2e4de79dc6a33d77e989465c309c0bbe452d9b84b967b48c447193faa896629433b85bbf891f49d9c WHIRLPOOL 960d74a375b5e738876c91af1d002b37a98dc1917549a32085578ffd3cc8bb1b756b3582316ac1e141faed66d5ef1eb0534dc3c81693dd00d34ece7a723fdeed
+MISC metadata.xml 335 SHA256 a642c3118bdf4e0ea46e8c7b70341c1446e7d0e589631e809590d4cbf2972b1e SHA512 c1701c821cff137b26961c0347fe30a2b992c1c288b6df7c57e6b9ef962f6e706cfd4c9047d6b526dd5af46abb4aadeda4dd6cee6c168c685d76c667fe9e1cfc WHIRLPOOL 5ee7a5a4ab11c85e31766e1062d874623e1c124ec4866abe0eef4b83c05527ae2bfbd9ad90f0a3089e5da134bc2cdf4a4b1780b803470882f8b2846e0cef6ab0
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 1abcb135fb33..724b1cb49d66 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -7,6 +7,5 @@
 </maintainer>
 <use>
 	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
-	<flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index 13ae3a45a589..5ab69865de61 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls polarssl ssl libressl"
+IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! use ssl && { use gnutls || use polarssl; }; then
-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+	if ! use ssl && use gnutls ; then
+		ewarn "USE='gnutls' is ignored without USE='ssl'."
 		ewarn "Please review the local USE flags for this package."
 	fi
 }
@@ -54,8 +53,6 @@ multilib_src_compile() {
 	if use ssl ; then
 		if use gnutls ;	then
 			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
 		else
 			crypto="OPENSSL"
 		fi
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index 89a24d3c7872..eec4bbc9a07c 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls polarssl ssl libressl"
+IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! use ssl && { use gnutls || use polarssl; }; then
-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+	if ! use ssl && use gnutls ; then
+		ewarn "USE='gnutls' is ignored without USE='ssl'."
 		ewarn "Please review the local USE flags for this package."
 	fi
 }
@@ -54,8 +53,6 @@ multilib_src_compile() {
 	if use ssl ; then
 		if use gnutls ;	then
 			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
 		else
 			crypto="OPENSSL"
 		fi
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 4d69e6e3a3c4..ccd765a7d625 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -13,19 +13,18 @@ EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="gnutls polarssl ssl libressl"
+IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! use ssl && { use gnutls || use polarssl; }; then
-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+	if ! use ssl && use gnutls ; then
+		ewarn "USE='gnutls' is ignored without USE='ssl'."
 		ewarn "Please review the local USE flags for this package."
 	fi
 }
@@ -48,8 +47,6 @@ multilib_src_compile() {
 	if use ssl ; then
 		if use gnutls ; then
 			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
 		else
 			crypto="OPENSSL"
 		fi
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index af2ed1eeda57..449ebcd84cea 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,11 +3,11 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 SHA256 98b2691ea
 AUX smplayer-16.4.0-zero-bidi.patch 489 SHA256 a61d2b36d9fd3fba0f7c1a6ad8a2fc8a1e76e70e13e8b58a1d2f21a6c53a94c6 SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 WHIRLPOOL 2cb7d823e612aa7caded97fb0872764fe11f8d145b1056228d039be2d376b2cf0cb521fcf8aaec92d76e899e61139e4d7a555ec931352ff43b1b5558f990b831
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 SHA256 dcd18b9d67c3655a835515f80b7e96f8937587f564cb1d4a717c3ef902100d99 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d WHIRLPOOL 2889a475da62c88efd698447a9f39ed5b54c36a22fa100b5bee202e50e3aae498890dd618ab22e77af78aa70124687653d0c73dc8a32ea980f8be050b95c8cbc
 DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c WHIRLPOOL eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
-DIST smplayer-17.10.0.tar.bz2 5050760 SHA256 3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 SHA512 c06f8e6043a870291cc29eba57b8bb5034fbceb19b24987751467e874a00d4e95f57933708d71375fdc38fdc32de68d77a7d9180c3eee1f9011eb1cfa421bbb0 WHIRLPOOL b4738ce430fadf60c743a05dcf1e491ec37d88a4ff83db75ac238f479a6031efe8bfd1a70af389cf2bd22cfd5236adb4e22e7c7a23321a53966e9a1f738d0db2
 DIST smplayer-17.10.2.tar.bz2 5030251 SHA256 48d2f3b72bb8881a37ab9204329160c3bdfc0bbfff248c6dc9407e2dd35b8396 SHA512 ca90d5c0143411ebb613ece4a0675eb3a1f7265b4c05f99196e9cee354fd1e903435ae6010bdef360f8d78611c640ba0061e28ff4308cbf635090346bba0268c WHIRLPOOL cc427e40dfa43ed86d0dcc663c357c46e5c7ce3c1e3313e896e9640e8bd0d9ecdb83d04ef076c464ae4dc16b11bbfe5240b23668574342ec49dcab5d8ffbff75
+DIST smplayer-17.11.0.tar.bz2 5033817 SHA256 29e4dba22bdd77bd685ff732ba64668bd92d7a1f75045b325d096bb6c45e5757 SHA512 a51b49f92da21abe0a81bb07db5b5dd13d80ee86a488783acf8bacbe389dffb7dac123780d7492d2b20cdaf6727a9672d89c7d09d18674fc142ba2aa65a21754 WHIRLPOOL 238f04841a8827baec72b79ba3ac90c36f23d2f9901024a17b8538c68af4017a92d7f4586f52f1451cbe964b90e064325ec3cfb209d566ed66d0f56c48877c89
 EBUILD smplayer-16.11.0.ebuild 3501 SHA256 8b8576a541dd209193044852c8fe75c9a4bd155f27214cf8389bb84e29dfdf8c SHA512 0e28a728350d06be20f0be25a2a11b4a3b4aae59208bbc0c9ade099fdea35bc74ae0186a64faba4d06470ce6a6269b40c597c86f02bc903dd0f6cc113dfd2f54 WHIRLPOOL 22a97e4306915b17c120da2378d2322ca7b9522405dcaa58db0a877b7a9da0209acfac8f4e9b6c96de579b41efa91cb6c70345ac85a2c63380408462605f38a4
-EBUILD smplayer-17.10.0.ebuild 2913 SHA256 bc604aa435419ac39a913848bc4c6a9d244bddf46d26cdbd892c4bd6d10d0272 SHA512 3c82575cebed11917065588c76bfb6aa0e63c95c96b59121f8d64dc14ae539d9d5184ff009d24248ca818d2ed4e2818fa91e843c4d082f29fcee1b541ae26eac WHIRLPOOL 1fed048d96edffadfd46506780f8077b3f971e7e5d19b2aa084a2c5d9419670d9ac57d9a0db064f9218039c97a946ec630316a0c9440df207506ac4120dff024
 EBUILD smplayer-17.10.2.ebuild 2913 SHA256 bc604aa435419ac39a913848bc4c6a9d244bddf46d26cdbd892c4bd6d10d0272 SHA512 3c82575cebed11917065588c76bfb6aa0e63c95c96b59121f8d64dc14ae539d9d5184ff009d24248ca818d2ed4e2818fa91e843c4d082f29fcee1b541ae26eac WHIRLPOOL 1fed048d96edffadfd46506780f8077b3f971e7e5d19b2aa084a2c5d9419670d9ac57d9a0db064f9218039c97a946ec630316a0c9440df207506ac4120dff024
+EBUILD smplayer-17.11.0.ebuild 3019 SHA256 d95ccf9e391db3e934962b37184188b743c05f3afca3a7fc33e20afb8a55f737 SHA512 66c4b82306e08ce4795c6afad4bb412f86c3a162fa4f4be499910ea78e546fc55db2878190653c988e3a949fa8b17bb823aa4f7885dc1688aa54d16773941e51 WHIRLPOOL a23462c13ce22800a0ef5ef213acfe310cf1b60b8f153c5b44f8a637b8e45e36cc4b875591689c93db6d123b0288a97abc14336b762faf5dad9cf9ebee4571f7
 MISC ChangeLog 7960 SHA256 ae73b7751f8bbeb9d6e3298ad09b35ed72435a19d157a67795a88175a78be567 SHA512 df862a10ff236132e9fcb7e481aab18a25f1de1798b0e46110a3e0f15d404b2c2a9de57c435bf2a5cb821bd1f5e7ed34bfc5c6c4d1968bccb2caec6d85fc3ba4 WHIRLPOOL e646e8a204529826ce1a5801c438d4397f0d582b235e59e9ffba4939133b6978aa876dd374e592685c532071f481d9bdbd0f0c53a364745d8d7f4d74352b6478
 MISC ChangeLog-2015 24285 SHA256 83c4080cff45223afbf5a54fca18b206de66bbfab917ad9147d9b99d1d6155a6 SHA512 9e3a4d8b82ee7fd8ec1f903eda0f6689d9fd7c04e453c93c9db3b9c4a952ccdbf9239d522a9fe3d2e96c56874902544fcdb761fb4661746d52d65de8610de77c WHIRLPOOL 8c82ed1af5e6c22458c715987f81ec3f769e23d7fd33d275aa087889e96662f57d50ef88fd9b7096c5962988d58e0df4b1133a09a2c65e3c213d7686aecbaf89
 MISC metadata.xml 1016 SHA256 f45b4e0471580f7af66e6314d87ae2d6046413fd40c39873ecc16bbe374fca5e SHA512 04fb5a1a6c330b847e43a6e6a635be5180e4bb353b28c551f39ca74c663874e36f697204d01fb0267775c04ec452fbb5409e7d5611b61bd7f883ee1f9c8b82fc WHIRLPOOL 6b113852ebdbf619c55e09127c2168ae75721113851da126fd41046ea696eccc1712ea37ecbf6f4698956c28b2663009729477629f9c08d97bbc628ec89a0f0a
diff --git a/media-video/smplayer/smplayer-17.10.0.ebuild b/media-video/smplayer/smplayer-17.11.0.ebuild
index 13741f5b2b12..2611d969dfa9 100644
--- a/media-video/smplayer/smplayer-17.10.0.ebuild
+++ b/media-video/smplayer/smplayer-17.11.0.ebuild
@@ -8,7 +8,7 @@ he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
 sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
 PLOCALE_BACKUP="en_US"
 
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-utils
 
 DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
 HOMEPAGE="http://www.smplayer.eu/"
@@ -120,3 +120,11 @@ src_install() {
 
 	default
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}