From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 18 Nov 2018 09:38:27 +0000
Subject: gentoo resync : 18.11.2018

---
 media-video/libav/Manifest             |  13 +-
 media-video/libav/libav-11.8.ebuild    | 343 --------------------------------
 media-video/libav/libav-11.9999.ebuild | 340 --------------------------------
 media-video/libav/libav-12.2.ebuild    | 349 ---------------------------------
 media-video/libav/libav-12.3.ebuild    |   2 +-
 media-video/libav/libav-9.17.ebuild    | 315 -----------------------------
 media-video/libav/metadata.xml         |   1 -
 7 files changed, 3 insertions(+), 1360 deletions(-)
 delete mode 100644 media-video/libav/libav-11.8.ebuild
 delete mode 100644 media-video/libav/libav-11.9999.ebuild
 delete mode 100644 media-video/libav/libav-12.2.ebuild
 delete mode 100644 media-video/libav/libav-9.17.ebuild

(limited to 'media-video/libav')

diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 8979f27ba014..d1b85af69049 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,19 +1,10 @@
 AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e
 AUX libav-11.8-perl526.patch 575 BLAKE2B cda427336a8d2fec7dc8633bec072e7b765c586cd56fae5c6dc94bcdde0634fc2032e73d46efc2946ddafad06dead628f48c7c608c4f96fd5d9622d4b6f2d2d6 SHA512 27a3df5ae92032536c6d79074b8513aeb3dc0e781a8bad46dcea8cd4a5279bff79f21b11b651fafa1ec24515c355ca2f4e1fd4fc4e99584860d9f60aa15396ac
-DIST fate-11.tar.xz 691009480 BLAKE2B 01e1e8125d34a623b5bd4bf1da0daee96d045e73fd069cf438f471970ad4cf71df8bd3235306b3493cb547fb5ac4bb8fce416e194fec9a7e9b9de68a5a15d572 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1
-DIST fate-9.tar.xz 467671500 BLAKE2B df4ef8187f257c91b7b6c3c25c2f204c2d4a476cc73cca199ec1c8af2c4641cbb3a314e39ab38f6d8b68c5fe0b91ff1b4b592dec6b518d544806eaeaca003608 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202
-DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be
-DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
 DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
-DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
-EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
-EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
-EBUILD libav-12.2.ebuild 11366 BLAKE2B c1f4de539f14e7f9ec9ff590ae245cfa49af199352e39b7f564a50ffa8e378bc6a573003fc9dfe494e7f4981bcf78c9be7baf02d7f9aa4b8c04bfbbbf8581428 SHA512 f90ff7d2052af3332ee626b1bbf73782ee1f1f8f257f342308a775ce35ca7c4d4a30bc445df2b9e7111b33dde8e2c6d577446a3c1bb7a5a509be68b457d63349
-EBUILD libav-12.3.ebuild 11360 BLAKE2B f4ca07046e206fbb08c4dc0234c5c62c96eef967907fa414957a5fd0efe9746dfd7dc657411c4d4105e30e2e6923d70cdb7e7f23877f790e9502ce68159e4809 SHA512 1edfdfdd26002d2fe2ef54062c65d04a65480637c0b2b3c41f4761b023bf65aea52b9a80eff820aa55f62b03751be292532586ac554c20709f0492e0e76401e9
+EBUILD libav-12.3.ebuild 11357 BLAKE2B 254622da9a02900ded12738c0e6ed1b47778f9fa3a98933e44fa2850d24fd6638020d16043298efa639acf53bc936fcbd753e70107c3f5d086a019dd2f885044 SHA512 6b128ce9d52f94bd47ababe8cc6bfe96de863e30246297b6e3c76c92547bb1867b9654623126750f0e82735c2b56586c0129744c0369c22c9e71ee772319f147
 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
-EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
 EBUILD libav-9999.ebuild 10931 BLAKE2B bc46348d1336751f1b1fea3c8a294d76664db14c6d59358e7a572f668bc296865e9b162fba33df122322c49e3489d9dc810fa5f798d9fd8f1f7ead4a31bdf9bf SHA512 27d47b0442fc8f8511b14d24419666397492eca2264c02abc7931a4ffac07302056e36900954d1356da4637823745da0b96f91b908ac67c9e12a91579e1739f4
-MISC metadata.xml 2876 BLAKE2B 3dc43cf775798c9055ef8083b8c16d0c7ec4843c70520a906cde49fa834ad2705ce81245a1bcee8074f24787ff36f3793a67d3eced843384da6584d54ce5f714 SHA512 a0b2b4dac62aa9d12268458434bffb752f2dec12cb26d0c1446b1d5d60f383c67270792c54804d5c95502636e1cb1b79e9a5eb3b3caa1354827af76d154dd5cf
+MISC metadata.xml 2787 BLAKE2B 2c92b3be0e4ef7d5ca4d05871d26a4b77f0c7429dd7c54e5f8f7b713c56c57f28e138032ba5a8ee7fe6e2f4cdad23c29f1d34161c91fb0e5c4ded2d5d0802a12 SHA512 36ed399947850d92b85292731ea83e795cf37b0bd47e7c37d2802c77d30036797713acb305c127803fd7fa49fee48217f4214754d68bf9c597497c2e99aa2beb
diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
deleted file mode 100644
index 86c3ec705693..000000000000
--- a/media-video/libav/libav-11.8.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
-	epatch "${FILESDIR}"/libav-11.8-perl526.patch      #634646
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		# It is a security concern and removed in the next version
-		--disable-protocol=concat
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
deleted file mode 100644
index 7e5f92570421..000000000000
--- a/media-video/libav/libav-11.9999.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-# 9999 does not have fate-*.tar.xz
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/11"
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		# It is a security issue and will be removed in the next major version
-		--disable-protocol=concat
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
deleted file mode 100644
index d3414e7ba817..000000000000
--- a/media-video/libav/libav-12.2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	FATE_VER=${PV%%_*}
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
-fi
-
-# 9999 does not have fate-*.tar.xz
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	nvidia? ( media-video/nvidia-video-codec )
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
-	NVIDIA_LIBS="-L/opt/cuda/lib64"
-	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
-						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		use nvidia && myconf+=( --enable-nvenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && use arm && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
-}
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
index b519bf55f1a4..bdf3f3bd00d9 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild
deleted file mode 100644
index ff2da501fc7b..000000000000
--- a/media-video/libav/libav-9.17.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://${PN}.org/releases/${P}.tar.xz"
-fi
-
-SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc	+encode
-	faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
-	x264 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis"
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? (
-		>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-	)
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${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}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
-	test? ( encode zlib )
-"
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora vorbis x264 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype &&  myconf+=( --enable-libfreetype )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && myconf+=( --extra-cflags=-mfpu=neon )
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]] ; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	use doc && dodoc doc/*.html
-
-	if multilib_is_native_abi && use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-}
-
-multilib_src_test() {
-	echo ${WORKDIR}/fate
-	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
-		emake -j1 fate SAMPLES="${WORKDIR}/fate"
-}
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index dc0e04065222..b08ce591f470 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -30,7 +30,6 @@
 	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag>
 	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
 	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
-	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
 	<flag name="vpx">Enable vp8 encoding support using <pkg>media-libs/libvpx</pkg>.</flag>
 	<flag name="x265">Enable HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
 </use>
-- 
cgit v1.2.3