Update for 11.3 and live, thanks to Nikoli

Package-Manager: portage-2.2.17/cvs/Linux x86_64

6 files changed, 146 insertions, 95 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 123660f9a0b6..fb7e98164fe8 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.243 2015/03/16 10:24:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.244 2015/03/17 18:55:07 lu_zero Exp $
+
+  17 Mar 2015; Luca Barbato <lu_zero@gentoo.org> libav-11.3.ebuild,
+  libav-11.9999.ebuild, libav-9999.ebuild, metadata.xml:
+  Update for 11.3 and live, thanks to Nikoli
 
   16 Mar 2015; Luca Barbato <lu_zero@gentoo.org> libav-11.3.ebuild,
   libav-11.9999.ebuild, libav-9999.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index a25a0d35a919..62ea12b29b04 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -9,10 +9,10 @@ DIST libav-9.17.tar.xz 4080028 SHA256 e32d5f152bce1de283c002a35eb6e71f265877633d
 EBUILD libav-10.5.ebuild 10367 SHA256 b7cfa219974d331103db55c353f2fac3227af7d122ceffce449a26c610a1987b SHA512 2e2689f79d2fdca3b2fe178daaf8daf824d83c054b4363a57d3c9cce8f25c729598a4277fc7780b08266c077d5104c369a5c5ee4b572f124f1e25150c1b26471 WHIRLPOOL a8f5bdf0125d0643deb3efcff89eeeab978bc6c2c640f408a9652fb6a818752f3ef2624b735a2b46b27559978eb8db1f21330faf5d1665723683ca19dc84023a
 EBUILD libav-10.9999.ebuild 10388 SHA256 70724344c51941c1337aedb41fe8c612da475e6319792df023431c6a592dbd98 SHA512 645fa6d6b52836495199bb0c853cd1b4d5fb7e3cf8d5f527ec2bc00c3af05c19d4c1ffc482f20250ba852228811fa40c45e9260f44fa0a0cb08c90559c4085c4 WHIRLPOOL acb022a3197cebab04edb539acbfc2153bd0405a5a1bfc7009ab1edb882f390abc9c3e75e72a7ba84b53a9e74c97b55526cdf457d3d74c53bfc717dcd5bdb958
 EBUILD libav-11.2.ebuild 10616 SHA256 42124947823e49bb1e21f1f0894afcd62e63cae379326b400208e4361fade063 SHA512 1d869210bb5e6a515e7cf1cae8482359adebe8af67f3f87afa758d62b0b92d855217410f4737ade3661a10c723fd1542cf95b5ed8376d8bce98b1e8366cf6d87 WHIRLPOOL 4d1a82a65ab65a8529e7097110748a2695d0b1aff7a366fa0157ac5920785c1b60aa74897a856fe0e2a54bc3ef7c7c542a0ce682e7b7fe98a7e2d4cef7362ec9
-EBUILD libav-11.3.ebuild 10627 SHA256 1ee70273cc84351660604bc9b73b3b5b3d4c6cd27ff80fb99375fbf3000eb1ec SHA512 5d70ac065e72667e9a83f17354476c6ca50fd7f19554703c85d864451e08d97ce2ad3af3edfede83884bf2354ebb01c9710f0c8d953a6df5e9cdd3760a6af6fa WHIRLPOOL aba37b6dd90a3dde235fa7977dff09def85fc85c19645a66867a1051df30eab3821730714fde2c0e27737008cdae4d78c8a06698be3df7fe536bda792322feb4
-EBUILD libav-11.9999.ebuild 10630 SHA256 f88dae1733d7ee47706c71e4128749c0780d2c101ca4db8a576197ee5f73e72c SHA512 5e4de65d2c7f8947d394e839a917db86070b4c02d145f45c7f73d1de6d4d7f11c15d60f764a900e91210707b7db9c27b7b6c6c113167794a1efd8b05e08201a0 WHIRLPOOL fe107e972fec09fa07e4bb44e15879094b52bb1bf195699df753407008b59c5c135b1c94b9da9aa674b21bd0e247760d240ba84ca698e738a705b026292af59b
+EBUILD libav-11.3.ebuild 11081 SHA256 7327493d0f24d50cb39d25ac39e216ebc356f8f95fb850c78776c4b52702404f SHA512 ee11f58a5ef2ea6f9cf4d54405495854b88f1973cce5855d0c5de39c36ce5f0f65d4afbd036f4d3a403e382c1dffdefcae73143a530b5ac356f11192c24af904 WHIRLPOOL 1ba39a0e010e84a434f439147021e3cd6c8309db2b460bf413299ea509540c5f20bc952a1be61e1d2dd9e7d8a4f45c08bd524bbfcf9d7ca081a161b9207ab8bb
+EBUILD libav-11.9999.ebuild 11083 SHA256 d2bcfac61ceceb972fc5512945cdf44cacbddd869a6746652f645e682748044f SHA512 985685870a7d003923b66bf2f0fa7048adb7bd5d286a632ec7b268740e24fdd4948488a94447fba703bd2a2535904b648c1ce77fa7e52f7b034cb01a49e5f620 WHIRLPOOL 49d724181fdbb07a2bcee11e95af4c23e590c01e51308b3d2e71176353d70fcd56a6f6152a218b77e97ecf46d5f65b807ac08eb27b2b4b7835e14d256b763f6c
 EBUILD libav-9.14.ebuild 10298 SHA256 9f6f9a255dd7d0d22e45d619e0600b76292ed117fd815cd9b7158e2e73db2e00 SHA512 6e697bc18741ed7a28d2b824f0453d3c6aaa8430f20560755d60104be2d13e8bc960cb6cf93081d236c46ecc75779c7277b00ed79c1e1d6081046fce7a1daf35 WHIRLPOOL 45de537cb07a4b455e48a8bf195903b14738a492712812ed9b099c96b6130d6a245e4a3f0715efd3c5844d5db3c4926b54f0b92fd5e7289f50955e04df292500
 EBUILD libav-9.17.ebuild 10298 SHA256 82ed31263576f7bd080c1d026e40ca1ad230d56786b97aa90f6740cf4ad40a77 SHA512 fdd52b89f16205392d601a971a4db34fc484f734ea8234699ffcd8bfa7aff6741fe71a6ad29c07d0bde54e18eab4dd5a30bd4360df6b1ef33091299028c342ea WHIRLPOOL d80678b9c4d4bd9995707bb734d20732016f4d70e910700db61942af1e94afbb7436a6946e62a07d2cc670a08a14e792b9018a8bec3837cd4a2d873ebe5e711e
-EBUILD libav-9999.ebuild 10575 SHA256 9c1b5b16febe11910ece105f6c97be057a42edeeec2b95632ea2d6fc9b93ff22 SHA512 f097950079b12231c19f22ff5ff5eb7f0882449e9dbde8d57fdaeecbedec9d4dad014047fc63674ae54956931c247dfd058d60deb17e9980369c00cd28ebcc5a WHIRLPOOL b3472eaf9543888dc941bd39c5101fa57785db72bb313f740965eddd9d4f6ca8672f7ba4486afd1b24ec8ce481166fcf6fc81b3d032c638a8493045c9a1e63e8
-MISC ChangeLog 37067 SHA256 833f32b4e7079e6b21cdf38c10bff8374151ec410d3c0a4d066379f4b21b889b SHA512 5fd6d9f62d3b09fcd6147aee06c715888b575148e995a74bfc8cc2f5e6a9cedaa14f948c5c2999bc4abfe2fa11dc94571b511fe26a661ade3171fce49fd9cccb WHIRLPOOL be5bd3298db82e76518d5e5f8c465a7afa0b5c137bd1125228238c5be18cd2bf3382895004d0d0ad09e329bfb3976520b07156a6dd85ee2812fb5e7b0b3d6513
-MISC metadata.xml 2334 SHA256 93ac6a2bd29e5bc168de0f3549974d7b642ad915dfd5ae7c08790ddc09fe879f SHA512 b3dcb8f5bff20af0dc3f9a32618490ae72f01c6d752b77f3757c01d0a7b537b328e6b8997559038cd371ae6c4dfdf50b3d43d60b1e5fba2330592685d529afdb WHIRLPOOL 4b1076320e27d1abe311599e7617025f0a7c8c37947f80cf44aa0cdb1236248a7f57d2bc1cf9c659b8617d25e0ebf1a91a27966aee3bffa46794152b3db0855d
+EBUILD libav-9999.ebuild 11030 SHA256 5365d3f27b17456e84035cfccb330874ba90e9aec74db383e83ea3a66116f4d5 SHA512 a6697542aae95de19d27df191eb628625577eff4b85f3d835f1100bd3f369b0579a95e431a3ff9edf5087d186fac4ec5c63b35a4b8e5d7f7302054ca9795da5d WHIRLPOOL fa1e58ac3cbe71166ffc44579e101544425a52885626776795bed867345e7118d7967886989a8eef366312512be5eaeb97b125de227abb253b21b6fdd39ccc0e
+MISC ChangeLog 37238 SHA256 a06f75af08e3d54a26904ee6144bdf4facdf55658314a0c410e8cfcf2b372bd0 SHA512 512e98bae6f2939a482879c0e683325b1e7985f828047881ae60f9c9b1b335f2226a8ae209b7ad708060b6c7f3c9d9dd2fa8a26eece1e03b75a1780b31549f5d WHIRLPOOL 74c4df62100323fd676c6dbc3cdb4c2536cbfae815b9580487973ca547027ff27842f5f76215cd31d7a541bc4029657fbc3b8300abd0c8026cc83b67253d3eb2
+MISC metadata.xml 2867 SHA256 3d7179c8e4d4d7c135ceb2fe6b1636a5573a83a296c1ecadad806b1526459583 SHA512 4076e607a95c596b78750ce3dc4b600a337c243f17af4098d3626a7c279be5eeb854031a2aa4817df8ff09b82215c1f9d70b07748c02abe5f82ff0b5a7fff159 WHIRLPOOL 3d1f2c70973c4de05cb2be6f716f7885682aff4ea7da424e583f9bdb9f8e05708f4f25f5c0becaeb567e22d36c961d90102acf78eb957510a90da6663981ec09
diff --git a/media-video/libav/libav-11.3.ebuild b/media-video/libav/libav-11.3.ebuild
index f5c3d2f355b6..90da07233255 100644
--- a/media-video/libav/libav-11.3.ebuild
+++ b/media-video/libav/libav-11.3.ebuild
@@ -1,45 +1,49 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.3 2015/03/16 10:24:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.4 2015/03/17 18:55:07 lu_zero Exp $
 
 EAPI=5
 
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
 if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
 	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
 	if [[ ${PV%9999} != "" ]] ; then
 		: ${EGIT_BRANCH:="release/${PV%.9999}"}
 	fi
+	inherit git-r3
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
 DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
+HOMEPAGE="https://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"
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
 fi
-
-SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )"
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/10"
+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 +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 v4l vaapi vdpau vorbis vpx X
+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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis cpu_flags_x86_avx2:avx2"
+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
@@ -48,23 +52,19 @@ 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}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	encode? (
 		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
 		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
 			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
+		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}]
@@ -75,6 +75,7 @@ RDEPEND="
 		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? (
@@ -129,7 +130,8 @@ RDEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="rtmp? ( network )
+REQUIRED_USE="
+	rtmp? ( network )
 	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
 	test? ( encode zlib )
 	fontconfig? ( truetype )
@@ -140,6 +142,12 @@ 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
 
@@ -158,6 +166,9 @@ 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)
@@ -187,11 +198,10 @@ multilib_src_configure() {
 	# Encoders
 	if use encode; then
 		use faac && myconf+=( --enable-nonfree )
-		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
 		use mp3 && myconf+=( --enable-libmp3lame )
 		use amr && myconf+=( --enable-libvo-amrwbenc )
 		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora vorbis wavpack webp x264 x265 xvid"
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=( --enable-lib${i} )
 		done
@@ -217,6 +227,7 @@ multilib_src_configure() {
 		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 )
@@ -226,6 +237,7 @@ multilib_src_configure() {
 
 	# 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} )
@@ -238,7 +250,7 @@ multilib_src_configure() {
 	done
 
 	# pass the right -mfpu as extra
-	use neon && myconf+=( --extra-cflags=-mfpu=neon )
+	use neon && append-cflags -mfpu=neon
 
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC for x86.
@@ -320,10 +332,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc Changelog README INSTALL
+	dodoc Changelog README.md INSTALL
 }
 
 multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
-		emake -j1 fate
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
 }
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
index 902989e5a36f..a1ec00449aba 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -1,45 +1,49 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v 1.4 2015/03/16 10:24:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v 1.5 2015/03/17 18:55:07 lu_zero Exp $
 
 EAPI=5
 
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
 if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
 	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
 	if [[ ${PV%9999} != "" ]] ; then
 		: ${EGIT_BRANCH:="release/${PV%.9999}"}
 	fi
+	inherit git-r3
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
 DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
+HOMEPAGE="https://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"
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
 fi
-
-SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )"
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/10"
+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 +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 v4l vaapi vdpau vorbis vpx X
+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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis cpu_flags_x86_avx2:avx2"
+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
@@ -48,23 +52,19 @@ 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}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	encode? (
 		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
 		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
 			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
+		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}]
@@ -75,6 +75,7 @@ RDEPEND="
 		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? (
@@ -129,7 +130,8 @@ RDEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="rtmp? ( network )
+REQUIRED_USE="
+	rtmp? ( network )
 	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
 	test? ( encode zlib )
 	fontconfig? ( truetype )
@@ -140,6 +142,12 @@ 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
 
@@ -158,6 +166,9 @@ 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)
@@ -187,11 +198,10 @@ multilib_src_configure() {
 	# Encoders
 	if use encode; then
 		use faac && myconf+=( --enable-nonfree )
-		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
 		use mp3 && myconf+=( --enable-libmp3lame )
 		use amr && myconf+=( --enable-libvo-amrwbenc )
 		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora vorbis wavpack webp x264 x265 xvid"
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=( --enable-lib${i} )
 		done
@@ -217,6 +227,7 @@ multilib_src_configure() {
 		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 )
@@ -226,6 +237,7 @@ multilib_src_configure() {
 
 	# 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} )
@@ -238,7 +250,7 @@ multilib_src_configure() {
 	done
 
 	# pass the right -mfpu as extra
-	use neon && myconf+=( --extra-cflags=-mfpu=neon )
+	use neon && append-cflags -mfpu=neon
 
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC for x86.
@@ -320,10 +332,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc Changelog README INSTALL
+	dodoc Changelog README.md INSTALL
 }
 
 multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
-		emake -j1 fate
-}
+	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
+}
\ No newline at end of file
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index b8b3eff19f52..52bde8529bb7 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,43 +1,49 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.79 2015/03/16 10:24:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.80 2015/03/17 18:55:07 lu_zero Exp $
 
 EAPI=5
 
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
 if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
 	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
 	if [[ ${PV%9999} != "" ]] ; then
 		: ${EGIT_BRANCH:="release/${PV%.9999}"}
 	fi
+	inherit git-r3
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
 DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
+HOMEPAGE="https://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"
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
 fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/10"
+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 +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 v4l vaapi vdpau vorbis vpx X
+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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis cpu_flags_x86_avx2:avx2"
+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
@@ -46,23 +52,19 @@ 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}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	encode? (
 		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
 		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
 			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
+		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}]
@@ -73,6 +75,7 @@ RDEPEND="
 		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? (
@@ -96,8 +99,10 @@ RDEPEND="
 	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}]
-		 >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
@@ -124,19 +129,24 @@ RDEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="rtmp? ( network )
+REQUIRED_USE="
+	rtmp? ( network )
 	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
 	test? ( encode zlib )
 	fontconfig? ( truetype )
 "
-
-# Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+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
 
@@ -155,6 +165,9 @@ 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)
@@ -184,11 +197,10 @@ multilib_src_configure() {
 	# Encoders
 	if use encode; then
 		use faac && myconf+=( --enable-nonfree )
-		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
 		use mp3 && myconf+=( --enable-libmp3lame )
 		use amr && myconf+=( --enable-libvo-amrwbenc )
 		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora vorbis wavpack webp x264 x265 xvid"
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=( --enable-lib${i} )
 		done
@@ -214,6 +226,7 @@ multilib_src_configure() {
 		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 )
@@ -223,6 +236,7 @@ multilib_src_configure() {
 
 	# 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} )
@@ -235,7 +249,7 @@ multilib_src_configure() {
 	done
 
 	# pass the right -mfpu as extra
-	use neon && myconf+=( --extra-cflags=-mfpu=neon )
+	use neon && append-cflags -mfpu=neon
 
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC for x86.
@@ -321,6 +335,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
-		emake -j1 fate
-}
+	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
+}
\ No newline at end of file
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 03235af38735..a9f4504e0231 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -8,10 +8,15 @@
 <use>
 	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
 	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
+	<flag name="armv5te">Enable optimizations for armv5te processors</flag>
+	<flag name="armv6">Enable optimizations for armv6 processors</flag>
+	<flag name="armv6t2">Enable optimizations for armv6t2 processors</flag>
+	<flag name="armvfp">Enable VFP optimizations for ARM processors</flag>
+	<flag name="bs2b">Enable <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural audio filter</flag>
 	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</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="fdk">Use external fdk-aac library for AAC encoding and decoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
 	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
@@ -24,6 +29,7 @@
 	<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="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/gnutls</pkg>.</flag>
 	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
+	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
 	<flag name="vpx">Enable vp8 encoding support using <pkg>libvpx.</pkg></flag>
 	<flag name="webp">Enable WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>