Switch to CPU_FLAGS_X86.

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

3 files changed, 33 insertions, 8 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 5038ee468615..283ef1a91325 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.232 2015/01/06 19:41:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.233 2015/01/29 19:13:34 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> avidemux-2.6.2-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   06 Jan 2015; Manuel Rüger <mrueg@gentoo.org> avidemux-2.6.5-r1.ebuild,
   avidemux-2.6.5.ebuild, avidemux-2.6.7.ebuild, avidemux-2.6.8.ebuild,
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 0342f20fcf7e..73fc8f89bf68 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
@@ -8,7 +11,7 @@ DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c8
 DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-2.5.6-r2.ebuild 4404 SHA256 1c98dbcbea05878eb4e82624fff39e60740025ef491e6b8a4a03fc4fcc3f1c3d SHA512 2aa3c5fcb2810ce3ed9509aba9612db6d0a3a86befa271f83d4742a0eca780baa9b39fe030835ae658e6bf3ba195b44c554ac95ec313d3520d7a1c1e4a509fb5 WHIRLPOOL 4251e70b36728c0e554078b83ae7edc76a609a92e8b65b4d38856dee177714f59ccb2ca8c22d9f7b511aee0a557ff597d3c0cf132c9339dc5f5d3b54d08bcbf2
-EBUILD avidemux-2.6.2-r1.ebuild 4001 SHA256 952f94f38505c251e25c65ddda7f85bf51ae21fc90c78b05d85f0f2c44d4c596 SHA512 fc00ed4467953e886646e905a022835d0d81dd62ab00517df7967815267edc52c0b4f0003b89650bccb91f19ca65be6966a59179a0d667654fbee106e545f1f0 WHIRLPOOL 5e2f90803baadc59d10bc2e7ace8bd81a893c65b16350b9bd6a98361d854013ccf30f19c03f5510159b84a97c0fe3d0076a0f42f533accb81f9b0b456f565c44
+EBUILD avidemux-2.6.2-r1.ebuild 4043 SHA256 2dc3e891c45d8f67199e676d4b34889ca86d49e5966e3ae699c40625c0d902f8 SHA512 ef4a76584863d397ab57752438bae28bd5a46b0549458b9c1445fc18e59895a3b9bd64befb1776d251631cf4b4fcc4540e1893f407c0a3a03d2aef1340c0e288 WHIRLPOOL e8e271e2d81bf0781260da7a969d8f8e0cb615c577f89151b8c05601bdde8e4e67e4f5993026cd8d8e45e9e81564214192c2eb7292a2b0cd19847b88e6fdea8c
 EBUILD avidemux-2.6.3.ebuild 3454 SHA256 561d8109f9c0ec6cbe89e8f6a40adbd3bcc6cbaf5991dae3d44571190a83cefd SHA512 9385cb523e2215445321ff842f8d8415dda93176579ef4cdb2a29602a1be7c05f69e7edb6b0e6712bc0faf5d51af2628f349d371186eedd2230f6f1389e31be4 WHIRLPOOL 4d520d6d3a8f2f87de9cd17ce993e887b78127821250d1d2326ddfbfbb70ac51916d1c2a377c189cc98a71b5c5ce5ed7aa1ccc6c8de42d3c9255e8a35dee05b0
 EBUILD avidemux-2.6.4.ebuild 3435 SHA256 2f9d3dfaf5af5447803a490561a3a6bfbdb45818161fe6c983b9b8904f289b8e SHA512 8d8e329ce4cea70c3ea07f9b5d0b34bdc30cfaaad028e5e04e2385e24bea3180ebc640f47b3efd2a0e248bfc48d33f56f05608d0ba6406a52c6a694d98cb25e3 WHIRLPOOL 3d2c4c8709aaa2136ee0a64e00d3f8913188010844ccea6c66ddac314a9e990dd8355a9ff6ede5aac83ee039c65529c1996b9fe33fb816c678e612aa09b74745
 EBUILD avidemux-2.6.5-r1.ebuild 4139 SHA256 7b183fbaa2107f0c50273b7bb9b596063b4dd0eb674d2699a49fc8df680ec212 SHA512 e66d4cba76922db2060e2fa5ce4576caac80b5509a5ff73ab44ecc90531d82e27074996b06f73b4ce8768af13f99cf9188b9f8d05e0ce2c53647ece95262f870 WHIRLPOOL f0753df4ffc6e33baa822035d07b62f13ee60b5f65bf5353dc8a8a7eaa83a7edbc4f4fa1f568bf53179b320bc02aab7939ffd7f94e3edffd1305ed831a735fa6
@@ -16,5 +19,24 @@ EBUILD avidemux-2.6.5.ebuild 3864 SHA256 8260a90c6ee88c02a8cdad097a5cd7b0ecbd5f7
 EBUILD avidemux-2.6.7.ebuild 3870 SHA256 084d6093cc296cc6f0ed4c554959a6a48d42ba6a6daf8526533c5797027dbefb SHA512 70146bcdbe6d15dbbbf6187ae2bd475aa33565ef4228fa045a661dce39e635da061ff9e426ea6636ebd75ae9803431f3b108fca0bc922ed0740650ea7196b656 WHIRLPOOL 8f7aa04a7085415f651a4010b5c1f72ac49ce9d57d4c62ea938db0f160b7a534969ac421fdfbe8bbab6a4d31f45379851d486825468c4b3bbbdf0ec556dfeff7
 EBUILD avidemux-2.6.8.ebuild 3870 SHA256 6f178659bb4d9480ce3bc3cf72950393830291ba3aa6812b1b3caa8e3acfd035 SHA512 e86b77e163590d33d644308d0f95e6795e5cc894f6df6233d254cc7adb254f72a1bb601a453ae590fee712ca7fed76266b7e610648bdbe1ae8ff5e095adecb72 WHIRLPOOL 4639aea32734eba0cd707f25d3b52b395a5e7011fa07878f82d29c724fff59a5aaba0a8189fd1e7b925b2f150cbef70e6af73c36c36cd30d4a962b1b7668f2b8
 EBUILD avidemux-9999.ebuild 3869 SHA256 a0791be4f7c08dcb01e54e984c70ced4c9710c02db012e8fd547949cd0bda2ec SHA512 c93d095eec3cc01ef4ddac97673153ff448b3b6092231b9905c3670b300e53b892fa40545b3c456b32d82c12f966100adfb941511c4f82e038e0ca093cc45452 WHIRLPOOL f322eef8385c392d78af07d6e7b5a56985ab7570d14223c5153c512d3388156a7c8c9fd9d2fcd51fe9333c4e1fc0e0635436412fedcae4990b50dd0a257ddd43
-MISC ChangeLog 43396 SHA256 ff8b86fa3b77faae2d58902693e02be333e8840fc4ce0d80840cb409cc300767 SHA512 9db6fe3d0d7b26417d3ae4d1c49c718fcb8ea79913d47e405e6739cd4bc90252fc63bee6274a1e21280082ad8727cc6ec703bf5b9bd677b1d940de41f3bfa068 WHIRLPOOL 0c0c3e7db4b8e808898ddf4791041e76edf95227f3ce0fb82b80a367a71e9a1ecd8fd1a75e060e7044ead1f15c4cad8783b03dd4bbcb0bd02dfc076fa78db9e4
+MISC ChangeLog 43501 SHA256 bf5c8b539d6e30ac299b9383b3c3dda2ce8a5bb087860335f6b970b174da3957 SHA512 e85c2de4babc72668e180da6e580876ae2c6cef1cc0826b96546e9838e071949c167507ab02ee943d97d7e4ab77b90116e615fdcecfc10dc1326d4f7ceed6652 WHIRLPOOL b070add4eed7e98da1dfea88a5f534b50944c7ebdef40bdc4e8e38eeb860509d57f95a04f58429a163375f0c3d9084e73b28e13cf5267b7d40159c5d5a0b9754
 MISC metadata.xml 446 SHA256 a2fb3a65488aa37ad428a22cadb3b4fb8266d79ccf88ca52f8cc55359dd196d9 SHA512 1340753b594a425470665d4dbaaa3f59c9115dd0c478c2819e15908f6393e38eedda2c7c313b15acac406ae8ea7496573ac95e6f01284c032834bba717dee0d6 WHIRLPOOL b159ca767728879279c91fb470a93919a27b140087ac6085dd73fc36bc28aad098f65aacb84015677e07ee1b73ae038df64630e73ce1634dc83002ce91036689
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUyoZfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOy0sP/1fOalEpcFNVnsvplKWJl+kM
+E8P9d/WJZS70L29g+cj1UrcbgLWe3BzQkw/T1QIryYFADm3nd+NXaG5JRpH64FPL
+Wdu6EQHWPvc/MsQ8Yar7HrJ+Tq7SLY0OOqKDXQVqXmwuamLCds2IA2jaPyRMzGUK
+UG8xNGxNp5Sen7e0fhQY8u0FReM6D1Tahurdy7+0n5akwzDcUmcBDsycSr6xnNTE
+0nPto6w9txLW5r6lTWMEWlnscXohYk+RyOC8QLbFsxNqpjuqyV+BMXlKg5LWE3M4
+N64Ns78l1bub0H9dmzymEHbE8i7Med2ukFMNJcEXYVGB0AhUULTroIjzppPZG9jF
+mP6LZVIJSMVFLWeldaZ3TalWuzHI8yBj8yC1+F54iYrts9Bwp6JOBreAqPpV8076
+dREuTx5oFXkq4zmJnEva1jrITHuru+EZVmWKQlzH0ObVYbFB5L3dI9NGC193aZOB
+K+Mz+38L4qS0d9hqCdwLtgiB0P/VvWRZgEkGrw34JfBJXll2I8jVpfd+AF4Gfdls
+Pwl3wLPeXLDczEDPVPuEwcmSkLHLsCEtenLWgn5c2af3oFkMgVqhiuPsvSMQvQq2
+Np16eKNVL55vzwmFrvHza44FUFJORuMz8d6B18Rwv/8nQfCkF5bDDrCyDCD0TsmC
+fF59uvMSWLNXgCTGLB0x
+=piIb
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.2-r1.ebuild b/media-video/avidemux/avidemux-2.6.2-r1.ebuild
index e7a734716bb9..0f63da482c84 100644
--- a/media-video/avidemux/avidemux-2.6.2-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.2-r1.ebuild,v 1.4 2014/08/10 20:57:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.2-r1.ebuild,v 1.5 2015/01/29 19:13:34 mgorny Exp $
 
 EAPI="5"
 
@@ -17,13 +17,13 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
+IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate cpu_flags_x86_mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
 
 # TODO: Figure out which dependencies can be moved out of avidemux-core into here.
-RDEPEND="=media-libs/avidemux-core-${PV}-r1[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]
+RDEPEND="=media-libs/avidemux-core-${PV}-r1[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,cpu_flags_x86_mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]
 	qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
 DEPEND="$RDEPEND"
-PDEPEND="=media-libs/avidemux-plugins-${PV}-r2[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]"
+PDEPEND="=media-libs/avidemux-plugins-${PV}-r2[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,cpu_flags_x86_mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]"
 
 S="${WORKDIR}/${MY_P}"