Version bump 0.7 series to latest. Drop all security affected ebuilds, effectively loosing stable on amd64 and hppa again.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 33 insertions, 581 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 8eb7830d99d9..a2bd8fda33b0 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.64 2012/03/22 01:32:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.65 2012/04/16 08:22:32 scarabeus Exp $
+
+*libav-0.7.5 (16 Apr 2012)
+
+  16 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.7.5.ebuild,
+  -libav-0.6.5.ebuild, -libav-0.7.4.ebuild, -libav-0.8.ebuild:
+  Version bump 0.7 series to latest. Drop all security affected ebuilds,
+  effectively loosing stable on amd64 and hppa again.
 
   22 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.6.5.ebuild,
   libav-0.7.4.ebuild, libav-0.8.1.ebuild, libav-0.8.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 27d9e06ad06d..79a17991a9bc 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,13 +1,29 @@
-DIST libav-0.6.5.tar.xz 3193172 RMD160 5a796c6cc6bf2b26bfda93800c010a54a5934851 SHA1 bab032f699cbac063e77030a0a2eddcc04f64888 SHA256 439491a93f3c85d6fcafb50758be5ad312f3d0795852c52c33157ea11005df7e
-DIST libav-0.7.4.tar.xz 3613872 RMD160 d6f07bb8889f69fdd282fbeb689bee9e3b7463d5 SHA1 9000cb3ec3e37bd442b9049a57b923187818a5ce SHA256 bd98dc5dc3621d6d028334233c63e44928e1453a6e03c5a8165537f11baed59a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libav-0.7.5.tar.xz 3613124 RMD160 bf14ae82900c0b37ad56ddc8496c93c72f9cf1b5 SHA1 efa8a7c258f2b82d7894b0d7d0e9e7d4b0f274e2 SHA256 4c2cbd6dcd141d8880cbb898de055ea24c4f05b529e6c14dc12c35fb49a08343
 DIST libav-0.8.1.tar.xz 3806536 RMD160 eb81841dc5845d4ba74006980e9fac4edbb23a19 SHA1 318b1fa68366b6074a70a39c485b61327539da92 SHA256 96325bb5c54c59968cb0f7498e542806836ea4e310eb9099c68dc0b0d72b5e75
-DIST libav-0.8.tar.xz 3802608 RMD160 3a37ade904fea59f1e28fe1d51f09d37f4dde50f SHA1 be662d222dd7e53243257165a6aff2274d603072 SHA256 293e8b8037d5c7cc32478f57e4b81f733b9431d538a7d48c4ba91cb8b9c9c930
-EBUILD libav-0.6.5.ebuild 7545 RMD160 efc7b1c139d88dcb928a0ae2a273be728929957a SHA1 1c5cd90e80fef99dc8c2c23858c6231b139db371 SHA256 0ba12f442a70aca6a8770642ca6f0f229dc5731e97ca3cc0629765332d701506
-EBUILD libav-0.7.4.ebuild 7947 RMD160 74530ff42700e206201904de87ac073016405b67 SHA1 f5f4dd0c2d40f9692207dbe76f74b91f33a3754d SHA256 7a72244e02370e07096f8173fa44b3c9504e4d877ce1a52e0ba7e14dc95eff9c
+EBUILD libav-0.7.5.ebuild 7961 RMD160 829161f0987f6d601d581e3407440f607646b78e SHA1 33ba602761d3ccd5bf80fcd0fa7acf0cd6eed50e SHA256 102380c09c479aec2da80a7139c22f1be57edebdb8f55e75c8063d44a1c9c1bb
 EBUILD libav-0.7.9999.ebuild 7964 RMD160 6896ecc805a44045e9f44ee188204143c028e21d SHA1 0cc6ba96ecb9bef9fcda4a1d5cb39b0887c1b01c SHA256 ef675392823269f0ffe4df42f9ce1f667543baec244307729fca0134ac0b33ee
 EBUILD libav-0.8.1.ebuild 8968 RMD160 f0a69ead326870ca0539543aed61cd8e5b615d09 SHA1 b3b8029ad6ceae65fad179dbbc6b617859bda270 SHA256 f1457bfe5efce44d65fdcf04114393add9362768974a887cafe41332f6eba946
 EBUILD libav-0.8.9999.ebuild 8971 RMD160 3dbd944487a3f397bf2e003828cbe0badf8944f8 SHA1 6d1f7abba7e543f3ba40bd23f819b13d1b55ed9f SHA256 9976f210e7850ad40842d072c46b199120c271f3507242b021b7fd04b074184d
-EBUILD libav-0.8.ebuild 8967 RMD160 b3a640c61b7d9ffab637c3a0e092d9ac32254d00 SHA1 09e72117ff8d23debac60eab87a892aef3d18c94 SHA256 4293af74d15518c172fc4947a088fa601dc2dc42b26ada667587d917fdf4efc6
 EBUILD libav-9999.ebuild 8985 RMD160 aa4aa422469b801f30ca0ae9a84da0589f4b4999 SHA1 c73aea96b65ed60f865cb37a3a1b31ffaa1cf99f SHA256 6de0e6746a099d2001bd8452a7caa8d85ca5c9ebc484c78faa08115fbb9777e8
-MISC ChangeLog 10234 RMD160 3785e4b3f8c1e39a9a84208a170ad5f03515601c SHA1 562673cd664ab76bced6baabc0ad15f318e2c03e SHA256 fb91c14e66da8032c0aeb0d30760c9914f5e4cfe77060c60c10112819fb151bc
+MISC ChangeLog 10529 RMD160 17e4a67493ddd9188529acd7a92cbe8eb13c4d4e SHA1 03bcc77a2de07e935dc1608ba13dad37020e220d SHA256 0bf2c2316cb876248de8f64182d5866b6b8091129085139863bf5cbacc2e0a21
 MISC metadata.xml 3016 RMD160 fc42812761795898df2b16a5237cb17d25e7eae0 SHA1 e3c253ef2c720e92c35a835fe13ca2be05f2a5b0 SHA256 0c095864751b4928ade42eeb6b1066ddcaa35c86c2e4f7620c76e7c7792c9047
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPi9bWAAoJEOSiRoyO7jvospQP/RY9JlWXDax2ZbYQCSGZigis
+TDUiRuuzQOGGKjttp+Avyce7hhok6rXJ0s2ex8Gcd44DXLBN94HmPvWQKzwmm10b
+0yU/Lg/6gg2xfvkLd/K2CgJek4PXlbk2uapi9yie6z00vaWAC2lrPYOpOitfJwBQ
+/Z9wF75wQmNY3nTKfZoHMlFYxiCsw/4isU2OoezLPiUBrrCdiFqbaiBXN5NarOYp
+pD6LCPJuvC9B71hJ5Dp0oQqJs4I3otdUX4wsQw8YTWhmYobYMRJm1UiPj+NlDT5+
+1M2kdUTWxHfY5nzlOdc1lGAW8T74ErXyONs/oShpD9BhRBnJd7xOQCHRm6gJLbOS
+k0HLams+/YtvSkOBpQqWnYXI/EeOvWRfehzscx6dDUIeEEaeIROM3/LOgt6kzWqp
+vogtKyWd/SvnwF8NDNm+O+spcwCpHr3is75XO9xet4FqQnEjam53Me8NhRVblIz3
+cWmS1KV+oIsbB7AdRYJFrW1FodnZDrd28emOM8zSCWcauXRI4cwxQaa/06BrTx5T
+OiUPfVY8N/0Ad3nEt9h2dFhZDGE2M4hsXejIDuYnzFLauAIBUMgAbBtYlFrau6gE
+aukX6EjnYxdNwvKOA1KQeBTryu1qKEafmaKPTiv3J4jG4ZMdETdxGAjhd9qqntNv
+R+yMdkT/QRPR6WvHsQRa
+=j/Vn
+-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.6.5.ebuild b/media-video/libav/libav-0.6.5.ebuild
deleted file mode 100644
index e52b50b5bf7f..000000000000
--- a/media-video/libav/libav-0.6.5.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.5.ebuild,v 1.4 2012/03/22 01:32:51 flameeyes Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video."
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection
-custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack
-jpeg2k +mmx +mmxext mp3 network oss pic +qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
-
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	dirac? ( media-video/dirac )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20101029 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	vaapi? ( x11-libs/libva )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
-	vpx? ( media-libs/libvpx )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	doc? ( app-text/texi2html )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-REQUIRED_USE="bindist? ( !faac )"
-
-src_prepare() {
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_LIBAV_CONF}"
-	local uses i
-
-	# enabled by default
-	uses="debug doc network vaapi zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bzip2 || myconf+=" --disable-bzlib"
-	use sdl || myconf+=" --disable-ffplay"
-
-	use custom-cflags && myconf+=" --disable-optimizations"
-	use cpudetection && myconf+=" --enable-runtime-cpudetect"
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
-	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
-	#done
-	use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
-
-	# Encoders
-	if use encode; then
-		use mp3 && myconf+=" --enable-libmp3lame"
-		use faac && myconf+=" --enable-libfaac --enable-nonfree"
-		uses="theora vorbis x264 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=" --enable-lib${i}"
-		done
-	else
-		myconf+=" --disable-encoders"
-	fi
-
-	# libavdevice options
-	use ieee1394 && myconf+=" --enable-libdc1394"
-	# 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
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf+=" --enable-pthreads"
-
-	# Decoders
-	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm dirac rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=" --enable-lib${i}"
-	done
-	use jpeg2k && myconf+=" --enable-libopenjpeg"
-
-	# CPU features
-	uses="mmx ssse3 altivec"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use mmxext || myconf+=" --disable-mmx2"
-	use 3dnow || myconf+=" --disable-amd3dnow"
-	use 3dnowext || myconf+=" --disable-amd3dnowext"
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && use x86 ; then
-		myconf+=" --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=" --enable-pic"
-
-	# 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
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf+=" --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		--enable-version3
-		--enable-postproc
-		--enable-avfilter
-		--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
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		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
-
-	cd "${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)" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake version.h
-	emake
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart
-	fi
-}
-
-src_test() {
-	local i tests
-	if use encode; then
-		tests="codectest lavftest seektest"
-		for i in ${tests}; do
-			LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${i}
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}
diff --git a/media-video/libav/libav-0.7.4.ebuild b/media-video/libav/libav-0.7.5.ebuild
index db563f869cca..098a08483dc1 100644
--- a/media-video/libav/libav-0.7.4.ebuild
+++ b/media-video/libav/libav-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.4 2012/03/22 01:32:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.5.ebuild,v 1.1 2012/04/16 08:22:32 scarabeus Exp $
 
 EAPI=4
 
@@ -84,7 +84,7 @@ DEPEND="${RDEPEND}
 # amr and aac require gpl
 REQUIRED_USE="bindist? ( !faac )
 	faac? ( !aac ) aac? ( !faac )
-	amr? ( gpl ) aac? ( gpl )"
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
deleted file mode 100644
index bb2dfefbfed0..000000000000
--- a/media-video/libav/libav-0.8.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.11 2012/03/22 01:32:51 flameeyes Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video."
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
-SLOT="0"
-[[ ${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="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
-	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
-	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
-	  oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
-	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
-	  +zlib"
-
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
-	dirac? ( media-video/dirac )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	truetype? ( media-libs/freetype )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? ( openssl? ( dev-libs/openssl )
-		   !openssl? ( net-libs/gnutls ) )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	vaapi? ( x11-libs/libva )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	doc? ( app-text/texi2html )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl )
-			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
-
-RESTRICT="test"
-
-src_prepare() {
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_LIBAV_CONF}"
-	local uses i
-
-	myconf+="
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-postproc
-		--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"
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
-	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
-	#done
-	use vdpau || myconf+=" --disable-vdpau"
-
-	use vaapi && myconf+=" --enable-vaapi"
-
-	# Encoders
-	if use encode; then
-		use mp3 && myconf+=" --enable-libmp3lame"
-		use amr && myconf+=" --enable-libvo-amrwbenc"
-		use faac && myconf+=" --enable-libfaac --enable-nonfree"
-		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="theora vorbis x264 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=" --enable-lib${i}"
-		done
-	else
-		myconf+=" --disable-encoders"
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=" --enable-libcdio"
-	use ieee1394 && myconf+=" --enable-libdc1394"
-	use pulseaudio && myconf+=" --enable-libpulse"
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=" --disable-indev=v4l"
-	use v4l || myconf+=" --disable-indev=v4l2"
-	for i in alsa oss jack; do
-		use ${i} || myconf+=" --disable-indev=${i}"
-	done
-	use X && myconf+=" --enable-x11grab"
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=" --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf+=" --enable-frei0r"
-	use truetype &&  myconf+=" --enable-libfreetype"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf+=" --enable-pthreads"
-
-	# Decoders
-	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm dirac rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=" --enable-lib${i}"
-	done
-	use jpeg2k && myconf+=" --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=" --disable-${i#*:}"
-	done
-
-	# pass the right -mfpu as extra
-	use neon && myconf+=" --extra-cflags=-mfpu=neon"
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && use x86 ; then
-		myconf+=" --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=" --enable-pic"
-
-	# 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
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf+=" --cpu=${i}"
-		break
-	done
-
-	# 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 [[ $(tc-arch) == "x86" ]]; then
-		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
-
-	cd "${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)" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake
-
-	if use qt-faststart; then
-		tc-export CC
-		emake tools/qt-faststart
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-	use doc && dodoc doc/*.html
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart
-	fi
-
-	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
-		dosym  ${i} /usr/bin/${i/av/ff}
-	done
-}
-
-pkg_postinst() {
-	elog "Please note that the programs formerly known as ffplay, ffserver"
-	elog "and ffprobe are now called avplay, avserver and avprobe."
-	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
-	elog "the legacy ffmpeg is provided for compatibility with older scripts"
-}
-
-src_test() {
-	local i tests
-	if use encode; then
-		tests="codectest lavftest seektest"
-		for i in ${tests}; do
-			LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${i}
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}