6 files changed, 33 insertions, 11 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 49f8ebe60b8b..8db4229a6f15 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.230 2014/11/14 01:41:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.231 2014/12/12 09:43:30 pinkbyte Exp $
+
+  12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
+  USE='vaapi' is now global, removing it's description from metadata
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Remove myself.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 10a5e26fb7de..472c2a8346dd 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef SHA512 f6023e1252463abeee7495c4fb034077ccd21f731c32b0cbb57cadb4880fd68d46a81220fb6553d1bf5af3eae4874adfb13ac17b06c5344144c04bffcf6791ee WHIRLPOOL 86d36e2e9f80623f314352639868d25d19899625424c7a09192a6639877a9acf666c5e9a04b690f5e7b784ba70a580a76988d5a2fd605df375b7bbf096310489
 AUX avidemux-2.5.6-ffmpeg-symbol-visibility.patch 869 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0 SHA512 57db2ffaad2b4ffc46fac8f46810b1cf028013045392d1633f6e25fc65be6401fd0b5fc0991d09403d6dac39b8aacdf06f966aae70d97a53653ddc1aaa95a9bf WHIRLPOOL 093eec35dd59cb4165527bde0d2335e1ec8a88d1f8ef5cb4e51e88f6ba25204cdf645123b55204f1a8c15a3d066c5eb95f4c4ee24a6af22693a9f8e4b9378c2f
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
@@ -16,5 +19,16 @@ EBUILD avidemux-2.6.5.ebuild 3817 SHA256 0948d3702b0680984e1e04175e8caaf1d5163b8
 EBUILD avidemux-2.6.7.ebuild 3823 SHA256 137638640dc4eb758bbcdc4578b8b81c2f2846a7a86ab30f5ea48635ccad2c60 SHA512 b180bf31c2ab2945bf592d94920b7399f9a214c7da422987906a663c726a95b7d7a51edd2546ddd1e433a190881c6fb5d4df462b42c86f2c73c1af7bff35fc3c WHIRLPOOL f3da8d3e3817b6c46380a027db97dbebf6ca4fe4039c04b74eb6f4ea4ba40d79e0e37a60dd1f267b0a8c6bbc744e957c2f26859d354f79157403c66032807aaa
 EBUILD avidemux-2.6.8.ebuild 3823 SHA256 eb2560d583252d2f116109e7ef3bfd4b66e9fdbecd314ecf051497c86643c8ed SHA512 b9e665d265962f96598bbeed9a3cf3cca46677c729ae0b5e81dfa5d823bd20c173162d612b0ef2b1c8a73a5b7a6c5d5bd3cf28970db76bd50b84b1494b1107f2 WHIRLPOOL 1460e953a206b5a192f8dcf3a4978e61fc61636de8fd40ba54adb0da8977c306763d91cd8952f231745c558527b1a8db2813c7540983791859e19fce74fe0bf6
 EBUILD avidemux-9999.ebuild 3822 SHA256 4bf3fb2cff7073e7358d284f32fd591dddad7377ae06ff39d2b0d1e3bd4ffad3 SHA512 027f99d4a1800948eb32d1d76d087f413af3f91a7100b39c395bef84d1acd6e57d28ec57a73ee9ae67e01e03c7fc3f0064f70a9633dd96b49d4a9b0d5b8f93a7 WHIRLPOOL ef5d5e0de53fbb9cd9abeca76b06b91169f1ff6aa5db702812f53e07eeadbc6b996bafb4c957451bc65920403c649260d16025bd70298d824a1769c6e01975fe
-MISC ChangeLog 43001 SHA256 a33e5f698c3bc688264a529c42a48acbb1ed88e19cf08690d978631eaf9db982 SHA512 841e7a1866a53143bf093d7e041e183f884c26f71db9f21648f7284ebb34fa84ef42894640b6dbbe8c21196bc763a496eb888fd43fee93e7ab69ab729a09f049 WHIRLPOOL eb17a3acba74dabf0c4ae96d7f54a5940b6c94d460649a9ee79e30ba92dc9f590edf3d601e4e67963f2fa42d6b96150815f0c917fc4528292738f85025887b92
-MISC metadata.xml 537 SHA256 8b002addba250be0fe8dcfc2dbcae9aa442b3bf8f6314573ef262218be6caed7 SHA512 86b7e9a74696eef9e3f810ab33d5c0faf1cbf5cb0723e607d90b465092c4bf71aa5561db8b31c15a5d0d00ece4a544286f9b063d29ec85c6481518c93fce6be5 WHIRLPOOL f480e09a39d3b5c41aca6662b9aefdb862174d04071df6b05767cb0ffd115d69ccab8fd0c1a7d193bee1f38f1ee06cb547c40c5799a7a343a0c15c7a2ce376bd
+MISC ChangeLog 43137 SHA256 ac73e83f542143e25a259eb01bf0a4d4221edd2a5ab3d6cd2ddae6b4382b3dba SHA512 d8eb6431610c378d510e4c575a0b758779cef25137cc38c1b0b85f64de3ef4757b3ca85cca2015d43eb268f2fc89dc7cdc82ef1388c0f80ac9de6a2b305ec4c3 WHIRLPOOL f12bfe94a3364f01cffd8f2755200e7e9ab7b0532c21bb5ccce936c07df9dcf15c5077ccb3f697b732938a73a20d27bff43a3d698381ce9d184ff82749dd58e9
+MISC metadata.xml 446 SHA256 a2fb3a65488aa37ad428a22cadb3b4fb8266d79ccf88ca52f8cc55359dd196d9 SHA512 1340753b594a425470665d4dbaaa3f59c9115dd0c478c2819e15908f6393e38eedda2c7c313b15acac406ae8ea7496573ac95e6f01284c032834bba717dee0d6 WHIRLPOOL b159ca767728879279c91fb470a93919a27b140087ac6085dd73fc36bc28aad098f65aacb84015677e07ee1b73ae038df64630e73ce1634dc83002ce91036689
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUirjCAAoJECo/aRed9267dcoH/3Jb775MVeH911mm0HG+Fg91
+qkKu4HYVyNv2u1DMFxxRGWRj6nbYwc9DhNaiLMujWruE9jjYvhewXXb+b2/dxB3C
+bnuRtjA0bP5+CjBZToFJO6iP2XagzoVFjj4mn7uPXBKQ/kYvEDr/TmaQNzR+fG7c
+fZwWaap/a5bM3N6B6sg/6QAZ1MByS+agb3NGC+gApFBPU10uYiK4XoXY4r4ZaKBs
+qo366V6d6r24hbVGQCTy3GnKJJXFq3YPCC2DR3zPqn5xdVc97t6YE3VyyI81LiKX
+tYsbkQ5lY7xZckWoP8KUBBCUU0waIyBEdGASJ5Eq2WozFJx3DSSZjn4weYDRbb4=
+=x0kI
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 3bfb2fa47f55..1513c89c2f74 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -6,6 +6,5 @@
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
     <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg>.</flag>
-    <flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index b273ebce5cfe..9f62e9b86d64 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # 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.813 2014/12/12 09:22:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.814 2014/12/12 09:47:03 pinkbyte Exp $
+
+  12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
+  USE='vaapi' is now global, removing it's description from metadata
 
   12 Dec 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.5.ebuild,
   +files/samba.patch:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2bb7950a3bc3..dca56464dbe0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -28,12 +28,16 @@ EBUILD ffmpeg-2.4.3.ebuild 12981 SHA256 52cda2b043ae1f91dea6807219e31618d1bb273b
 EBUILD ffmpeg-2.4.4.ebuild 12981 SHA256 35c9f6a0ca3d367a611e561d94e3a4b9f755ea1a19e1812433c6f5615d6858e6 SHA512 da97aa8e9c5d510f12d48693030b983756573a5bc62ae15b8aeecf7893bd4c9f9b34998424361ecb1464ca9b4380fd25dfac14c9b31d6aeb0890703d8f9efac2 WHIRLPOOL ab1b76150e2fc7df48238ab90e88832c160a2af079dfa9050769c4fc0a6738be7f3b49d22546d9a8fc3306f886f9e27bbce5c38311e170f84eea7d3fd8856edf
 EBUILD ffmpeg-2.5.ebuild 13107 SHA256 934e73b5d76a135ba1172b55b78292deb1e8fc90a128de7c53491f5859073e18 SHA512 c7afdc2f2fe8f8b7f3b3f04cb1a64342c4fc2ba777324c7f17f1d1f867fb142ffbf73e92407d8f8c984768a4923d82a94b2fb6a67020b93f735b69cac0f2fc97 WHIRLPOOL b236feb3224b31792adee72ebf4d7ffb6418fd8b4ef3dcce7c79c9f35b61a6bfb8c0d72eb7b8ca7aacd56113c2e49ea6f5de82b8f0fddbe83376d1ec8f3951b7
 EBUILD ffmpeg-9999.ebuild 13076 SHA256 bac15fc30d7fc2f4a2a4db916c61466aaa26da128fd88bd99155040928551899 SHA512 f0b9b7b8d6d3bc0990a0a85e0219f98af176b5dd87e1f98981f6a337e821aa0d9657e836b296bdd51b4febfd7d3dc04bb2f7cf32a3c1024eb21fba71e9927048 WHIRLPOOL b51c96f1ebb6fd2b87e9494d5e6023decb3c875024ef836974b83a6cf76fc65a2601b596f5a67ed3aa098836dd862d548db02a48e928fae7c9ed6f66ccef7f99
-MISC ChangeLog 112584 SHA256 ca314b22dfd4a65829693620953b363573c7b9e6e5036705a0be845dd4f8e348 SHA512 7bd53b41bf01914bb0325cff9780401ab1be2022782cbd801f4d468f83c7d9f1378d8f687ffa352adbb5a0c1e2def6bc50748835b794727ef7df846baa3e16d6 WHIRLPOOL 2f03145c9e67ad3dd1aa477ef73fb68a728dd255fb4958df01199e3df505c369576dd43cd5ee3c4a9f1c11d68ca1122e3460cf3dbc1bf54ecda2b473cc24fc83
-MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
+MISC ChangeLog 112718 SHA256 e989ee9c7823a63e5e1ea288b8d20d8554a52a0af8211dfb23f3452569f21b2e SHA512 71717e4d7c64d98ffe457474f7853e9f9cc9d16c63d000b5b11b5823ae21194c81137d6786c9d4bf02138ecb9d11fab1ae24cad26c709ce2af95387fcead2b74 WHIRLPOOL e4cffbbd942a0b898309e79d3e486915fb7824a4b3c90e324c46ca45b2d9c43506cb8baa3e8000910969b0aa3e9f7e3e8dc7cb5d7569f604311f95d791429a83
+MISC metadata.xml 5559 SHA256 e0d9e8286e57b1e542a46209900c5e87964f985c136711834b01383bfc2ffb61 SHA512 3e5ce6e7b9b98fced139ca28162d0cd16fccda7b08aea5823290bcf1decd1b7c2e4827f071dc8b80d52a6451a16739c5c15bd84539ce274037dd0cfb86cffa13 WHIRLPOOL bc62cb31dc1f689eac4a0e86e6c247aa55dbf1cb849128284417916b000fbcba4b28262bb0791368009e34199887ee1ca759cc614d4c1781af1dd024d6dd390c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSKs+AACgkQvFcC4BYPU0of7gCdGBS3ByG8hxg+Ub2g2HsgSzmh
-AdkAoMC0qPh02yYvNWN1MQaWB4x0PJ4D
-=iH07
+iQEcBAEBCAAGBQJUirmYAAoJECo/aRed9267/AsH/An1p1HzS7uqIAacM/HWUT1w
+OZ5rP+F6ACGSqXru3afb/wxZAAPggU9mZWERNy1UhX8wXx7dFT00kCQsr26nyBbO
+G7UftLqT4sn4cF6uSJn8a7neh7rCknMqcJxL0uAa4eIJQVPVvlfiOtGaDj/PRhmc
+hlOFlclcR2TV3Yvd2x6a0IhJepeo+8TrtQchk+H4eq2fWccf+NULJWs4+Xi6sjc6
+L/XXZaor/IR9sSK2+imlop+mToyleIVftf6rgDBgzRe1dzHg05v7SCezZdGcc9De
+d1aoIa/h8GY76DzWlpDD5D4ij9P9JOgqkpSt1MDqc7chJQHyyetl2p52fodZQ0E=
+=Yhwv
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 71a258aad50f..7cec5d9670db 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -56,7 +56,6 @@
 	<flag name="sse4_2">Enables SSE4.2 optimizations: Nehalem-based Intel Core i7 or later.</flag>
     <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
-	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
 	<flag name="xop">Enables XOP (eXtended Operations) optimizations: AMD processors starting with Bulldozer architecture.</flag>