gentoo resync : 25.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
commit: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree: 6fce284d5bfddaf597a490ac66069d16c6a485db /media-video
parent: 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
32 files changed, 145 insertions, 4368 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 692574cba265..f3508e811242 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index caeb8cd623a3..02132e682c09 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,17 +1,7 @@
-AUX ffdiaporama-2.1-ffmpeg-2.4.patch 755 BLAKE2B 0a69dbb6ba4a6208461c1c5697fe732f2d3824e807f941e59714b6e32849c38e0919802043ffddb04f092749e821ad394079cbaa581102438ab9ed14648e7a32 SHA512 791a4885188536b4bfb5d4877783c887e1d457878c1d69d925c4e4257ae65864cc0a8eb1ab0063ea082ac13a57791147c16be80087b663fe81b1c8e68dbd8f38
-AUX ffdiaporama-2.1-ffmpeg-3.0.patch 9617 BLAKE2B b270dbbb426c39a365e46b4ba93da6cc4f4f2dd9ed01710fc964e968d61ed99d7b59cd8fbdf5b6ac50b465b921656f1396c26727adf0eb1992ec3495da7e5ed3 SHA512 427df6b22b8c758d6e47a53de0219c1b84806cbb7b9bcdacff40e797e5d52fccd2f90ddba1aabe39f1c184628309d712ca521ad33bdabd0d07caead29b407399
-AUX ffdiaporama-2.2-qt4multimedia.patch 750 BLAKE2B bc1d45a21ec546dd15d2aa8a821610c52c6abade8cb903f3d1828ec078aaeffc196f04e9e194f2d825b0ac8e68381113ae9620197978e6bc5d7756681ba921d8 SHA512 9bd9ad4e0948b1bf31635c87473c901f306556bde8d39a1e660d0f6deca714607a6231b9ab5e8b756ec40c166b2226b238b6999ffb6848ec3718cfd052087a42
-DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54 SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
-DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6 SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
-DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473
-EBUILD ffdiaporama-2.1-r1.ebuild 2275 BLAKE2B b5216e5e6c85e2184cffa8364dc73116bcb3b4cb5026561630c5090d60ea8c57aa538bde441ddda3aaeea205d3561ced5b1726fb870b51304ffc37516505b1e2 SHA512 d235e42333d57429e6e03a41df3c7168d984c4a8ddfc16ddc0614bee0c79b49e3b342c6302fae27c3c625bacf5fbf1558c76f4efa969bfc1aa361efcfda8413f
-EBUILD ffdiaporama-2.1.ebuild 2163 BLAKE2B f3594ffa917a15ea0fb609224d48d90b222037032a3bfc3c4d33a28b31bfdd3ece5a6f9ef1c067318f97c3c8bce16f241f3d095f00f16511b4acff9aa6b683c6 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52
-EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2044 BLAKE2B 4dc752cdabbd712227d197c9efe086a98d35f6152cbf1680f36e0b25874f512443dd5d93aa248c7a15609f66c1f58fd8fd87e0a4314ec7c304014878153941fe SHA512 73258f49196f2b0ed7600ac2d224575f6e6f2d5db6549cc0828da28cbd4b76a48265267790a3add57fefae4d969d67d1de6099a4a353fb59cea5800c53b8aa37
-EBUILD ffdiaporama-2.2_pre20140701.ebuild 2303 BLAKE2B 5995296adc68000b6d20b337f0d5b0c8ee76b7b8982602de7d842f699be860bf8d8795c851674f5d31836ddf14c1147d1e3ab31d7bf7ee1d62f68dea240c7453 SHA512 932d83e57f7fc6a097c46c129be6eaa69e01bf10d22481c9265eaf4d8f9eeb91359ee60709195d90db357dd76e286f363bb37f2fd0ed7c9cd10da94d052a018e
+EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979
 MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
deleted file mode 100644
index da652736f010..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.1-libav10.patch
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${P}-libav10.patch "${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
deleted file mode 100644
index 48456601fcbe..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-ffmpeg-2.4.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
index 0ec5707e0aa6..0a8509a3a0bd 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.
 LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
deleted file mode 100644
index 1d9d671b5400..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils gnome2-utils qmake-utils
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-	http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-	texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav openclipart qt5 texturemate"
-
-RDEPEND="
-	media-gfx/exiv2
-	media-libs/taglib
-	openclipart? ( media-gfx/openclipart[svg,-gzip] )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qthelp:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qtsql:4[sqlite]
-		dev-qt/qtsvg:4
-	)
-	libav? ( >=media-video/libav-11:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch "${FILESDIR}"/${PN}-${MY_PV}-qt4multimedia.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	default_src_prepare
-}
-
-src_configure() {
-	use qt5 && eqmake5 QMAKE_CFLAGS_ISYSTEM=
-	! use qt5 && eqmake4 QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	if use openclipart; then
-		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
deleted file mode 100644
index 7a8e664add37..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:02:12.592365100 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:01:59.202463800 +0100
-@@ -84,7 +84,12 @@
- #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100)
-     #define FFMPEG
-     #include "libswresample/swresample.h"
--    #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #ifdef SWR_CH_MAX
-+      #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #else
-+      #define RESAMPLE_MAX_CHANNELS 32
-+    #endif
-+    
-     #include "libavfilter/avcodec.h"
-     #include "libavfilter/buffersink.h"
-     #include "libavfilter/buffersrc.h"
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
deleted file mode 100644
index 4eb8c9704235..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 10:48:04.000000000 +0100
-+++ src/ffDiaporama/engine/cBaseMediaFile.cpp	2016-02-21 19:00:43.129114600 +0100
-@@ -113,10 +113,23 @@
- #define VC_USERDATA     0x00000008
- #define VC_FLUSHED      0x00000010
- 
--#define PIXFMT          PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXELFORMAT AVPixelFormat
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXELFORMAT PixelFormat
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT        QImage::Format_RGB888
- 
--AVFrame *ALLOCFRAME()           { return avcodec_alloc_frame(); }
-+AVFrame *ALLOCFRAME()           { return 
-+  #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    av_frame_alloc();
-+  #else
-+    avcodec_alloc_frame();
-+  #endif
-+}
-+
- void    FREEFRAME(AVFrame **Buf){ avcodec_free_frame(Buf); *Buf=NULL; }
- 
- //****************************************************************************************************************************************************************
-@@ -2402,7 +2415,7 @@
-                             AVFrame *FrameRGB=ALLOCFRAME();
-                             if ((FrameRGB)&&(!Thumbnail.isNull())) {
-                                 avpicture_fill((AVPicture *)FrameRGB,Thumbnail.bits(),PIXFMT,RealW,RealH);
--                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PixelFormat)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-+                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PIXELFORMAT)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-                                 if (img_convert_ctx!=NULL) {
-                                     int ret = sws_scale(img_convert_ctx,FrameYUV->data,FrameYUV->linesize,0,FrameYUV->height,FrameRGB->data,FrameRGB->linesize);
-                                     if (ret>0) {
-@@ -3482,7 +3495,7 @@
-         struct SwsContext *img_convert_ctx=sws_getContext(
-             Frame->width,                                                     // Src width
-             Frame->height,                                                    // Src height
--            (PixelFormat)Frame->format,                                       // Src Format
-+            (PIXELFORMAT)Frame->format,                                       // Src Format
-             W,                                                                // Destination width
-             H,                                                                // Destination height
-             PIXFMT,                                                           // Destination Format
---- src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:53:00.487286000 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:52:47.623287800 +0100
-@@ -53,7 +53,9 @@
- 
- #include <libavutil/mathematics.h>
- #include <libavutil/pixdesc.h>
--#include <libavutil/audioconvert.h>
-+#if (LIBAVUTIL_VERSION_INT<AV_VERSION_INT(54,31,100))
-+    #include <libavutil/audioconvert.h>
-+#endif
- 
- #include <libavcodec/avcodec.h>
- 
-@@ -90,10 +92,10 @@
-       #define RESAMPLE_MAX_CHANNELS 32
-     #endif
-     
--    #include "libavfilter/avcodec.h"
--    #include "libavfilter/buffersink.h"
--    #include "libavfilter/buffersrc.h"
--    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-+    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(55,17,103))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(57,24,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(57,25,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(57,0,101))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(6,31,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(4,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(2,0,101)))
-+        #define FFMPEGVERSIONINT    300
-+        #define FFMPEGVERSION       "FFmpeg 3.0 or higher"
-+    #elif     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-         #define FFMPEGVERSIONINT    210
-         #define FFMPEGVERSION       "FFmpeg 2.1 or higher"
-     #elif   ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102)))
-@@ -108,6 +110,13 @@
-     #else
-         // unsupported version
-     #endif
-+    #if (FFMPEGVERSIONINT<300)
-+      #include "libavfilter/avcodec.h"
-+    #else
-+      #include "libavcodec/avcodec.h"
-+    #endif
-+    #include "libavfilter/buffersink.h"
-+    #include "libavfilter/buffersrc.h"
- #endif
- }
- 
---- src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:19:13.935794200 +0100
-+++ src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:33:52.928215900 +0100
-@@ -20,7 +20,11 @@
- 
- #include "_EncodeVideo.h"
- 
--#define PIXFMT      PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT    QImage::Format_RGB888
- 
- //*************************************************************************************************************************************************
-@@ -410,8 +414,13 @@
-     // Setup codec parameters
-     VideoStream->codec->width               =ImageWidth;
-     VideoStream->codec->height              =ImageHeight;
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUV420P;
-+    #else
-     VideoStream->codec->pix_fmt             =PIX_FMT_YUV420P;
-+    #endif
-     VideoStream->codec->time_base           =VideoFrameRate;
-+    VideoStream->time_base                  =VideoFrameRate;
-     VideoStream->codec->sample_aspect_ratio =PixelAspectRatio;
-     VideoStream->sample_aspect_ratio        =PixelAspectRatio;
-     if ((codec->id!=AV_CODEC_ID_H264)||(!VBR)) {
-@@ -434,7 +443,11 @@
- 
-     } else if (codec->id==AV_CODEC_ID_MJPEG) {
-         //-qscale 2 -qmin 2 -qmax 2
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUVJ420P;
-+        #else
-         VideoStream->codec->pix_fmt             =PIX_FMT_YUVJ420P;
-+        #endif
-         VideoStream->codec->qmin                =2;
-         VideoStream->codec->qmax                =2;
-         VideoStream->codec->bit_rate_tolerance  =(ImageWidth*ImageHeight*2*VideoFrameRate.den/VideoFrameRate.num)*2;
-@@ -564,7 +577,11 @@
-     #endif
- 
-     // Create and prepare VideoFrame and VideoFrameBuf
--    VideoFrame=avcodec_alloc_frame();  // Allocate structure for RGB image
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoFrame=av_frame_alloc();
-+    #else
-+    VideoFrame=avcodec_alloc_frame();
-+    #endif
-     if (!VideoFrame) {
-         ToLog(LOGMSG_CRITICAL,"EncodeVideo-OpenVideoStream: avcodec_alloc_frame() failed");
-         return false;
-@@ -654,7 +671,11 @@
-         return false;
-     }
- 
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    AudioFrame=av_frame_alloc();
-+    #else
-     AudioFrame=avcodec_alloc_frame();
-+    #endif
-     if (AudioFrame==NULL) {
-         ToLog(LOGMSG_CRITICAL,QString("EncodeVideo-OpenAudioStream:: avcodec_alloc_frame failed"));
-         return false;
-@@ -1095,7 +1116,11 @@
-             if (Continue) {
-                 // Init AudioFrame
-                 AVRational AVR;
-+                #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+                av_frame_unref(AudioFrame);
-+                #else
-                 avcodec_get_frame_defaults(AudioFrame);
-+                #endif
-                 AVR.num                     =1;
-                 AVR.den                     =AudioStream->codec->sample_rate;
-                 AudioFrame->nb_samples      =DestPacketSize/DestSampleSize;
-@@ -1180,7 +1205,11 @@
-     int     errcode;
- 
-     if (Image) {
--        avcodec_get_frame_defaults(VideoFrame);
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        av_frame_unref(AudioFrame);
-+        #else
-+        avcodec_get_frame_defaults(AudioFrame);
-+        #endif
-         if (avpicture_fill(
-             (AVPicture *)VideoFrame,            // Frame to prepare
-             VideoFrameBuf,                      // Buffer which will contain the image data
-@@ -1225,9 +1254,14 @@
-         }
-     }
- 
--    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0) VideoFrame->pict_type=AV_PICTURE_TYPE_I;
--        else VideoFrame->pict_type=(AVPictureType)0;
-+    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0)
-+        VideoFrame->pict_type=AV_PICTURE_TYPE_I;
-+    else
-+        VideoFrame->pict_type=(AVPictureType)0;
-     VideoFrame->pts=VideoFrameNbr;
-+    VideoFrame->format=VideoStream->codec->pix_fmt;
-+    VideoFrame->width=VideoStream->codec->width;
-+    VideoFrame->height=VideoStream->codec->height;
- 
-     if ((Continue)&&(!StopProcessWanted)) {
- 
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
deleted file mode 100644
index 6dd0367337e2..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ffDiaporama.ori/src/ffDiaporama/ffDiaporama.pro	2014-05-04 10:33:56.000000000 +0200
-+++ ffDiaporama/src/ffDiaporama/ffDiaporama.pro	2016-12-06 00:03:27.392114339 +0100
-@@ -26,19 +26,13 @@
- 
- greaterThan(QT_MAJOR_VERSION,4) {
-     # QT5 version
--    QT += widgets concurrent help multimedia
-+    QT += widgets concurrent help
- } else {
-     # QT4 version
--    CONFIG += help mobility
--    MOBILITY = multimedia
--
--    unix {
--        INCLUDEPATH += /usr/include/QtMultimediaKit
--        INCLUDEPATH += /usr/include/QtMobility
--    }
-+    CONFIG += help multimedia
- }
- 
--QT          += core gui xml network svg sql
-+QT          += core gui xml multimedia network svg sql
- QMAKE_STRIP  = echo
- APPFOLDER    = ffDiaporama
- TARGET       = ffDiaporama
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f9d53897517c..4a880d2ec7a4 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,5 +1,3 @@
-DIST kaffeine-2.0.13.tar.xz 4374124 BLAKE2B 14e5d026cf41308e400072b53fdafdb616d4df48ee3413a1115aa4028c7c69407064278e2a60af3b7859dfefc841b09b1827278b093071df29af39491df3a736 SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5
 DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
-EBUILD kaffeine-2.0.13.ebuild 1431 BLAKE2B 6df2475430dfb14f0867ce9661fbb5e83e641554608471c23bacf78f5cbff3ffbc82304fd2cb4d3e22da82ba1b0e13f0a23b6f2c555f92f7565bfbb5c9860f1a SHA512 7a89677fd7a5c0f4f820da6a76037ff032ba9bb24e0a92fa529d01dfe8eea88c36830d99e311cb60b26c538ec18999a2d904688c252f50bddf7538a720bbe419
-EBUILD kaffeine-2.0.14.ebuild 1457 BLAKE2B 52d174f5f36a49caf1eff0f083c49f9175ab2e44c1c3a5da1ed89e17bc88b4ada9de930f6a4f79ac7fdcec9629e11fd5cb074f900c54ef16ff9302a65460b1bd SHA512 1d83100b0affa96ecddd9520b845073768459a0760b908fd97149cc8c4797043231887fd3329ef6be852e5f7f3b96adfb9d6ff33aced6013f608edac7037cdcd
-MISC metadata.xml 447 BLAKE2B a8d3f7396f9ec720f0a47f90a81218ec536edef061cdf11912caa7e99370f03061594fa8c8943eeb0b494a341c3aae6cd1460979c11f306b1a426ecab9df2e1c SHA512 e2c7a2f56b06dae76e7714fa7a2b2170b47330712bf6b9d91a22854d75469bef20e16b916678674e81ba089f920d9bd27b04cd796cabb7fc4762f79740828d7c
+EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
+MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.13.ebuild b/media-video/kaffeine/kaffeine-2.0.13.ebuild
deleted file mode 100644
index d6dc589879c8..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.13.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}/${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() {
-	kde5_src_prepare
-
-	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.14.ebuild b/media-video/kaffeine/kaffeine-2.0.14.ebuild
index 5ffcfdfea1f9..77757018422d 100644
--- a/media-video/kaffeine/kaffeine-2.0.14.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="dvb"
 
 CDEPEND="
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 81fb67df1eba..00c71c8a23d3 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/metadata.xml
@@ -9,7 +9,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kaffeine</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index cf698100782b..0e2eabef4c7d 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,30 +1,15 @@
 AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e
-DIST 0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz 736 BLAKE2B 04e7b9f1b26e3df50e89e9af4663a2765ca6a71bf52b9f931b2d194366526642cdf15b96b1bba98167c1fe1304da71528b05a4504df6153d0cbf4e3b219c0bb7 SHA512 dbdfdf7fc1d42ebd93b0853e85ba0c07d816035c126a9303e6a5656bb9faeea16f16068d7e4aa67c7c4ade8ca09f64669e67f52d7d0a2a65518fa3897d586311
-DIST 0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch 1017 BLAKE2B ec5947dc258c03a4077da898b0895693de3a35979f086d0551696616ab2f2df1e7e122ad53f93ff0fbf78782acfd0ef2a9f664a1a33f4a4d40d9072733638a1f SHA512 8cf8d1dd46a423381e70ab046e5843f13028c1d2ee14877e96339ea6a7d80d3ae5b2441b5b41ca23ba0104a5ff2d1b7e871f43680967bad0b7f242952d7b0be9
 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.3.tar.xz 4858864 BLAKE2B f029581ea013564b69257f0ba71114c489afff3705bfeb9b7dad4a5c95eb64f727ebee4127b1205d1bbca0a2f56e2ebc907d57c25a5abf02ffdaf0b20ae30004 SHA512 f25b9fb7392d5bb4df35937f79beae26bd8f6606f0ad7cdebf16963834eb9b423d882f6a3a44b5120a5d5d853c7c31bb8c3420a427cd2b360f41a48a6d5df284
-DIST libav-11.4.tar.xz 4860264 BLAKE2B 3e56751b806cdf542bf078e790085bb0599696df0646f7bab5187e7af1b008041952ceadb5e1a10a021202c84eb878a8316993eddb6973d9b22fea042114db65 SHA512 82ffe6aaccb1a19782dfcb0de641c8255531ce34ee5f49f9b8ec7f5a11c81713432aafc3a6b7c4de927eb8141ddea41f28e4e3a1ab715b943774193050fb02e7
-DIST libav-11.6.tar.xz 4860268 BLAKE2B 52bd7cce7c1bbf7550d8ebfc00b735903bad1aefe0ecff6bfe80eb23deec6702974f63ec4b50d6956a6511f8dbeb9c6ee57b74786e6f8155b958c3c507391c8d SHA512 bff3e22de93e4ab357715ae20e25b6435df52d1868c5164426a693d14fe7f54e47a46c4c62a36fbf27bd204e12f6a29a6f58016c7deaa838915d424b5ce530bd
-DIST libav-11.7.tar.xz 4861984 BLAKE2B 4191e47808b4e2827594398c33f4cd95c789379c0ec1256a18385d4570139054fbb0549c2ab45f3c20c41d2a5cb861ea439a7e76939ccfa856ea2101fc181f55 SHA512 23c6ffd0efdfa6b22c7863bf440d7469eba03a7990382fe33c8c4c7871edf250641ac536572516225679b0934e5c250ee0e2e91ea093c770a0c4c32b4776e3c5
 DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be
-DIST libav-12.1.tar.xz 5267292 BLAKE2B 4b8e5c9175aa34b2195238e16af4a21706ef18babb491c0c08d4432cb73ad576eaea55b5231af9033dc252a66b1fd51c5964b1d8ad80c85fe2600c27c332c3da SHA512 a0dd5fcc95cb62901b05b59a63ce4fcc6fb2943f0032a824ff6cfeeab2d13bd5edc65811aba1d06fe4d794119da049c52e5a9efbbc3599b445b61769992c9919
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
-DIST libav-12.tar.xz 5265280 BLAKE2B 2fca534267537343ae51bf07ce226057ec0ecef81163c81559c7492a1591b611f393b2e8026733a733c715a890137b353140743a53227f030806a1c35418c910 SHA512 55f7dd171882d191c79c6ade10f02123b8b7d897cbbd13c77766c9af944c5ba4bfbc81487966bac1ee459bc61f7a2471ddd9a3ea29b412296e9044b98440c423
 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.3-r1.ebuild 11294 BLAKE2B a89833f466c93db6a6479bbf4f6366b095e4e550d6cba8ec7e5194488bc198761bb7a3ff22e025997132fd0d96dd3ecdd06f7177fdadf17a5b728d027cf57b9c SHA512 fe16d5e1b238a9a39b4ebcfd18cc1b1609afc8d5c2d89de3e743932f5b290f3f0b42e3821faa1cebef94260add0a9595d03cc614db82a77a69e5727a9b0e0689
-EBUILD libav-11.3.ebuild 11199 BLAKE2B 313beb709725fd85d74bf93297302a7114c8142ec33e604142220978da82130b49ea9f8a1eb6fdd4e017e482bad8b6e8772d008479263288bb2019ce9e4356f3 SHA512 0c0248f1e456a00e7acb1ad4bab0158a886588cb7d4a9d9299b304196b14c9a17a436cf1367e4f46bc833664880ab5cab61c8332397205c3a393dfee46026141
-EBUILD libav-11.4.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
-EBUILD libav-11.6.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
-EBUILD libav-11.7.ebuild 11190 BLAKE2B 0eeb7c8370e3bfa932935a5ec866ce01e46b4c7bdcd5457ab73e2ee4c8cfb28462bbbce478505c5127bc9f7be077ca7a26c9fdd0291eaa11fa449c666f36d4f1 SHA512 b1212eae8f26f8579e40ebf3ac4ffd21d9ae38e4b2b1f896aa85cf45d4b781d3935ec71858e71a6fa25ff17d4d88e7be0eec14d8083ff389c3e043dd0112c3fc
 EBUILD libav-11.8.ebuild 11181 BLAKE2B b7e0f5d841c6ae3173490503d6079dccac7aee934b2d1225602d16696978a45784c5fde44866bff54afe69a95bb724f10c062bb0872dfce4d6ac431454fa397d SHA512 167c8c1c0931ea35b0661f894956969c03debff3de338d6f8b336b1cf0d2f88938cf626aa88ba91daf597394be29c2e0d622756ffd4e94f18ef3053f141851b8
 EBUILD libav-11.9999.ebuild 11141 BLAKE2B d7205d9a0d0e359b12c1e43ce315d0998dbe825fa39bc6cd02f23b142d1281a8327ca5578ced5767af43e89885509ee51e7eb2921b20f019b754b55ca7c63ada SHA512 c879c5bc09b22f77387bf62066b845d8d2e6f6e130d1a439dcc648cf7f1802df0abddcfb9a6c7f3fe11d122abe33da3726cd89eab1346fcce39730cc47f18cfe
-EBUILD libav-12.1.ebuild 11722 BLAKE2B 708f5509fb8493f5d5ca1944eea832b781d940f7841e71a2b792da72fa543afcf03adf3a35a69e1f39aa9469633d975c215978d11b6e545f354e85693dffeeec SHA512 989293bae7659082d707edbc01c1b5c6d5aa0ba31065640daa17e325887ab43cc43aee0efb64c2ab181905d7a465f0089b9052c610d7576135fdcb96107f3082
 EBUILD libav-12.2.ebuild 11522 BLAKE2B 1aaf92397a4829251a03abae83ec3b06208c490f6f80ee37aad48930771c958afe88b50656b99a4f4a0a7d889137c413a347f0a46b681e5a4aad1dbf75c8be97 SHA512 a6afb2e793af497cff59660936b2aee2ff990faade1d8af9b52aa62c2380b3229f340a7698ff892aa87c603490e6965bdf1b422124cd560d76f77b961058f062
-EBUILD libav-12.ebuild 11704 BLAKE2B 3440e462cb395fc887ad2982bf5fd4ead8b5f6bc505ad13abf9c14d94d12c7741fb63e2b9691131a408520a9aa3fe13295bf9c0002b5e09fe933b6742047cf1d SHA512 8601573882fb7170f9cc5e62f82afa87aa7e55750f8d41d8a6b50893e278837a2b31472a6a9625660248c3cd136030eed50f83afd05c8e90133d4da6d72e8a61
 EBUILD libav-13_pre20171219.ebuild 10941 BLAKE2B 80bca84307c4e999f621ddb8f495a53979221c769eec27f36ef930d5f72c4154871ee0579c8925fd0726dc24914463667625482d3d66532eccaeda0b845c28bc SHA512 ad192093c6d8897ec42af7f12009d84c4c2a0af35a1ae5fdc8569d9b86293fd3781f6858bb6e100d46790df18c81297aee0e20e90c459a01b2032a8d6dd36373
 EBUILD libav-9.17.ebuild 10192 BLAKE2B 5cba6be794e6f712aec7086805244ff6bc0e3d007844e63393f36a955508808aed89bd74e3b8a09280501785a5fa174a07b7590e6cd667b848afba5bef004e6f SHA512 c12da6532ceeb8da0eff9336727d189cd67c6a296c2597cd20e3216082a111c5baefaf329eaed3376b7c8cd6434dc56af806819df83599a61d3998114b8dbb4e
 EBUILD libav-9999.ebuild 11000 BLAKE2B c17516a7dcf3a3683b2eff1f77f72292ed3103306a94744e547ccf65a9753024480087954fafc71e1b61d3f37695344ea84fddef802a4e455feee435a963362c SHA512 575a6074f8341186c57191d95ab7f40be180fdc4f3a58b981d5ef7d7e8427556841bacd08fd28504f4f96a3e07abbf8fb2afe10b9e3058e382064ef086f6b03a
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
deleted file mode 100644
index ddd93225c964..000000000000
--- a/media-video/libav/libav-11.3-r1.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2015 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"
-	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
-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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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 "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
-	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
-
-	# 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 )
-
-	# 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.3.ebuild b/media-video/libav/libav-11.3.ebuild
deleted file mode 100644
index db8e6c4c8e99..000000000000
--- a/media-video/libav/libav-11.3.ebuild
+++ /dev/null
@@ -1,344 +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"
-	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
-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 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? ( >=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}] )
-	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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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 "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
-	epatch "${FILESDIR}"/${P}-libvpx-1.5.0.patch #565696
-
-	# 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 )
-
-	# 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.4.ebuild b/media-video/libav/libav-11.4.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.4.ebuild
+++ /dev/null
@@ -1,346 +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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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
-
-	# 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.6.ebuild b/media-video/libav/libav-11.6.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.6.ebuild
+++ /dev/null
@@ -1,346 +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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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
-
-	# 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.7.ebuild b/media-video/libav/libav-11.7.ebuild
deleted file mode 100644
index dba68568769a..000000000000
--- a/media-video/libav/libav-11.7.ebuild
+++ /dev/null
@@ -1,346 +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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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
-
-	# 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-12.1.ebuild b/media-video/libav/libav-12.1.ebuild
deleted file mode 100644
index e3d51f053751..000000000000
--- a/media-video/libav/libav-12.1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2017 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
-
-SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-# 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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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
-
-	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-
-	# 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.ebuild b/media-video/libav/libav-12.ebuild
deleted file mode 100644
index 35f9021007d8..000000000000
--- a/media-video/libav/libav-12.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2017 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
-
-SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-# 9999 does not have fate-*.tar.xz
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/12"
-[[ ${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 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 )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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
-
-	epatch "${DISTDIR}/0001-xcb-Add-all-the-libraries-to-the-link-line-explicitl.patch"
-
-	# 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 && 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/makemkv/Manifest b/media-video/makemkv/Manifest
index e39d371d8f0b..36578508f720 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,6 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
 AUX makemkv-wget.patch 1013 BLAKE2B 123152789d07f8fd0497e5fbd3f3f54108434991242a5a7665920b6007c653c5ffdb2f66467ab8ed3e1f23b7257906340cdc26282d6ba2a087b3f4632ca57f6f SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f
-DIST makemkv-bin-1.10.9.tar.gz 9115532 BLAKE2B 2e8d290d3dbdfcd560f73aeb8f286d02e34006d29fb29de817407f0e8ce9880a8af99331646b7e28b1d9e3b3101a6285848e5e28bd955c55af3cebf6e5c6e910 SHA512 36d2a7f8bace847a89dec5a821d6c6235d9e3aaffac4dbd59233a611070d30758d039a5f27fce5a857a80410d586e15d948a9b980392ba31759ccb7ca9ee6155
-DIST makemkv-oss-1.10.9.tar.gz 4572328 BLAKE2B 47667c04c05faa8438b93c97178646fd6e1db0affdf38d72982a978e9bd80a8ece2c123a55d60147c602203218f30d9e951bd2c9b41b049dd2e68ac4334d07be SHA512 cdcdd0479ff3c6600a1aba823eea3214e57bfe0d3023f8efc44ca55c8f7653931c13f3f0ad7a7c31cc97c6e2dc50974315e7dceffe9383a511cfe298938d875e
-EBUILD makemkv-1.10.9.ebuild 2910 BLAKE2B 52773c4a13197954e6efd92a2120f1f52bd33be35342cc1b54a2d250e6448947bfcba03b327629da4a43416560832b1b2d9352c1371e70fab98f2b8cc69bd508 SHA512 bf41dcc543f64a6c764d4e6639cab2dc9519f0efbcda034e4463316f084e459b4fe4a208fdbb9b3867c1058b65da5ae4a601b0f1c1ba64c335bf44ef7072fea8
+DIST makemkv-bin-1.10.10.tar.gz 9119354 BLAKE2B ed0d2031701aad5d1cc6f9ef8704a8a985ff3fdc343a9dc02310751856c336c08ba83675e3305b3e856a810176ff02d7da148a4dc1d4b9298fe62bce3c8a236f SHA512 d070ccabbcfeaab1a72f5f52cb0efa98cbd6c4c1b7d8445971d76a76c89b487b6debf0f1183af13d877e41a2d7e7deaae355fe30194a783b80704395a2a03b8e
+DIST makemkv-oss-1.10.10.tar.gz 4572400 BLAKE2B 1ac6c9605cb31f3abdc75430476c398ff01d9a9b500149b2c26a7e2c10d14be11a03b9a0ffe52f805e03b8fdbfdf22f72fa5f3ff7b23c3c24c924e95f8286d5b SHA512 5c73044c7f6a522bd8410cf6454bf38e9829cbcf83a755916242aa242477befb248be8da962b070ec99950dfba7180486fb90c34c86fc62e87485baf9fa99b13
+EBUILD makemkv-1.10.10.ebuild 2948 BLAKE2B 11a19400c703662fbe6521cb5d72ea9e93b0cb07aedc8f286c3fae94faa506f26635baa1e81a19f63f9a2de41034d3577b52e363a00997180edd8ad6a091887b SHA512 dc2c911050573eee6b26e54f34b9a982f0a6715c41c01fcd0db146e81116eee44797899dee65745945eaaa63c85deb97f046ec6ffb4c4808f51694a43629df8e
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.10.9.ebuild b/media-video/makemkv/makemkv-1.10.10.ebuild
index 9b3bdc586d57..05739fbcc6b0 100644
--- a/media-video/makemkv/makemkv-1.10.9.ebuild
+++ b/media-video/makemkv/makemkv-1.10.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils flag-o-matic
+inherit gnome2-utils flag-o-matic linux-info
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -37,6 +37,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	net-misc/wget"
 
+CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/makemkv-oss-${PV}"
 PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
 
diff --git a/media-video/mkclean/Manifest b/media-video/mkclean/Manifest
index fb8398e2bb5a..9b4d4cd18328 100644
--- a/media-video/mkclean/Manifest
+++ b/media-video/mkclean/Manifest
@@ -1,5 +1,3 @@
 DIST mkclean-0.8.10.tar.bz2 764380 BLAKE2B 94ce2f7eda5865312e6fdc48b001d824b2216625c36a3a728dd78e93444e23a02e07cacb67281f97e77009e15348c99cdfab19f1c066c4b675c124373196fae9 SHA512 8e12ac906205b14c162f0fd29d9e1a56ee854e7946706adf22c3df40376ddeb2c23a02c499d8146aeafc945381eabb96e16ca33da1323dda5929a1fc1f337892
-DIST mkclean-0.8.9.tar.bz2 739749 BLAKE2B 50a315f0c866b319e550c5a7eaa21b8454702784447e46227e06f82d2707245bce398ea850dbbdfb3d517c96c1531954044ea5b5c8f7bbf90797492f259eff27 SHA512 23cf1d6ae66089ea717a09afb02b532b3555a4e3061916c460c15a71c0834127b5650fcb663b8d06d88aa9ba45ffff0b063a4b8914d852cb1086d4b59df59b98
 EBUILD mkclean-0.8.10.ebuild 982 BLAKE2B 680c61e626456b88d0b87e8510eddf060f69c5ee27d29766787f28b35fedcb25596a6cb2d113893b65a8a64eec37f9ef493cff79602508c4fb286c1aedb53527 SHA512 380a0a9ea83757500d33ad8638b1f32a98fef1d68e97ebf2541f31f7c85f9e24a485caa64e543bb898ecca9cb074638400f017d2c4ef91e9ee035e65d9af6886
-EBUILD mkclean-0.8.9.ebuild 849 BLAKE2B 135788e9ea514c60b126dd0d3aa6d335faf08469529aca7119a016a0af94c316fb1df6707721b6121a68c0f293ce26a3b58370fa476551051683c66b7a251e18 SHA512 d7db7640bfadea73ab75a74ad9e99bc1adef241fbb910b2cd1559e436a8d8391b613e6f74076193d7231f444287a26c2fa6da95bb2f63153778ec822171c9ad8
 MISC metadata.xml 948 BLAKE2B 4aa66a16ce8416c47366bf03dc09846ddf74ccafa4559521c75f63725c7efa9c33a836671db63eec2fda997fdee713cfb6a96b57d8e356c3152721d401f461ef SHA512 c246ead2ee597aaf369567b30e4577d6865befa0ef89877f512b1e192913459800d980c84e81f43a06d006e9a8f35204c8d484713a24c2886fa39b5201d226a2
diff --git a/media-video/mkclean/mkclean-0.8.9.ebuild b/media-video/mkclean/mkclean-0.8.9.ebuild
deleted file mode 100644
index bae50b89372c..000000000000
--- a/media-video/mkclean/mkclean-0.8.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
-HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	# non-standard configure
-	./configure || die
-
-	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
-}
-
-src_compile() {
-	emake -f GNUmakefile -j1
-	emake -C mkclean -f mkWDclean.mak -j1
-	emake -C mkclean/regression -f mkcleanreg.mak -j1
-}
-
-src_install() {
-	dobin release/*/mk*clean*
-	newdoc ChangeLog.txt ChangeLog
-	newdoc ReadMe.txt README
-}
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index 7a55fd3756a2..dad7e15f1f38 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1,5 +1,3 @@
-DIST mkvalidator-0.5.1.tar.bz2 589116 BLAKE2B a634d93054726f3ef5a0d79a9800b4b1b67633820da1ce1758f6ec1d758711dd65c5211834f4b2517a7a4a6740118bd1f9b3207331bc5a3457e3d842d354b817 SHA512 236f15f2161e59b9a9923c1f9e4347069696578956d490def776e0b11339b9ba90eeb9a4b4ac85e1e506c250830e9ff3f007b52f7208c10d05180489abd1ccb9
 DIST mkvalidator-0.5.2.tar.bz2 612382 BLAKE2B a60b64902e068b82f95f61295088dbf56ab122918e46a36043246310fcf7e4a6c7f997866a8802a119e18305acbbe532acfb7cde907499168f75436b86ad7482 SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc
-EBUILD mkvalidator-0.5.1.ebuild 803 BLAKE2B b4cf6684a0d32463eae88289a1a46445c886c77e663fcf1ea56f417658588c47d955dc51c32c664e5a8fadb7c18f2bed1386078bbaa376a7e935d48a204bbd2b SHA512 7009aae1ed262265434d1b011b3e22b985bc19855631add68baa4a2b94e314a8adbe2349add03653e56ccd6342d859c832fb1d515f2ddeb85fa85f5fcbd4b76b
 EBUILD mkvalidator-0.5.2.ebuild 902 BLAKE2B c994d2bf14b6312fff948247c6482e5f6ec2dc4a1948ca98ae0fe8d928b05b4049307b9da97bf0a821cc1a97fd0abaccb2cc69c8ca56dde725607d7fed547574 SHA512 76f3b3118045d5ff688e404e5f02cad909c299a8dd62d91448b446dd84a1c3b935dc10aec9fa97ef968d062f94d94e06b3b56c59bba1cbb5497b5df404ebea9a
 MISC metadata.xml 637 BLAKE2B c103109a8fa0baa6da05fc578f9ab0ed02057f362e73a097630468291b2a8f04ea56e11c2fbe6d198a44e1d33bdc1c88e35163b8909d2686f28fca7677390a41 SHA512 5fb4d548f51476d67d42f1ef830303f45e0f6aba344f943c017a111518aa575998fa89312112dffe140681ba92a04eb98eee7d32a86ea876405bb6de67c8751b
diff --git a/media-video/mkvalidator/mkvalidator-0.5.1.ebuild b/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
deleted file mode 100644
index 07d62646f609..000000000000
--- a/media-video/mkvalidator/mkvalidator-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
-HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	tc-export CC CXX
-	# non-standard configure
-	./configure || die
-
-	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
-}
-
-src_compile() {
-	emake -j1 V=1
-}
-
-src_install() {
-	dobin release/*/mkv*
-	newdoc ChangeLog.txt ChangeLog
-	newdoc ReadMe.txt README
-}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4a28cda6ead7..a2336da9a09c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -5,13 +5,10 @@ AUX mplayer-1.2_pre20150730-encode.patch 3022 BLAKE2B ab314f4ebf8363fe0a5140886f
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
 AUX mplayer-1.3-vdpau-x11.patch 543 BLAKE2B 5e8b01243a8fd8a09389adeefadd2e3631a679138b3e50d100737703854121bb02815829dcc2ff408ad90389cba95da8ba1e4585e8c8dbd25ef52c9802f56f2e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
-DIST MPlayer-1.2.1.tar.xz 13029936 BLAKE2B 1aa7afdbfbc9319d0e4051c61f95dc15a1597d0317313a574332bd4aeb5d3c8ea61fc1aebb969047f2bb61c25a617d1c2948f4b9941d4f8a080e6bcee7282f98 SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.2.1-r1.ebuild 17429 BLAKE2B 2601b5d4536a51209233e837a689ba4d6bb9cfdae546de5466d1c9e776695478cb3ff93dcfd2f2a3b9c1202adcea45c88bdd08e9217f36ed8a84c1f7632cd433 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3
-EBUILD mplayer-1.3.0-r2.ebuild 17194 BLAKE2B 80a881f1e48cbb210b85f5a1ca206280dbf1728dbbdd812524d2b9a7603c9122caf35bc7771b23e3716032cf15cbb5a626da7352297d3f150673f8800474c744 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d
 EBUILD mplayer-1.3.0-r3.ebuild 17342 BLAKE2B 968171c2de7bdacaeedeb157f47c27cbef6cfaf19e4835914da70ed7c390acae57428fb55904eb75d8eba797c9c4f9a73418869ba9c356fac53e116d9b115381 SHA512 5bb5222df9ba043dd5ab7d251a5bb5f749274bd78d95b3fa535a104d5d196da134ac423fd8010d17df81d5b4a0707d37ce998033659bc48713b949a98e3f495d
 EBUILD mplayer-9999.ebuild 17206 BLAKE2B 56a4583ebee886adca2bc76e31e9904797f5f925d1772df7a1340898d9bf1874218d887a80a48dd5f2973fb3ff49c2d510c5a56fb0d4fe2ae41d8eccfb448f5e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/mplayer-1.2.1-r1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild
deleted file mode 100644
index da0d2b6068cb..000000000000
--- a/media-video/mplayer/mplayer-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib:0= )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
-	if has_version '>=media-video/ffmpeg-2.9'; then
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
-		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.3.0-r2.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild
deleted file mode 100644
index d6bfb7e6ba2d..000000000000
--- a/media-video/mplayer/mplayer-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,626 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-3.0:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib:0= )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="~alpha ~arm ~hppa ~ia64"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 99a3f72de221..f528d98adc47 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -4,7 +4,9 @@ AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed11
 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81
 DIST smplayer-17.12.0.tar.bz2 5040463 BLAKE2B 6171cc0071e35c001678816464c55a9c16a5978ae4cae9a428c609e4940d0d0516e7d4928e961ca1e97469d77776c7e03f8c9a5c1c6ea3597c9724a2f6ea1ada SHA512 7b09ed08cf94f03eb4f992bc1a70ba938d081410044892e55236aec791732ec34bbdd31c6cbd05aa0eeb5cab6c0bf0a7b458373157ba49eed2c6a90e0ac257d1
 DIST smplayer-18.1.0.tar.bz2 5033686 BLAKE2B e05a8044e725ddcd1a31c9209fe83abf03553d671570db0affabd55c28fa11ac7c81c853c5ac0ef7e9bb5b0d69e7924e2ef8a8f57fd07e2354b926b887c4cba8 SHA512 f0fb844634fbb22c975744cc4d557503aba7131cb52c5e1165a3ff9eec259bf45ebde5b7dfefa48d5f17e2946c1cfa0cce34429b373918f488e3f51c3398884e
+DIST smplayer-18.2.0.tar.bz2 5033848 BLAKE2B 8996707609788f48b92868421d8feee14d267119e8980da57472735bbb66f9d63df20762295d2005e9a0cc572d2c04debff3f5e59ebd0c68b649b849b709df2a SHA512 43be64b82f77b223ef885b63b1bb3302b96cb93897cbf66df6272075bcfb76dbf11091526ae2b1bcde6845e25053a31456361fbd841a4dad8d229bacfab8bdb5
 EBUILD smplayer-17.11.2.ebuild 3083 BLAKE2B 28ea91680564dd29721212de2084ba86debe81cccc258d4075d39b534526486e55ee94ddda6b9a5ce2ff12fc7d2f985ea6b2ed3b8f9e98b089faba46748b6bca SHA512 a8a9bc7e29d2a2f3a2fa08ea28a762bfe258213980fe2c2057a9ef49d096a62cd1d7e412dd0e82a277a6e4b11539514e717458c773789c747028ea450d5d0a7c
 EBUILD smplayer-17.12.0.ebuild 3085 BLAKE2B 4981f54ed4407df2f7b651dea4714cfba67c976c393a54f58d76e0710e9b8de0e42befd3b5c396ba9682f28a31ca40796369e3a6213e6870f723157eac99d085 SHA512 6337e293afb3e2c2d8543bf4659336dfb960bdae78cc619a3e2842557e2568fad88b68010f31d3ab76bbf31022eb3f131b1d57df105ba85ef0261515146c4cb9
 EBUILD smplayer-18.1.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7
+EBUILD smplayer-18.2.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.2.0.ebuild b/media-video/smplayer/smplayer-18.2.0.ebuild
new file mode 100644
index 000000000000..70deb3e4a369
--- /dev/null
+++ b/media-video/smplayer/smplayer-18.2.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+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 gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.15.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	default
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
commit	38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree	6fce284d5bfddaf597a490ac66069d16c6a485db /media-video
parent	0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)