14 files changed, 529 insertions, 519 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index d6c1aec52f56..5fbf76f12892 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.752 2014/06/16 22:00:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.753 2014/06/19 13:14:49 mgorny Exp $
+
+  19 Jun 2014; Michał Górny <mgorny@gentoo.org> ffmpeg-0.10.12.ebuild,
+  ffmpeg-0.10.13.ebuild, ffmpeg-1.2.6-r1.ebuild, ffmpeg-2.2.3-r1.ebuild,
+  ffmpeg-9999.ebuild:
+  Fix multilib dependencies to use safe versions, bug #513718.
 
   16 Jun 2014; Michał Górny <mgorny@gentoo.org> ffmpeg-1.2.6-r1.ebuild,
   ffmpeg-2.2.3-r1.ebuild, ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 86f9b089ccbb..69f978dcfbe2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -14,34 +14,34 @@ DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.2.2.tar.bz2 7026587 SHA256 a42b97add671a0b40126261174397b5918e7ec219d8ec6b8e62e86aa0fb15218 SHA512 431e55fce3fdde6b56b82d90b9b9afac71225212234553e82c3f4c5b1408edd1f0ef06f8f098a5a863c6767c1f7c8cdfd41cea6fdf35aad000f8fbefe76ae454 WHIRLPOOL 6677346f3039cf7c6b560d7cc72a67f4c10f6baef64f973a84680da3fe45773a3384ffd9ce5f8f761b7cd5804cab902f61f9fe39453cb36131b5474398676e6f
 DIST ffmpeg-2.2.3.tar.bz2 7025230 SHA256 670dd41511be0ebd0e5d1706b92da0b69abaa4df8ece3ed90ebc78acf199d2b8 SHA512 cd07480760455cd4b2173a5630abfedcb939eea0c169c98ed42ef04b93644406bc7599933e593af53fc8fb7ba536ca526a59fef25e301ef839d62aecfbb41348 WHIRLPOOL ca06f44dd5450829c9ff499436ac8df7ae77dea28c542d443a26fd3cfbc43470c106f8e0f27b71838c5b1dec9669d7c53a7845254b4f9d67f2d4c8bc786c10b5
-EBUILD ffmpeg-0.10.12.ebuild 9679 SHA256 40ba2d60f25380e850798bae3132c42c69d7fc7fe6029a299fdf937da31eac3e SHA512 e6cefe5efae73ec08b140d371e00cba2fcb66773d4022035a889ef491fd5a627bbcbf0f05ba90acf85636bafa36def0e6694535ad57a57301bca40b6d331ca85 WHIRLPOOL fa03268ffcdd6e939e2f0da525f0812af09cc4efd91318309a3e499a1d26151c7b4dc7f96ea1a50fa008d379b74cb9eee4cea9dd643521a1da53f39a8b3dd9dc
-EBUILD ffmpeg-0.10.13.ebuild 9629 SHA256 cb41594d25c648390e500860750beb0bc24e57e584cdd144623689ef26289bd6 SHA512 27dd46c8a57a8e28a2c8b68a43e38fd545326036b812436d3d03241f440275c228aec90c7977e04fbeba7623f25702d060fca39dd4a33ce0ba2036113abef71b WHIRLPOOL 798e3de9e682c08eed7c76d6590dd98002ad4cb93d4412d0319a36a1182d1bc2f3cd6b0c161dd4569bcdb9bfe2acbb2ba419a042610edb93866269880b1f5d38
+EBUILD ffmpeg-0.10.12.ebuild 9992 SHA256 75c9b0c1e74311cc0b245578549737148c906254a0c0a69661c0b9bcc1006fb1 SHA512 f003c10242a04d25e12f3289d7a6696fcc7b3ad1e7b8f7322f3758b2f6aecdb1390a040fcd4ea203bba9b1fcd1f2e29d3af5c14782ff3f936e1d57c90d5ebaed WHIRLPOOL b466fca6c8d8749cf87c54e8b395482dc88f353624f78b7cf18dca7f9035dfa5f49ebc99e959a473b69286977285d1a91bfb4e5c74f946e5e97793566b9ce98e
+EBUILD ffmpeg-0.10.13.ebuild 9937 SHA256 baac0fd18c473d797ecedf02c98d16af1696ae8db777a04654c22e1252ac5500 SHA512 107fa3d782f4c4b407be21e6fda9710e7fb1b641db4a56b1a57696cecf6062115927ad6c51ec04b575d1f16389bc45eac029c53c11f21a0e31bb0c148ba87603 WHIRLPOOL 54163803c29729fedda2ead058dc5e991779c85311cd42bf36afb23da19d8225900b1c93f8ddd36e160474b4878341d0e70019065448dbaa248e32f361ac1ab7
 EBUILD ffmpeg-1.0.8.ebuild 9650 SHA256 32a1b9c7967b092291331f6a24a1d7cc1c8cbeb1c70ae959cb4689f1e9988180 SHA512 637658df591c78ab45015022054941846b4748de77633d2f2585ffb732ac6318b8a3e540b3f58d79dddf312580ff63d8f3b277e7db2db055c08d47170ccb9ffb WHIRLPOOL 645144c0fc95cb403336d76737d11914cd87ab48eeecf5ebdae45b8c255f8f3d495d45684047acc6bdbf680995424064225ea6a9f2d82099f68246417eb05e57
 EBUILD ffmpeg-1.0.9.ebuild 9658 SHA256 c58257c61b10c0aeb7ade0b859e2855b556f5799feb0c288804ddccefacd7f28 SHA512 8bc1cf23bf6e46086bac12ed61fb953021b74eae466f21d49950a615e9e92551b62172930a851156926def8f470c056bea2ad85177261266655bc65df3ef802c WHIRLPOOL aae7a5426e7cc5215b58e951fb6487a7dcc621dbbcaffbf516ebe6ad39d6db6f60c7a84e0781b215e4fa4707be9ecb77308c5a4d654684f7de6a48c1c5488712
-EBUILD ffmpeg-1.2.6-r1.ebuild 10478 SHA256 8c0ded4f7f0e10c91dd6cb717a729c3abe548e2c1d429552dc207748cc3ebf9b SHA512 53e7ee06a38dc0c7329d57aa89f4d3ad5cc3ce027d6735f32fdc321b5e1a69d3c5c86cd779ff451d205451bb4954d26e59a81d5e22285e8310ff039bf3955667 WHIRLPOOL c5bbe000052f395202aec86ca5ad3ca5fcba9b8b64e551c7df011434312561926e3b48b5c1ed2a6f140a81f3fce39a5fcb3bd0cc52280d81bd777f3dedbdcfb7
+EBUILD ffmpeg-1.2.6-r1.ebuild 10952 SHA256 04f6d30e2b9b2944ac3421d130c90d9a0f21af492f12e1d6a1c8b9dc93fad7c5 SHA512 80ef67391231137b20d77bb2a0f62fe16666dd6da4efede588493209657a624f3e70bb15a27ec754c9cdc6c72db37a9984d60aacd9bbf5303054acae962f17db WHIRLPOOL 6271929e1cc5f84b42801803210576943c1e6a0114332cb6d6aa4a1d1950938ec54f6c5033187ec3c3df962458744fbeb1cd13f5059cbf849ccc76b0a1a63414
 EBUILD ffmpeg-1.2.6.ebuild 8995 SHA256 f4c2793bcf14315fbdb7a210e86cb39747a2211a9d4f8aa97a79d26e4a44ed9e SHA512 9ae6b8785d8f11d0321f6dfb034dc630f23facfca1e96ad8e89d7ea704b3e4151728edef3dc247526697cf8254c75d1860774826440b7781be465d3a970a29ca WHIRLPOOL d0f08e038fef816028792ff064d8196f61fa0a5494bed33c68a6cc33c917ade86d98bacd07c0128cb6d321c6864ba34f8a8e65b633fff396e40b6506c221971d
 EBUILD ffmpeg-2.2.2.ebuild 10320 SHA256 a8cdda51c59f5f7c3ed15b721f98961428c35532d654f94311e96c3a8991ce2d SHA512 808fa41e91d25fda697279d8d4f5e1ec1a9f38dbf19a1893af35a868c40d1ed8ac8550bb97762ac84d0515e4b7064647fdc1239ddfdb14cda073dbd56e2cf90a WHIRLPOOL 455c13276f48f12ea9a7d0077f08fa14341025ffd6c8e3a3bc5570077c716135d70aebdf75f9e7afbf1654a7b0604b1f503afcaeb1d22ca5277768353e54b221
-EBUILD ffmpeg-2.2.3-r1.ebuild 11981 SHA256 478e0bc4971b9b69428d920ee3438623d9d18e5990366d37fb54bdc0dd93b39b SHA512 5b0d5b018a7f286b4d6e080aad9b5e323e41088342bb52b298c341b51886c3f50d5231947e52ff07a56fdb4af0814ec26524953db687fe0366cab0ccaa88ed3b WHIRLPOOL f48bb4e6d300f8a9c084652f68049d0fd0c953e100beb12c39012b8758b525177ecac97d62aa69066350cffff7177c647d64c1c9e693e5432aa9081ab116f0be
+EBUILD ffmpeg-2.2.3-r1.ebuild 12517 SHA256 d2657b7b557b27b582004690e28ce9d8e05ecd932e001730d40e00b5eaa74c37 SHA512 1c2f450f80f7d8918e68310da5b81a18c7772b76b463516b06331460c3901d2e30761e31360b74a0a425b257fe211930834f50f77bddc1c828d8aa2a80e8b7de WHIRLPOOL 1056fb6b6a40ce73c0d418f762d8148afa258274a837cd2fddcbbf7341df448ccb10f051a5018488808944b2f0a52a88849e75a4f2034284219be4c7f423813e
 EBUILD ffmpeg-2.2.3.ebuild 10320 SHA256 7c05919c00fced9813d272c31af2e29f4fa6a089676925c91d5289e15652c8d7 SHA512 2d16862f5a504b13ba24b86096d60b7bbef1ea27f59cbdb1463181cd428c2f29a52a79a536da0342bd5ad76ddbceeadca7814f70c582a65e68ee63fc8f3e28de WHIRLPOOL 48c7c5486c43bdef447f9ec2697b65c4b606336cc9429c97a46560d47db3ec56672ece9a46ec389045e11825e0c219fd064d0fb096cd36d081cbd26cb4aa789c
-EBUILD ffmpeg-9999.ebuild 12007 SHA256 59ced1b36165eec8f326a34fb4e9cd4ccb265e00d9b5a718c62f944ce12546f3 SHA512 5bba87bdf64c221ef042e0b2dc816a0729e9efd8dcad2609b49457754fb32a508967f14139fa35a637b684e609e17534edad4fd043aa5c067d5802a537681ec4 WHIRLPOOL e7079ea1369cd266ae49618f3f6f55a34bbaf3ab77d40300fa25a5bdfac96e26f5a1275579ff0121d2048a7c2c5a145cd4993f73b9bb071e4307e7f36e24555c
-MISC ChangeLog 104448 SHA256 8e0cd4cfb5876ddd14dc8ffc6198706c9c840a2b8fbd8db1b55ddcca9ed5068e SHA512 e05db7521c70f8331a16fda46cce353b71e1a8e45bfaa46d132cebd69c271b41e53713d38636eea28ffc96e31487b2b729c6d291ff72749cdce17e739aa3eac7 WHIRLPOOL 32f1bb3672673ddae5252dbd4c8c30ffbd71a82ca4f03283bfed974445287864afe8e6db0f87dd6d8296df3059d4642241771ffd0e9f9b352c4923f02cfa2ab1
+EBUILD ffmpeg-9999.ebuild 12537 SHA256 de20e4e1718beff5c1f577c9ac8212eb48c3de69f1222cd7f41b574a861b6327 SHA512 f03cb317f35df67931776c51e7f451dff1280d32664037150020e72b2dc3e17290bb36154333ccc26516592d95e529c45f2ad95c26cae3a3fb5e4dd54f3302c5 WHIRLPOOL c85007465b9f5cfa8a8bfd8e92a4dc77bb34f38506ba7a89bc1534a2b98edd74adccbef2fef046bf61e6c3a2b1cc17e4ac3bc2e3af06a639aa55d9da084e0200
+MISC ChangeLog 104680 SHA256 4f5ce5a317a530323963e9c773ff533c2a9e6975baeb11cf11ec1470f523f44b SHA512 650ab75d5bc1c6f672417950ab71c3611c624ca5c8a6dd8643233f6f3ea958f34ffbecba52c186f6d09dfb20c484a4579fdf99158b16b0abc322895be0288526 WHIRLPOOL d3bd284b440e51983625abeaa43e2d7d4ccc1453593e165771d4cf8981da402a8304a81a153f0a6163b4cbb97f464e1e4ff30300791a777f7d92bb9a8b880cc0
 MISC metadata.xml 5340 SHA256 010fe23d4fce67e3ebfdba2d3d0e4c4ecf7cb12885397c2058096955733f19a3 SHA512 8b1e55fa5896382e700ff61be266b635b2f3873ac7e29f331cc3a31be683cf9b2e24d93b52cd109149dab2d98ae58f5151dccdc8e6f48f2abe56382a11a471db WHIRLPOOL 420bfe98b7d0b58cdc56f76cdcf74fb1fe69df2ec6501d1444202786465ad63d255ca1a63340d52bb4586b19b1f14fb1ca859f8798071644c95f1d200cd281cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTn2kFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTouJMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLYcQANUfvIflbfCMDBna/AVHc+Oi
-mYO9k6bgTZHQ/p6KY2Yh+dMU3epz9DZGXOe9gfH5xhraAphoskgtAG+tya03NCze
-u8QsPwboN1S3a7PHRP3zgo5QnoHGmdDVCZ2iVqnCfEWDTZjjthV5dKrmN07AFr93
-MVH5MJOVpxuf2UE9z2YxQYlJRr+ItdK+kD/No18Bf/x+b/KhyKydAaOzVttOMH0J
-cJEtQtK0I9klA41P+NziT6tU29vp4GaaiuVhKuH6lQYBa/vw3AZMkgrXizHw3kVm
-JCvPd8TYnVMKmGAylZ7aSNoVABZwmCp43NV0F1g0qUneGkTdeO+iqJkTkBZ5jnJl
-QlkJPMTtJORMmuGJR0AeiB5cK85Rg75ToOaw2lC0M+oh7cTdhLSqDHCgJYpbaVjV
-ZwfjRqLvfzpkgrZE5Z5uSMt2vkP06EsMqW3sLh126RHxoZZ/HMzOB7KZMw0ZUkoS
-JC/qWPBkxiMP5sbXG0koarYEm6Q7C1T8Ah411VGmMQg2QAnWPdjfmPOCz+xLDbJ2
-mi6TIxTIHnuVrVdt6kWxbMUZ436JS6ZWY21m4gU4FGKYlnHoG4/Zk+fvHUeMaKpC
-GQVpxVR4mJsu1CZnRFhmD+exiQ44xybzbP9DHl9X58XqmJDxPruIePDTA4jni2IB
-PtvTNIGHkGuq68nv1o15
-=qyqg
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOO4cQAIfBp4Gkd1SXVYOUivD9pE4W
+fqnER9VymNCHrzKn2kNzHyxX9z2ry9OwoDNCuEZGDZLIx/lH312vFDh5WaZBwYqS
+rTMDgqllo4LuM4k+abDXirDUw8KnlkO6xVEL7nr7x4lwBm0BilGSKBdEByAgClR2
+kmnXpu5V6XP5UI/9ZgO0JcMN6y61R7+bRO4RvD33nwDsaHlNsmVYOL/TUkWFkY32
+qoDSCJms2YDePpE2eXkjK1+aFbC/qW+6kL/BQNBgsvdImXuApSDFNuAsSD9N6ztb
+XBFJSUkNXtcZ4b0ePxo2klipeNeJABYcI8DaCaLSaiepf1aEp7/GZ4l9OD/54YNA
+OuI4BPusRTxF67M/NwgLcTyAW6qaspwgDqxDe6v6Fqs4WwTOXa4KkMFdcHnH3W+O
+xdLjEWUihV4Rnkwn4Pk5Ywjg9A7nISQXr1NMaH0HnKNRcqZkRsNWEGXd2+RkkVsi
+q+XetoBCwxzoIrmzmsuxEkt7lLl2xusIkmRYSjDCQzzJ1o3tjZqmTJj+rMpugfXl
+pMgfHv1aaqibGHcGOdaTO3PPPFnOB6rxmQOlcDAtI4l5M7v8bUOkfRJIIq/r1IKW
+UwvLkDZcQr1Ikayd4g4+oYBHTA00ILqyyWVWj6MX8sOZfFNHTIBqwukHouEIWwG9
+gNWJVsdYfFxzg0O4p/eD
+=y7be
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.12.ebuild b/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
index 5f68df3585b4..dc25115b292d 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
@@ -1,6 +1,6 @@
 # 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-0.10.12.ebuild,v 1.2 2014/05/15 17:11:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v 1.3 2014/06/19 13:14:49 mgorny Exp $
 
 EAPI="5"
 
@@ -47,45 +47,45 @@ done
 DOCS=""
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
-	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
+	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
-		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${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}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${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}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	!<media-video/ffmpeg-1.2
 	!<media-video/libav-9
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11
diff --git a/media-video/ffmpeg/ffmpeg-0.10.13.ebuild b/media-video/ffmpeg/ffmpeg-0.10.13.ebuild
index 41966b9f2b3f..d690566d2268 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.13.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.13.ebuild
@@ -1,6 +1,6 @@
 # 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-0.10.13.ebuild,v 1.1 2014/06/14 09:49:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.13.ebuild,v 1.2 2014/06/19 13:14:49 mgorny Exp $
 
 EAPI="5"
 
@@ -47,45 +47,45 @@ done
 DOCS=""
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
-	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
+	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
-		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${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}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${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}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	!<media-video/ffmpeg-1.2
 	!<media-video/libav-9
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index e4b80b843742..fb402dc996ef 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2014/06/16 22:00:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.3 2014/06/19 13:14:49 mgorny Exp $
 
 EAPI="4"
 
@@ -52,76 +52,76 @@ for i in ${FFTOOLS}; do
 done
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${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[${MULTILIB_USEDEP},encode]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
-	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${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 )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-		sys-libs/libavc1394[${MULTILIB_USEDEP}]
+		>=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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )
-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${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}] )
+	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}] )
+	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}] )
+	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[${MULTILIB_USEDEP}]
-		media-libs/libogg[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	)
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	!media-video/qt-faststart
 	!media-libs/libpostproc
 "
@@ -129,15 +129,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
index 4fd46eee5612..0eb46a745d2a 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.2.3-r1.ebuild,v 1.4 2014/06/16 22:00:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.5 2014/06/19 13:14:49 mgorny Exp $
 
 EAPI="5"
 
@@ -74,84 +74,84 @@ for i in ${FFTOOLS}; do
 done
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.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[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${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[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-		sys-libs/libavc1394[${MULTILIB_USEDEP}]
+		>=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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )
-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${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.2f[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
-		media-libs/libogg[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	)
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zvbi? ( media-libs/zvbi[${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
 "
@@ -159,16 +159,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )
-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	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}] )
 	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9f07a9618a20..bff725b1ad03 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.157 2014/06/16 22:00:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.158 2014/06/19 13:14:49 mgorny Exp $
 
 EAPI="5"
 
@@ -74,84 +74,84 @@ for i in ${FFTOOLS}; do
 done
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-0.9:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.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-1.0:=[${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[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${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[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-		sys-libs/libavc1394[${MULTILIB_USEDEP}]
+		>=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[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )
-	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${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.2f[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}]
-		media-libs/libogg[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	)
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zvbi? ( media-libs/zvbi[${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
 "
@@ -159,16 +159,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )
-	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	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}] )
 	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 779ae6074c7e..c14d8ace1c75 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.193 2014/06/18 21:32:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.194 2014/06/19 13:14:57 mgorny Exp $
+
+  19 Jun 2014; Michał Górny <mgorny@gentoo.org> libav-10.1-r1.ebuild,
+  libav-10.9999.ebuild, libav-9.13-r1.ebuild, libav-9.9999.ebuild,
+  libav-9999.ebuild:
+  Fix multilib dependencies to use safe versions, bug #513718.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> -libav-0.8.9-r1.ebuild,
   -libav-9.10-r1.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 554d3310241d..c622b84171c7 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -14,33 +14,33 @@ DIST libav-9.13.tar.xz 4077808 SHA256 2ff05df6cd2259b3bb277eb16c234214f8e0530700
 EBUILD libav-0.8.11.ebuild 9175 SHA256 4d9b08c903837bbbdcdb7f3a255e8d86104adb979b2211e8d271d74265f33c0d SHA512 17c5d2dc96414dbab01d132cc9e475f50dec66c7acec6570b49dd1f804c90e9d3259484089d05cc4eedd32bea950172a0ba48a01532d097f5563f41eb3775b18 WHIRLPOOL f0b450ed2ae8f80ef027fb0215875f099dccfe6ea85a89392e159bd748a31a8c85ed0afb3a103645e1451d2d9d5ecc8c0878ea853fe0fed5f339691654d5ba4d
 EBUILD libav-0.8.7.ebuild 9165 SHA256 b3ff8084babe66ff1a10d781b2c6dd635753105188f0079f886bee3b55717dc1 SHA512 03d8b81339dcaaf917541c7ab3f3775930512bd1071f11eb27b371390c3cb8bb9c275bea55a385c8b082a95aef13cc8bf67ade151523ee44670f24d7bb0b28df WHIRLPOOL 217448cd7d99020f3ff023d3bc85da77353bd9577d076321f6ad04c613554b60f786b2b00ab7f0985348fd402f399b0031e25777da71fb1f0aa1f96a85202f79
 EBUILD libav-0.8.9999.ebuild 9174 SHA256 4a7a2c781034d811f9e670630a3b70697c721eabe9eddc8c45f85f6f2fc57286 SHA512 501d8635f8b3ab2e9b4dd13e94363c28bd19a68e827c248eb753dacd7a3fc3db05bea8164e255f52b003ee218f6df615095acf62d76a8fe72d1f6b2dc6cb5d65 WHIRLPOOL 8a8b52d4faccb5876ade7d36477b9de3587ee6eec3bbd16301951e4e6c2ad5519e69e845b439f7e72c9ebd93a93dd671397d1e38f5bf0f2fc963fc2c06b07c49
-EBUILD libav-10.1-r1.ebuild 9771 SHA256 619333ccbf7009d3cd08ba9e671839b9dff7bb9f67bc3cd9db0f9111294ccc77 SHA512 3685724f9700f84f982051dd884c027bc463d84aca8113e1929ee29f4403d030908bdb7aa28b72139d053f87fb29367574976a19a22b344a113da252fc28aab9 WHIRLPOOL 8d44f079532ed2af655c45fca62b5d069f6fa9959e5f4ddfc654feaf02beafbd9ac23d3335a577f0939f599827e2c659e92376d4baced90575016922d1c2ee12
+EBUILD libav-10.1-r1.ebuild 10114 SHA256 e5498dbb5b53c683834879fdf51afdac4fcfff1be2b1a8e9e788bc08cd60dff8 SHA512 73a4b31eda2155ad865f63db38343c5b2211762fc20df1e5c300696d3994cadb922d22450e6ee6d1cba88624d8237513934d0d5c3f681572e34cd8008f4b81ad WHIRLPOOL fb42825415b981095cf8c96cce4f4afe185be0484a54a3f8c2bcac88c1f39fdae83431e9b1406bf6d0f45e9e421a350e50dbd1391ce5f538cf1d72f8be8d030e
 EBUILD libav-10.1.ebuild 8473 SHA256 b12b7dfaaff42c102190bfa999ef8e932c183cbf7e62f89045171b95d46d38f8 SHA512 f23e2d22914c5873ffb6322384ad1b1e39f2622d67592660deed872da7ed022a54d1659d3b6002f379f66d8a7781845f9474df1d2d9ca286e0ba6d91b3fea65a WHIRLPOOL a33f883869db9a8db5c6ccc34b1755bb61fe0e41538ccb8c64853e30b92a2354d757dd36886f0984f1cc50877b4915b89005d15f6d9192d01b9fce35dc5ab981
-EBUILD libav-10.9999.ebuild 9854 SHA256 118cf81986494ca94dd7cfccbcb1161e5d94b216c45083c045956e4146a7f75d SHA512 5beef1b72852f758a5693a381c24640b9f13a842b538d2488194547c25713620f7207ea1baa4363d04eb49c4a275574e5419e07c3448dec74e813f3a941bd5d4 WHIRLPOOL 95391c96940e064b6243173037b90f4b07c1b10f61d912edd73b41c2664793650f19d3e5c065b3e3b615e7e66ff9308ac088ad02f8197b4d78e33f467e160866
+EBUILD libav-10.9999.ebuild 10197 SHA256 d12a0ff962e1b7267930b1b70f252698a7e01bc0eb8fd2dc15e3c09af1dd9678 SHA512 55acc5a38c86c801d232564da91f1c7db0417d5f58aaca0d0395bcd964025b72b44a2a236fa4e18a073fb4eea7f4cd6bf27ecc1b1f0404de2705b397cc03c704 WHIRLPOOL 47f9a1cdf0c16c940d6724fa137663a6a777f0ab88aedfabae6a7b2ad6be0c021b50076a1b61faff40a387c6a1b6342fd601c3265779ad653277c403c4812dce
 EBUILD libav-10.ebuild 8370 SHA256 e7ddd1f762d92a099c51b17bfaf3d11f184ddeac85cb0954e5772b7862f19766 SHA512 2213ab4c69d446e924b32b8bc6ee4e86a8bca33dc802f26fcb3ec0864b03950eb47a53cee2b1ec8a491c31a654212e326882548bda87858a1901467bb43d1521 WHIRLPOOL 1736a25c174f786df6da5c65f437837fb19569848ac4b31f56e8504cfb02ec0f23d255ae560d6d778122473bb690d9e1231ede5b12b5ac4e1a531e6bd08cffd1
 EBUILD libav-9.12.ebuild 8501 SHA256 def363e4e633183f08ab983785bf66d517607a130ef802f8903fde09966a4a50 SHA512 300b0e16399488da09ec580e57eef97bae50d261c39a43cc85561b08db335af9d54e274facf4f653620cf91490ab2b96bb3fa73130a575b2eb9e73eb63b70289 WHIRLPOOL 7e85ebe1903e9ece8b2ba74102f203a59ae109c705da863e55911bedcbe3352cd68386da5f7062e235df71fc267d619c6a36c8e8627615e94281d00a64318662
-EBUILD libav-9.13-r1.ebuild 9818 SHA256 dc218d83dab39165a60c399f9372121109b92de1676bd6ff393831bf917c9f4d SHA512 f942490c56db7a73935fae5b88a957b2eb1f64940dd37997e43e2d075e9a9415064a38afc4051b6b2d2b88acfcae10a72c99afe58870a32b75d7908af8c0b898 WHIRLPOOL 628f89e12ad911f3d93198e85ece4c5c232234d7d36bde28b15c7d49e0c3c4ed1ad10121fc00588c9058db2e6311f6fcd45e4c4993b0067d42afc46555744a00
+EBUILD libav-9.13-r1.ebuild 10141 SHA256 0599f7361211cb74c32b982268bbb5d37107502b521977fde1b33843e7774351 SHA512 be285351dbc47611c15734d871ec0e16310599a29a822cb405991a47d3176c4373b5069e6a6d91c5e8f75bf971ac5b2efad6c8007827837f0c1b4cb7a11ed71c WHIRLPOOL a366531e881800889053ceddaa4d938934d5f29c427a51950ba0138fea10b8df6d13dcddf8ed0e70dd294ba86053b5f31d32322b2c1efb115223b17d457dfcee
 EBUILD libav-9.13.ebuild 8501 SHA256 4bccdee0d4609f1ac8546d03e1a2243516b2cd9822a83d0ca0bb976719fdf0c1 SHA512 c6fbeeba2b84b3b3ca29a3755630b0caa62e57a1c99cba9b80da6dee49839f4a0c9c52b8aa210e6c3c3d17c5a58c27c1277b3fbe7405a538cc991103c1600856 WHIRLPOOL 9e3b774cb9dd6bccb765590fa686597ca9524ff8abb2943f2b30a72410c6adf300a6c4a50792b090de05e8c0c578a3daedf5179a77cdaf872480e5901af5ecb4
-EBUILD libav-9.9999.ebuild 9818 SHA256 ea5676fa133fcaa4d66c8b41b6f56a481d91f6ce5fc5370653e1f86f15e9a02d SHA512 e8712f8fc72dcf5eaaff1225a15419b534dffdec95c09c3432bb616ba784224aa2f1504d245ece624d48e4639f41718d01591f2e901a0ac1f9ce50ff1681b3fb WHIRLPOOL c2c1a6926f63cf74c09b83bb6f580cbd538226762bb6ee8aad162723fc126be1788bb3557f5e0b8c8b121c1afff337ca622b39950491f33e8d9ed775fbba43fd
-EBUILD libav-9999.ebuild 9855 SHA256 04552027dd4525703326e1441cddccc7b00cbcb8b1495045940686cc3e345c8c SHA512 27344d3e2dc50ed92261452ee9f7ca76fa77b468d17adf8b6a572744bd0f6c8ef1e2d4ee12322edb19a761429c40a8c8bd9876d46f8ed1b6abf18fdcad29a5a0 WHIRLPOOL 715045ef0759c37a70e22ca8928057dc2ae218a3b91064f9ece89c0cde000d10596b0cb90a67cfcd3864762cf264f69ddce6c0716bca864b497d2c3267fc69cc
-MISC ChangeLog 29743 SHA256 d49bae2c7fdfb0058856903527145713738706ba1c77d06056cde295b01e4533 SHA512 8a59a48c828f3a06bb45eef2e079aa074a4c0d5427e91729ddd14dc665ca38300e548a097b7ca33b7222b99e5b604582c3157ed541b317f06b259dcbcbf48cc8 WHIRLPOOL d386a899354cb345d9f7f304f0fbfee41be61f750f4721b98e69f764ab89bbe01849302d6187553c467646b3553b45d867314767f3488d72928760f9e68ec15c
+EBUILD libav-9.9999.ebuild 10141 SHA256 04ebdb4b655b384e1c7ca188d384181f0b79eda21872e94117bfd14b9efdf951 SHA512 e31757c9df7c150ec6605dfca738ddbcf9ac08cf6d06a98fd19cf8a9d4fb46c1a18eb24b7fce8eeb57dfdbb9b7df02469b38c768abb82dbb3ac91808438619dd WHIRLPOOL 5de3788d785dd966e4ce9864157638439aa93b0bf9b3be1f91054b74b1246e0631fc966df95533f894d187347ad9954683cf1379948e3aa631a87932dd2dd289
+EBUILD libav-9999.ebuild 10200 SHA256 57971ebb2b197a65bedf3e1076fc5b00bdc22e851a8fa989308d2a16dd86582e SHA512 f7f6103b899b00a2dfe3a62e9099aa5bf0751bf25072b00066570505786777ca9edd86c5255db59835d971fdfd84624c138d2222748d5549070ffc390dcc561b WHIRLPOOL e60d0cbc3ed91d844d4b3fd75e33720542120d61946a6ce74a5de38da017c5687bebdbd12314613c8cae60387fcedb84feb6bd5ce42c88e6f3bdece003cc4d20
+MISC ChangeLog 29967 SHA256 ff3688e45c44140a5385d71c8b3f28410a4ec29a7f84bb177d546e0d9a450bd2 SHA512 925cc8d60293272e74b63b48039516c839b80c34b7086724463a358ac9c5fa795e762874f4ddab3f421cc2205ec36d6764c70d4d1312601553feaf4aa020bcb7 WHIRLPOOL b50255c804ff9fdde64126b2d3f7d1cab311c9cfa44922d26a744553e83765da884810413706adcfa40ecfaa9e830066600f195b57035a07107caf8c9e0edb8c
 MISC metadata.xml 3280 SHA256 91988bfa6250520ed3ddd5203b41bb74a022e9ff4c8ab2d6d8592ddf775133d3 SHA512 4079d351459f18a4319c1f0ac423579f25a1f9c780098c30fbd1b95f8974f8efda7edf464d025fae2ee71b41300c506055ff6e48777b8a7f902fd83f5e3545fd WHIRLPOOL b1382e14cad873722ffc9ba436a15eb2cf672a321ed3bdc1e3e5ba4122fa3ba0bfb9930ca38e9982fea757f9c12868917074a478d1aa1d8b49a3bc481ef1e694
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTogVkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTouJTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmusP/12JV1tx7eYAthmAUyZ5052b
-Ayrr1DN/SkeWMajlbgkoMCnCazSnOPdayuusep0X0TYm7DTeGX+n5KGtaizT1rU5
-IFxYt0mw8DJz9cR8IfTBdU3OjV2G8rcprw5xJZHXGI2af28H1vRMyLh6yboNg5RL
-KzB87nH3+v05wlS7Nyb08w/6PeVwltybsEj0yeWpZJbcygXtocgtTWer72eBDyfF
-rMeCVHPpvj2w9AE7mp+NzjXDec5o6XjqGl9ltHMXZA0rT9+gvD8IcZqLMWxh/Q/W
-4jZXNTdYka9OPDOKriT+7PdePc2UfNN/BA/QRnAxtndHMXz0YE9s/1/NRiY12NLx
-mS3rEUJFkBla7XuSQspEHBQoVE8qvZeW9ZjXj4pM2RlVxxKAXTpEWdZfFR3GssvZ
-B1zctsiGjKuBGB7aCzspbMkA7i7mRZwCAs3ywRjRlTUcRS8tnW/XPSiXkaJF88As
-foTSAN7+JzfVDmGythxXCLsWqY2Giz4KSm4lK9N6i8g4TJAptkQeZRjZGIPPrXSI
-fwAqcfNrRK4REyGJSWe+E42/7uptywopjwwMRgWfigbVJ+rlI2DP11UVKCCX4GXH
-W7GiY+NF68zv/xQGIt74ET+VZOkyFOGT8VGpLTIOMgI22CxGzwJX5qdRDT/ne5eT
-ZcUefTCiBGcswhRM/lY5
-=SC70
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO71gQALBbgUJtteyak5Qq3RkIx5QM
+2y2ifgIDtKdj2XpSQnitGtGp+pG6X4QbwfwnZLpx4gdvQ2cdHaPgEh2vVu4UYwPl
+xr76KF5qxze+A0h6I03HXS+7UPj5Se84kl+U9idi54gs3nKiRWM/dPWxOU2sMFp2
+vvtEO7ZHGAjTOzaaV05/wV+Ei59xpHAsJwbV1SrHgObR613cD3Dsp2joe/veDtz3
+f/oVjobdPDtNHiTL5jRSvpYXTvfTjlvmDc38zA6kd5QhS6hERRIL7aTb6tL6gvKI
+d7Qr4BL4dwu7Dvktg3tNsTYezbBr7DahwxjbagyD4OMx0DzjVqvrZtBefixgRikF
+HI87qXuH51l/caJ4/MZIYILsCku0uutsaHU4c5RtYokUT33WhIhcK21VhTWpANvX
+ViuonyVgNWFMTSSXV3aUyeHikR0nti/U4CsTMUUTWysMDmIRVsY9oLhsJp02DPXr
+oSnUte988MwfKB8EJfk5fkXUYEY2jDYwnbzTFK/iLAy5LGgxPu0yOSl2c6wzmU4I
+TFa4XsT1RIb+HZ0bymL5Ro2HYeFparBDjyqP+5OzeyZk4FOdgX10JPexxm98i9ZS
+6WBj+mWtqP4i6bgPoxLseO1DRBoUxDJI0wFqgfiF8reobjctkJIWcHvY3y52Mes0
+iDwacg+6o/Pdxdiw7i6e
+=o9Ub
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-10.1-r1.ebuild b/media-video/libav/libav-10.1-r1.ebuild
index 04a88995f57c..837af8c8649a 100644
--- a/media-video/libav/libav-10.1-r1.ebuild
+++ b/media-video/libav/libav-10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.3 2014/06/19 13:14:57 mgorny Exp $
 
 EAPI=5
 
@@ -44,74 +44,74 @@ done
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
 		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/libav/libav-10.9999.ebuild b/media-video/libav/libav-10.9999.ebuild
index d2e045161186..84cb0a05c9fa 100644
--- a/media-video/libav/libav-10.9999.ebuild
+++ b/media-video/libav/libav-10.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.5 2014/06/16 22:03:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.6 2014/06/19 13:14:57 mgorny Exp $
 
 EAPI=5
 
@@ -44,74 +44,74 @@ done
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
 		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/libav/libav-9.13-r1.ebuild b/media-video/libav/libav-9.13-r1.ebuild
index 11c584bcf543..d94dcd70d5a6 100644
--- a/media-video/libav/libav-9.13-r1.ebuild
+++ b/media-video/libav/libav-9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.3 2014/06/19 13:14:57 mgorny Exp $
 
 EAPI=5
 
@@ -46,72 +46,72 @@ done
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
 		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index be53e1aae86b..0ae75d96d473 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.13 2014/06/16 22:03:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.14 2014/06/19 13:14:57 mgorny Exp $
 
 EAPI=5
 
@@ -46,72 +46,72 @@ done
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
 		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 14dee05fd51e..5cca166a5037 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.68 2014/06/16 22:03:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.69 2014/06/19 13:14:57 mgorny Exp $
 
 EAPI=5
 
@@ -42,75 +42,75 @@ done
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		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[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
 		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		)
-		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-	ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "