media-video/ffmpeg: in tree version works.

7 files changed, 0 insertions, 802 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
deleted file mode 100644
index 20f21a0d..00000000
--- a/media-video/ffmpeg/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX dirac_arith_hardened.patch 1184 SHA256 80e0ffcfd9db67f6a15df93f081e4eae24b0f6879a394c8d1ba6a29b239b62b4 SHA512 996e6439a984d87adb2f42afc00d3011324e0752bea50bf2708a701cf21ebde53ec3a2051c0c85aaa7d04a515088aa8e54d3845cdc125c5be8a3e98f2e7143d0 WHIRLPOOL 6ac462685a2eef402e583b1778f7a5c241a0a47a742b22531b5137bea4c8c977ddd2145fcb925dd0900ee79810c7dbc49c6ff1d358b77e216f33a68c790db060
-AUX ffmpeg-1.2.6-strerror_r.patch 207 SHA256 6d871e59b0258d99b70909890b060c32db362268ad72af8fa6526c3ca84bbb0a SHA512 8f8fb3a1a4519ca721f6309c5a455e1c68ae0815bea225b8cb426909ece28a4bbade7c47cf94f4388cc94173d999d05f9447389ff7301d2143303472443ba7a3 WHIRLPOOL 4aec9eb1e581d9177eb895cebc0b6fd54e50156953d8b83f010fc439ddd67bd6f4a80a5b3f2e33d25830a5307c4b64f906f33c432f3bd9cd5568bf4b494c6fe7
-AUX ladspadl.patch 723 SHA256 b660bef2bdd4ecba5c3ec04fccee16f4ed3eab0dc7f125f19ab004274df7d17a SHA512 fa2022e2ac73cdf63a7ebdcc71672123adf223b4eca4ee027974a3de380f54378d063166c7048c243ccfb2a95b8ebbd1115f010fe9e491bbdcee7896c523d790 WHIRLPOOL c2d175d1e953117365a929ba85d75b0fc5e60ae4e23a00a2998c6f62c00084a3d78becf027ef2710f8768cd7528b333dfad9dbfea049a7d2f45b5b66751e16a4
-DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
-DIST ffmpeg-2.2.14.tar.bz2 7033140 SHA256 c7e34ad8b9b12b07b469b7c0b64aad72edc70e72d924d4a04b943b3ad80ca053 SHA512 c22aa4bdaf3819c1b3210fc99e6fbcbc3b91eb77f3aeadf05a4a0b86ba6d08c40e7b7a56d3dce02ca90bfc269fa6ca89dcf748cf2693f04aa4ee72fdff43c3fe WHIRLPOOL 3c376ead8aa23ff3b43f75bd22e6798d5e1c9b42e914012fe41294b3dfdd1d1ecdbdfd8052241252b6b4f77fce624f574d20ac62cde5cd33ef18017eb4719a5f
-EBUILD ffmpeg-1.2.6-r99.ebuild 8965 SHA256 0f757677dc2fe7b8ea9cb8fb77fe490cb6db33700ede651a82bfceea2af0c4d7 SHA512 7d1fc9727dc760569069c9f468efcda68e10860c846ac00cf6545308cbd84bbcab6ed0cd844024484689cd0d210f3ff99843332a89dbb12ed3bc518827616a62 WHIRLPOOL 0b180583b96c95a19fb047137630d10b8f220c0faf7deaea2fbb819263bc4d59fef2ac9d2a552900fc5e640f485c7bfed8640d8a27c784beda17a4011ddbb7e6
-EBUILD ffmpeg-2.2.14-r99.ebuild 12661 SHA256 133ea5a880299facf68cc2c8920cabd7c998939d46785ea91e3f66576cbf7eb8 SHA512 a1999548a9566a30bfd50f2ad9b3955f35bbe531168407158a24568938a12c17e1e0ff531fa645c945d4f4693985e309e94d4d9eae16ecfafc735b2086ae74b1 WHIRLPOOL 1ffcf3034ab4c750629308ac01fcf3069e9f5ccae33166f5decff0868adabeb28a19f5080817ad663f0ad6f5604476b4f10be36476a647036f1b53d767868046
-MISC metadata.xml 3363 SHA256 3bb3c89b2b41d67f8e5634ed705607da65d3eb00739b37c117ec6fe846193e47 SHA512 eb47b0e4d6c90e6ed98c3a4138c9e3df7ea26895826e367987ac3b75dc1aa23314d4c0e7f8458bbd16e4f19f966c050872e4f570ed895ba86a0c4ab9fae0b9ef WHIRLPOOL add8dfd6ceeed938444cfee2cec031ee406acfd82ed797ef897a72f1db80ca90fd3b87565573d31c5f39b4100a10ecadb2ad8c89767190e3ad6029bca0216e9a
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
deleted file mode 100644
index 8d013abd..00000000
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.12 2014/06/08 13:01:45 ago Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
-	libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
-	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
-	truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iconv? ( virtual/libiconv )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libsoxr? ( media-libs/soxr )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-BUILD_DIR=${S}_build
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	epatch "${FILESDIR}/dirac_arith_hardened.patch"
-	epatch "${FILESDIR}/${P}-strerror_r.patch" # for musl
-	epatch_user
-}
-
-src_configure() {
-	mkdir -p "${BUILD_DIR}"
-	cd "${BUILD_DIR}"
-
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
-	use openssl && myconf="${myconf} --enable-nonfree"
-
-	# Encoders
-	if use encode
-	then
-		ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
-		for i in aacplus faac theora twolame x264 xvid; do
-			ffuse="${ffuse} ${i}:lib${i}"
-		done
-
-		# Licensing.
-		if use aac || use amr ; then
-			myconf="${myconf} --enable-version3"
-		fi
-		if use aacplus || use faac || use fdk ; then
-			myconf="${myconf} --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
-
-	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-
-	# libavfilter options
-	ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
-
-	# libswresample options
-	ffuse="${ffuse} libsoxr"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse="${ffuse} threads:pthreads"
-
-	# Decoders
-	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
-	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
-		ffuse="${ffuse} ${i}:lib${i}"
-	done
-
-	for i in ${ffuse} ; do
-		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
-	done
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		${myconf}"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	"${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)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	cd "${BUILD_DIR}"
-	emake V=1
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
-}
-
-src_install() {
-	cd "${BUILD_DIR}"
-	emake V=1 DESTDIR="${D}" install install-man
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-
-	cd "${S}"
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild
deleted file mode 100644
index e5eb797c..00000000
--- a/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.3 2015/04/11 12:09:46 zlogene Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=52.55.55
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
-	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
-	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
-	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
-	wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 )
-
-# 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="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}
-"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=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}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4 )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${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}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.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}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=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(-)] )"
-
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-# faac is license-incompatible with ffmpeg
-RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/ladspadl.patch"
-	epatch "${FILESDIR}/${PN}-1.2.6-strerror_r.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
-		vdpau zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libquvi; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	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)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/files/dirac_arith_hardened.patch b/media-video/ffmpeg/files/dirac_arith_hardened.patch
deleted file mode 100644
index 26614233..00000000
--- a/media-video/ffmpeg/files/dirac_arith_hardened.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98
-Author: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>
-Date:   Wed Apr 9 12:18:32 2014 +0200
-
-    avcodec/dirac_arith: Fix build with PIC and stack-check options
-    
-    Fixes Ticket3540
-    
-    The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
-    built with PIC and check-stack because the asm code needs 6 registers
-    and PIC and check-stack options take 1 each and x86 is quite limited
-    in this area.
-    
-    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
-diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h
-index f9a8bba..089c71a 100644
---- a/libavcodec/dirac_arith.h
-+++ b/libavcodec/dirac_arith.h
-@@ -28,6 +28,7 @@
- #ifndef AVCODEC_DIRAC_ARITH_H
- #define AVCODEC_DIRAC_ARITH_H
- 
-+#include "libavutil/x86/asm.h"
- #include "bytestream.h"
- #include "get_bits.h"
- 
-@@ -134,7 +135,7 @@ static inline int dirac_get_arith_bit(DiracArith *c, int ctx)
- 
-     range_times_prob = (c->range * prob_zero) >> 16;
- 
--#if HAVE_FAST_CMOV && HAVE_INLINE_ASM
-+#if HAVE_FAST_CMOV && HAVE_INLINE_ASM && HAVE_6REGS
-     low   -= range_times_prob << 16;
-     range -= range_times_prob;
-     bit = 0;
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch b/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
deleted file mode 100644
index bf0c8a5a..00000000
--- a/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ffmpeg-1.2.6/libavutil/error.c
-+++ b/ffmpeg-1.2.6/libavutil/error.c
-@@ -17,6 +17,7 @@
-  */
- 
- #undef _GNU_SOURCE
-+#define _POSIX_SOURCE
- #include "avutil.h"
- #include "avstring.h"
- #include "common.h"
diff --git a/media-video/ffmpeg/files/ladspadl.patch b/media-video/ffmpeg/files/ladspadl.patch
deleted file mode 100644
index 12fc9889..00000000
--- a/media-video/ffmpeg/files/ladspadl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c27dc27c50cb016d470b45c5852c884718f4769c Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Tue, 20 May 2014 20:06:28 +0200
-Subject: [PATCH] Fix build with --enable-ladspa --disable-frei0r.
-
-https://bugs.gentoo.org/show_bug.cgi?id=510516
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index b6d35ae..0848fed 100755
---- a/configure
-+++ b/configure
-@@ -2499,6 +2499,7 @@ hqdn3d_filter_deps="gpl"
- interlace_filter_deps="gpl"
- kerndeint_filter_deps="gpl"
- ladspa_filter_deps="ladspa dlopen"
-+ladspa_filter_extralibs='$ldl'
- mcdeint_filter_deps="avcodec gpl"
- movie_filter_deps="avcodec avformat"
- mp_filter_deps="gpl avcodec swscale inline_asm"
--- 
-1.9.3
-
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
deleted file mode 100644
index 2137df54..00000000
--- a/media-video/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="3dnowext">
-      Enable manually-optimised routines using the AMD 3DNow!Ex SIMD
-      instruction set, present in modern AMD CPUs.  (Check for
-      3dnowext in /proc/cpuinfo to know whether your CPU supports it).
-    </flag>
-    <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
-    <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
-    <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
-	<flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
-	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
-    <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
-	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
-    <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
-	<flag name="faac">Use external faac library for AAC encoding</flag>
-	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
-	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
-	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
-    <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
-	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
-	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
-	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
-    <flag name="mmxext">Enables mmx2 support</flag>
-    <flag name="network">Enables network streaming support</flag>
-	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
-	<flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
-    <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
-    <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
-    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
-    <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
-	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
-	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
-	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
-  </use>
-</pkgmetadata>