Replace the virtual with USE=libav.

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

10 files changed, 325 insertions, 27 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 49d83731ef32..8e620aac4f1d 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.189 2014/10/11 13:10:50 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.190 2015/02/07 20:15:26 mgorny Exp $
+
+*gst-plugins-ffmpeg-0.10.13_p201211-r3 (07 Feb 2015)
+
+  07 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild:
+  Replace the virtual with USE=libav.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org>
   gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index cc5212ba0b40..5c717fb574dd 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -11,13 +11,26 @@ DIST gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz 14076 SHA256 5afa627ccbbe
 DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffae14f3dbf44c0b08c14bb9319fb8956c89864c6 SHA512 9067aa92ef7613b08a51957d35d1de80897c28cb959522d9b523de6f482635dac3fe421015febb88ece624b7baee0216dd4b72e770bf92c05d8994f186d2f396 WHIRLPOOL 88ba2ce647ca821ef8f7aa22d64cf39397e30d8f34eadec475e6b627472c4baf6c7de6c60d4ca86527a67c710193dc00eb6534fe8bc92f73cc26db1f8e404a49
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild 2274 SHA256 f8ba5f06837876427fae62404f5473eaf3d730959b8ade586ba27c0055aa1932 SHA512 6e7580622fc149b27fe4ec9b7c8614e90fd4a660338f8e5a32bb5aafc83bf73ca82b4cbf3112877a8fb721cca023780f3e0ace63814dd946dd36088f2fa82424 WHIRLPOOL 73ebcbb82f613f5bd0ae9414ad4eae5712444eca806b9fc50d30f9aee7c28cb9851127eaa9e9fb237802807f034534dc0d5dcb4283c6417cf2f88279b2a36374
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild 2619 SHA256 920b91dbfa6b7cdf22430022d807e0b4975a9d7dcf95aa9e7783ec87d5f909f9 SHA512 41b032d6478ef6b5e238ead218ee8e5cfeb6532c4c55d0b2b65447b79288d0dbe299db8c6b6dd4160783114dccc8696be20230453c340df0f25f73a69cba4aa5 WHIRLPOOL 6f077c7c4ed65ec863f0f90d479970da3ed9c37d4a782c8d410e71231f5d083e5449ef9d58b7511bafe7a7ee9231992e46f8e054efe2cf7189be7536f57190c2
+EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild 2636 SHA256 e10f4a892e1d782cd057dc93c0b99963c32ba7e7dce61fec6cd8cf8b1fc33596 SHA512 60f3195f7ea4e31cada68c72c27d76a55e8cbc955dd467107a86e48565a501af7a0dd581b5b4fbcc4b5dc568421f458786218ce3823233d4c4d31059df350f99 WHIRLPOOL cc5f56bbef03d339b81e9a1657f10cd6bc35ad5316e3e8df7b1c5f55ab6ce47c2494a863b14d23f0a27c3fae91e5a2906ba6eec8b08975cb8c3a492a85bed61b
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 2099 SHA256 7affaa22af3bd6e33f43eb5be31c7e10173f797415ae9600b849a21a0f31e314 SHA512 11ca18700bef6e09af5554e89e8be07bf3e05539f4ab3b1128a727078ab4349999f4166f715683e3f4fbf1f22ba7d9fe645fb48e774cd015f9bc9c129f7d63fb WHIRLPOOL 8d98d5e20138daa6d5bfd379ceffcdc455498c62854ab5e5fd8e0fd811172528553efcdcb04be7cc1bd3abd6b598ededfb8c40a9179752ade5fce771f628fd9a
-MISC ChangeLog 29202 SHA256 cd1e03312b6f0376798d2bfbbf1c95ff96af0247c308e6e9d535c70f4c0dfb51 SHA512 459574b3da48a821c5a34b474070b5e208c2b58b95a873dd98b9ff3e17315c25d18b3c0a0c339fbc96515f86846c1e131c0a2cea92358fea2fdef7ae98f554b1 WHIRLPOOL 9657231657689e9ce2299d3571fd3cd8a45bd343dc5bf88d57294256436dc524fe17c1b744c3d23d74f8c1365d560ae4bd7c3fcfd0194194bbc5be1f3a03036e
+MISC ChangeLog 29394 SHA256 92a0b44f0ec22fd18e56a962209acb21b54f04251755c25030a42e21c3c44641 SHA512 e371cdde39cebcbe521bb182ca0f9c151b23624b78c697f0001efe0038bcdc270e9b64ad60d3cfcc3ae334a098fcd41e0e5bd9a1a3a6607616a63544a7c194cd WHIRLPOOL cb49959f096e26f9637589179bd6666273448f1f6645c9ce666552796fe49be05c88e4efa8d736d52d5c99c02253d156b81b5ef603aa8b4d1fc5afee13f8efbc
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5LFwACgkQkKaRLQcq0GIIowCff8uSdsIwmgPOwKtnZxqkmLJA
-SRsAmgNJbKIQAjX/gFFGqqQ02Zw9rGOa
-=UFlX
+iQJ8BAEBCABmBQJU1nJfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObfgQAILNMioFs7NH+5mFKqmIEldn
+UVPIIN5GIQwwBD5hMhmMwNbOxxbceFG9conM2qFW7Y8DHJTMcCFAa5vuEulNw0Vj
+fQLzad2cr5VoitHDStfyfo+/pujOVUte5HiG6GppiizbBlGcs4lfR/jWSDG/EDoL
+TbOs9izv50j4H7e1iSQCAWVwM276JqcIGzaECvEfPcpZFEF+P0oWPjP5zZK/C2JN
+pU01qsN209fGqhvJ7QvZ9cW5sgV115waDCKlwiEXbARlO0Rn81/SNYpD6NyQD/Rc
+A2QPFB9gEIx8W6zUfpFPt3DItvNHMUlLoaZYm2foVRVAs7bCmdsqglcG0CbOO+XQ
+UvICUm7HbseWlulYIpiLF8mebAA4xD1emS1sKf+RaeVod+IsACC3mye1qzUovtDS
+FhA8j2Rum053phxCSxoANXhIMUIyYJuKxpgxHBJMu8Jy2nEOWnPZQfngYKYbvaCF
+eSTsotY5QXGxNgJv9ACqK4JI/pV8QhgpW4Cb0+bR7yfL7D1GZZFGbf6dW/TIitkt
+txpVJg33FtWNO+L0H0bwZ5flrVorq4GdgxEFUKxkmB1wSqgsMUpWuHFmPzcYhtEe
+vL0YgJsnroNZwp5kJNHRiQpgqz/rFj8+VWPPEuQpaCRf/LQMGpPOZA3/+UGBnn89
+9j0sAsnzRu+nnoVDpFoY
+=Ije1
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
new file mode 100644
index 000000000000..9a3d49daa005
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild,v 1.1 2015/02/07 20:15:26 mgorny Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-ffmpeg"
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
+
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-9.12:0=[${MULTILIB_USEDEP}]
+		>=media-libs/libpostproc-10.20140517-r1:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# libav-9 support backported from gst-plugins-libav-1.1.0
+	epatch ../${MY_P}-libav-9-patches/*.patch
+
+	# compat bits for older ffmpeg/libav releases
+	epatch "${FILESDIR}/${PV}-channel_layout.patch" \
+		"${FILESDIR}/${PV}-iscodec.patch" \
+		"${FILESDIR}/${PV}-coma.patch" \
+		"${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
+
+	# compatibility with recent releases
+	if has_version '>=media-video/ffmpeg-1.1' || has_version '>=media-video/libav-9' ; then
+		epatch "${FILESDIR}/${PV}-planaraudio.patch"
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/ffmpeg/*.{c,h}
+		epatch "${FILESDIR}/${PV}-ffmpeg2.patch"
+	fi
+}
+
+multilib_src_configure() {
+	# always use system ffmpeg if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-system-ffmpeg \
+		$(use_enable orc)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if ! use libav; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encounter any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}
diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index bdd5f4e575ac..cf478ff09661 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.56 2015/02/04 13:02:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.57 2015/02/07 20:17:43 mgorny Exp $
+
+*gst-plugins-libav-1.4.5-r1 (07 Feb 2015)
+*gst-plugins-libav-1.2.4-r1 (07 Feb 2015)
+
+  07 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +gst-plugins-libav-1.2.4-r1.ebuild, +gst-plugins-libav-1.4.5-r1.ebuild:
+  Replace the virtual with USE=libav.
 
   04 Feb 2015; Pacho Ramos <pacho@gentoo.org> gst-plugins-libav-1.4.5.ebuild:
   Add a bug reference
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 617daada681d..a5f23180c711 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,14 +6,28 @@ AUX gst-plugins-libav-1.2.4-fix-memory-leak.patch 3064 SHA256 cbe0f73e83847fcce3
 AUX gst-plugins-libav-1.4.5-libav9.patch 5978 SHA256 537e3f7288c65304be32385810d3989a9003cdceb406691e5506067f55fbddb5 SHA512 6c8913ea81434a7bfe7e4d71fd1173ed44b5b56d1ae8ecf365d53910b8afe5c1f8cb60834e156f234f559ca52671da5787134cffedbdcde40a9b7eea12dc5269 WHIRLPOOL ff5d6cf64e38e267e59a75c26d9d982301e2362d5d0b2462f8f5cdcafd539c1db3392b99ec46f512a256eb4eda84c4aa60e711c2146846b1403e8a547fce9686
 DIST gst-libav-1.2.4.tar.xz 4580144 SHA256 2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037 SHA512 64b24f0995865bc736946ad0709b37d6557ce1b91359371c7aaf48d02a0cb486f3bf90b72f483c8ccb661cd5fb637564809bc92d070ad901576bae5b17db0273 WHIRLPOOL 94948887c9ff642ab7e87695acb19b2a210946dd1938776d7d653017fc5231c9144e48c3d467f8c893513a29976d4e8b88457ed44bb0849cdb6f721e1ea576b0
 DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
+EBUILD gst-plugins-libav-1.2.4-r1.ebuild 2309 SHA256 3f06a1adaa6ecccf297f2ae7873f453bd3913fcad6bdb0dc32a3b4e50bd17fa6 SHA512 8fdf38e49fb9ac2f24663b7567966992a2d2f0ab69db6ada50270eae052dcc9504b633582424d12790f1222688b98ee2dedb3b5aa9d67b12df6db9cfe3e5f14b WHIRLPOOL b83b8d4fdc911eac175024742d164c52418a57968d3d181b80c7b24a790e74c4e338cc4783623baed9caf1023e398a09836f75e489440bef6ba2afed54f3e64d
 EBUILD gst-plugins-libav-1.2.4.ebuild 2207 SHA256 5dd8e51ff6fbce709db841785b27822ad6aa2069bcb4519d6491f810d66dd848 SHA512 e6d83a86f37761c1164f9699b832a767f5f0cef20c05347a5a5765ec58d20abdbfc429fcef64cb380a9181ec80e221548e1b8b0234913c6efd99d4b9ab21b5b4 WHIRLPOOL 1cc677312c74acdd52ae08002a6b1adfcd1a1f64a3d31c1aa718e0f7d8e2e1d5fb84a8625a65fdab0a66ac603b28fa1e14c868b316c6affbc26e9faec5090b88
+EBUILD gst-plugins-libav-1.4.5-r1.ebuild 1697 SHA256 b74212bfa879a731e5c124319b0ff1493824f36f1beb67a7c8047672e3486736 SHA512 e1d0515113dc9040d0504e4ca07f6fb12522b11cc22d2bc8421df2bacbbc76338192126edee53b1af287e03024a9cfb88ba5563cd709dcf8ce6fe41608e82156 WHIRLPOOL 771c1f42940515147f4a0c4f3787262912f49a2ba19e87921d446055e614ffd6d969ac7d6c521653d772fdf9a598eddeafc1f82ad8494d43ca8f58b723079679
 EBUILD gst-plugins-libav-1.4.5.ebuild 1666 SHA256 52091a00047ecf70c49c275c52dbf1779d2b2908440724c401fc328fb47a78aa SHA512 d6921dbd81915d1385332c5dc53246b19e82e205c2abfb5fbd7a084e18035681dde10587e67450d097e65478e6dec0db603586e2f02595eff80044e781eb2181 WHIRLPOOL 358ca1c67178f9dfb8fa74562bb24753ed4e85cb5b9c64c0d7791eff9f5a1dead1309adba985b2ef35a441577d4f446e757fcd09db9f817d1788bcf4e7c68874
-MISC ChangeLog 9029 SHA256 dae4d42ad64381cec52e5aae74a9695c01d96e4bcfc7b63f859ef1d0bb51ca41 SHA512 680f28b1e855fbbe833b2e690ac781525a8b2cc7eeff97c41aba7037e9f3e6cf28f8b960125936771779ee491a5b3eb041fe965560cfa295fead6933f99489e4 WHIRLPOOL 1e79d26f34eac727e52c7aa913e70327bb58bc6c5605db0d6f83ed88abf3ef5153dced1b95d2a89d73457ab598d84d2e306a9053552a250adba6022eafe92d1e
+MISC ChangeLog 9278 SHA256 670aa896e57bd68de7309735e0cba9d469545c399bdd0157c7c939f5ce63e2f9 SHA512 b6db892fc6e77bf2e78f551e44f56414fa8f92844308156cc9b9b9b77571034ba5123656fdaddb90aed8fbd9c370ef9da4cf717320aedf1184c46369226c4746 WHIRLPOOL fed18ea39ef70cca5bbfb76fcee1cc5a31726d4804500c87e182e3ba06385c37ec8ff26594070dee0dda393ec3a6dcb7f04daeb58d8e743bb051877b8df04677
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTSGFsACgkQCaWpQKGI+9SweQCfa30SDh+BDXKF9GC9Q+r70ShQ
-KRoAni9/BxWtc6L2rKjQiCkvxL+QSpNh
-=z7RL
+iQJ8BAEBCABmBQJU1nLoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgGgP/2r+tIlF6upgTUyea4fvsy5n
+0Es+M9okJI6rqNTzkFpn5Qc8lK/4h6yI7wrPAK6CHroDcOFmHo3A+se1B2+X+DI+
+dfjRHFEkw31fLrcHvMA/NEB1pu2CTWiQzLBC/k1IVXGsVeA/lIw1tUhJGbKuHj7S
+EMKih/GHjTIUwrfbTKMqT+Kp8INgENR3Ne8jxAc4u60QIoOfa92Alhj7zQ8GkUVV
+Chu1/u4WXCQkJEXbMMk1kaa6LxALs9xhYYTcAVd5+iBVaNwWf74ff1ILiWapgt4I
+PNAqFBKdGBfZO8QViJ/K8tIQXQMgCWBoOxMnXmUj/A51wMAFlNiQtKoCTmKg+26V
+18wg68CP5X/U4pJ4/rxr/qLwDB8zfJYnQ8gqoe+9IWUBvO4FL4Tu/sCKQKYIlxe9
+rKsOx5FQULHqqDsphxiKhcDfjzzjJyrEklcurvJrXuYg78qCs1nyGd5JxEWY+Ik9
+5gqI7BcKFEtjnoA4zsq1V7Wf0mOv3/KPdNZTao7YQUGfSnXU0P3Nk/jwGBDwnm+R
+jpVy3y47ftV5uV0sTGi/QEwJgKg89nx0w7wu1Tf8zrBaGzKBgscj64U3JDXBXa1R
+6BbNNvF+wahVoXJ086pfKmM9vR+ztrSn1tmFf5L3SGT1WHpLQNQif5l8hBH2Ry3g
+wUUHY9hSeMSy8QX4sXu4
+=+5Vb
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6bca70611314
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild,v 1.1 2015/02/07 20:17:43 mgorny Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
+	libav? (
+		<media-video/libav-10:0=[${MULTILIB_USEDEP}]
+		>=media-video/libav-9.12:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# compatibility with recent releases 
+	# TODO: likely apply them with libav-10 when it's out but there will
+	# probably be an upstream gst-libav release compatible at that time.
+	if has_version '>=media-video/ffmpeg-2.0' ; then
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/libav/*.{c,h} || die
+		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
+		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
+	fi
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if ! use libav; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encounter any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..43db66c09180
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild,v 1.1 2015/02/07 20:17:43 mgorny Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-9:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=743984
+	epatch "${FILESDIR}/${PN}-1.4.5-libav9.patch"
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/mediastreamer-x264/ChangeLog b/media-plugins/mediastreamer-x264/ChangeLog
index 3f04d5879b4c..9da405568d72 100644
--- a/media-plugins/mediastreamer-x264/ChangeLog
+++ b/media-plugins/mediastreamer-x264/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mediastreamer-x264
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/ChangeLog,v 1.26 2014/11/12 14:22:07 bircoph Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/ChangeLog,v 1.27 2015/02/07 20:19:47 mgorny Exp $
+
+*mediastreamer-x264-1.4.2-r1 (07 Feb 2015)
+
+  07 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +mediastreamer-x264-1.4.2-r1.ebuild:
+  Replace the virtual with USE=libav.
 
   12 Nov 2014; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Add myself to maintainers
diff --git a/media-plugins/mediastreamer-x264/Manifest b/media-plugins/mediastreamer-x264/Manifest
index 5b0be48a9c4c..2fdae8702d71 100644
--- a/media-plugins/mediastreamer-x264/Manifest
+++ b/media-plugins/mediastreamer-x264/Manifest
@@ -4,23 +4,26 @@ Hash: SHA256
 DIST msx264-1.4.1.tar.gz 291662 SHA256 3427168e0936d1d46b58e2e3da606e51ba463b1e6d6586e9ff6c2d1f2a539b75 SHA512 3d73fcea259af5d8c4cb9637538bdc40e0ea197a36eada5184390bda9277b43dfec8b2412edc44bbac2500664d7c007182b0b06f4a702bb22aecc54484fc115f WHIRLPOOL bab948086fb2febfedb89d2b3431e6ad23e2d114a6e1f387ab0739a25a2de8ba790eede1ba95fbe1dfd11d5abd88dea78795065737d97987ebda61f80ceb90e8
 DIST msx264-1.4.2.tar.gz 298631 SHA256 a84418465e0cc7185f66e14b04ac0e0c2e5ee7ee68fb201d0d697eb866b192b5 SHA512 06416957dcfd5e33418d19c941005a0deb1c18b47cfa8354b0b89f8434d47d649ca3d629bac3e2094ff5b6adc7118f5adc9d32411dd6ec12a8f3a6e96c2e356c WHIRLPOOL c08484438029379d22cdf564a817f8ab135a4e28410633bd2f194f1125eadb3f653068462933e2c47b03a1aece7f88ec42df8e68408a4cf037cfd1e0467a7d9c
 EBUILD mediastreamer-x264-1.4.1.ebuild 816 SHA256 3d247ff92a44043738452135e9c322a31fafb593432f7c7ff04308afdfc687b3 SHA512 1fa0cb3933abf534099782dc25f5c3c634f4c23d360ed752eab8b042c479a2a781abc4ebd543b71171406c7bb53ddc1e4d6b0bc5991374a3bd6859165fd9b619 WHIRLPOOL b891d4ca83b651b93e46309f830cdd66f2e131d30a6c665d5ff34ca9967dbfbf00c5e6b7e5b598967c9c266a84263701105c2200439a867afdc5d98393f72d97
+EBUILD mediastreamer-x264-1.4.2-r1.ebuild 803 SHA256 a66b04ec3035fe3547dbcc1325a287849662c2b95a3fddcd42f04863a971d27d SHA512 14977858a34b578ab82dc33fd82a0371a5c07b4fbcee0e72481f8bd3a9da80e27cae1ab81baffea60ff9c510c49d6ea9a9e5d33ca6e8661860f2e6ac99ea0f3c WHIRLPOOL add4c6758906923887c3db3b3a1406617b3e33108872452f70705897d6830f2dcb90b898fb5530144619a43fe67ffcf6078feee2b3273c54a886aa63db92ae58
 EBUILD mediastreamer-x264-1.4.2.ebuild 746 SHA256 b2e337fff9498bbfc2b1c358b2d9d6d04941fa4e3da44909dd08f8039705161d SHA512 44bcd7a97179fa677be338f217c3569fc05bfe00db0a3bc132dd3c53e1e84d4cdd98d2f81a89ec16ca62c30646ea8c042ea7d2890d8038d2a2ad567f547d5138 WHIRLPOOL 783eb12657cfa17610202297be22174ddf221362b46ae983eb71f24b674cbd6a0d25bb2f77377014ac6293790972970dbc6dd9000bb8ce487de38b2c57a69136
-MISC ChangeLog 3783 SHA256 5f047833f5c4ee082af2568ed7d863e5b8d01a8e3524c572cb5f1317ed413d68 SHA512 0ede81ef2f94e8efe55a125f3b29e84f33d84ca22b88741bf4f7c2cae2c9ec1be5f77ac570f06b559b2f844161ee98cf328c494c41aea9c007d7e2225bb41a56 WHIRLPOOL f8b5df4e7025e6045c5447a06bfb3c141bafcd125f2b82311c46e5758a43f54e380911ff8342e2cf78d307883568045b216c10d4590876518881f8b62fe6f479
+MISC ChangeLog 3954 SHA256 4e8f361cb66b23f012215ca8fc564676db7a56c0905c7183b9b0948e213b4314 SHA512 a6cdcccdf9acd7e4bc1f1e7b2f80b1b6e7be2b1a45f6ccfef7ec2606232ac2aed34acba18078b5c369ce06373e6040363cdee20e6d05e998977332c29a196b76 WHIRLPOOL bc3107e5fc92e115698191ab964376be6dc4507ff4d16ccc5c48293d10834b0488ed6a29332dcc534df96e06b3fc36b415b6a670b5634c2e3967fca820685a5d
 MISC metadata.xml 236 SHA256 a197d6884c9288dc3f3962fbb810f00802f7f7f45ca1a21bed74070ee119ad92 SHA512 77a2ecc4838410c6d8f7d85ad7db65352ca4ce22aff023e0a715bf93c076d4147d430efd3732b5c6def45cea5a0a5ab30b90bfc9ea3f7c76d262b192a1558760 WHIRLPOOL 18e556fbfd52d66b52e8f46866ef20a5143079a8bec1a1b3591fead01b51b0480349345b44e573e87e6a6d59a5d5729c34653ef0e45764480c81548de9ad66bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUY20QAAoJEFZZU7lTcnVszTAQAIHZOyJnwvSxNNXkpHDcCQnq
-C4YAgM9X9MmOkqhNgUTQAW8yA/6SrgkkKkCH0qesArwijhbD8Cd40hnJaZDIJ0vX
-mraC5ItZLWq62Wnc6aN6r6IkP98HjHQcPoFxJyFqF3F5yYfsWiKL+UYvaB7V5i4O
-28tz1YXC36uBqgKR1srdSlcplfJW14zq/IRFcCc5DbKD/lXNrqF+2Yy/O3sNkSZa
-8ey71023oMJKhDS61WGqk78+Q5W4vBVVavcjQxI4Pw3KC5ZM3Uzdw49NTMNAS4JP
-8jkImcYwPftqLpSgVJ5b/ywAQa27uqkgP6oE8dveBKNly/FnjsX9ZZUHFJAhWc8q
-Mt4Jdz2EpczwOSDME2vBzza8xIIoxzJWFju2f85pRQYQW3E1qT88Lyc06z7+r5WM
-TVhGQ4oxb1K9ZniPiLY+7rDPa1ky5pX6aRMluJ8BQPXNYeK5ahLCAfkgz9bSWKtQ
-5032j9TbwqzNDkF9RZ/A2syv/XKUyTgHAvDrdn926P5YRdBxzYLZOpt+5ki0hD4r
-Npp2I7Fn0dS6fp52DXChCW5jplF9i98HFLhDkEEtmajfYqUdlzIniwcojK6pCKlP
-qpSj6DHjRtYgKPNsjMh4gG05uJOZzwh8Z9AaJh6wJIN2hURzhXIgS64faBH3JTLs
-3vLuenyb9o2l/PT5gf1a
-=PeK7
+iQJ8BAEBCABmBQJU1nNkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5E0P/01qotpGi+ZgzBxaUw2Agpyr
+sGTVfagcC+JiLz9UBwnTqYwgt8pLxMxgnTy2nt/3QsQBAJXHLZoDyjZOBrH4Eh7l
+LdroK7bMlsKaEM8+zq+N+4rcA/M9IGVo7gkbszrOQfANWNY7ljRB+E7CiduNSL3n
+ldWn8KFay5zpfQ8itU5Ya1cFBUo1eMN2zh7QyYo92tsbrylNVVnv/5SpOBIYerEy
+DDQIpLIq0UGLvIIA5g8wKnRy3k5BEhouZKCF91QX/pQUIWKFKUvWLHGN1Q9rrXVf
+ohn+5TbvFFSY7AyO6x1KMRBcuhU6gxltd0Gw4V6OAAbo+8k2YicJwa52QYdtD/8Q
+JZZaeMLSdSEL+rwDICvrA+GE4WfPiYAQicqZrTvQ0rdOgI/7aUddcJ/yhLJ6zkYZ
+o5abEmhwD7enzP6TnIM5U9SkBRMRATf1dxj0Ovqlva2JMc58KHv43/12e6vxZby6
+Obc8symLSQPTWReGZasoLlEwLJ0JseIElZgm3xdaz/c0GTne0W+WWaV70SJ83nqQ
+BjsAjBukNqDENCaI+kFaU3Xtf2zroPO93G2dzJqprMPQYgZg+DAGSOhexfCE2DZN
+OQKnKwaXUTCe9bDlKxvGQtzai4VeJFyWO9Lo31aiWSONkW6JUIaWepDU8w0RS1tg
+znai2G9yA2gojrVm3pTq
+=AF4l
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..743da04319de
--- /dev/null
+++ b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild,v 1.1 2015/02/07 20:19:47 mgorny Exp $
+
+EAPI=5
+
+MY_P="msx264-${PV}"
+
+DESCRIPTION="mediastreamer plugin: add H264 support"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="libav"
+
+RDEPEND=">=media-libs/mediastreamer-2.7.0:=[video]
+	>=media-libs/x264-0.0.20100118:=
+	libav? ( media-video/libav:0= )
+	!libav? ( media-video/ffmpeg:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	# strict: don't want -Werror
+	econf \
+		--disable-strict
+}