Convert to CPU_FLAGS_X86.

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

5 files changed, 55 insertions, 39 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 85be14333b9a..22fa7e184455 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.323 2014/10/08 12:08:00 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.324 2015/01/30 05:32:17 mgorny Exp $
+
+  30 Jan 2015; Michał Górny <mgorny@gentoo.org> transcode-1.1.7-r1.ebuild,
+  transcode-1.1.7-r2.ebuild, transcode-1.1.7-r3.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   08 Oct 2014; Alexis Ballier <aballier@gentoo.org> transcode-1.1.7-r3.ebuild,
   +files/transcode-1.1.7-ffmpeg24.patch:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 996484e0dce2..5339c27b034e 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -11,15 +11,27 @@ AUX transcode-1.1.7-libav-9.patch 1413 SHA256 9a53c93b1efa1a6ee6fbe30acbcce44160
 AUX transcode-1.1.7-preset-force.patch 1199 SHA256 fe95e83093761924ba0fa5b3214e169812f7740c6c3c434845b1b563d4a37241 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc WHIRLPOOL e7742ba9dd8a9355f64d640d1005f8713dde5d0ec896583792e73ef0143087d0bbd09673df97c7b65bfe637dbc9ddd2afa1c9786725061440de93b94f7500781
 AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8db8d1c268a0b37bfe867514f871d7d91ef SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912 WHIRLPOOL d7247d7e506bc5fd2ed579d934ceb121a54c93683de143b7c4ffbdd4b33799acc9c1b4e93e90db4788c84bc4320be05ae90d2760a86a979ae1f57fd4e3bf3750
 DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
-EBUILD transcode-1.1.7-r1.ebuild 3231 SHA256 b2a6f1734a17471dd0087bff25d837fe047a5e825633fcedaf0434bd5e9a0834 SHA512 106781721634536e2b0fe789b28d90ebc063edd55fa7cf0e6e36f1d2d2d18dada1d9b6fa529edf1111330e25111409fe16b40bad816e544062661a03975db80f WHIRLPOOL f2ca628e8dd4a15ca3fd5b931d552d9eddb4b5d8d065986d2c0da4fad47216c8714ef92b32406b7b6ad4447c06467b50950b99fc145f28aeaa24be3ec16bc0e7
-EBUILD transcode-1.1.7-r2.ebuild 3273 SHA256 894d4b5fbcb34c58311aa5f955eb854954bbd3514e7a299a9dee1fcfb91ace42 SHA512 c70d84b6d63f833791579be4ef605a5a4549a3a76886f59ab135835c9a6b9245ae0ebb7bf0d4d3332de80a5fedb0b8faaf68296c464f5aee61a4c45fc50a9ade WHIRLPOOL c810153c6e50f3632b3f1db30f71a07e9cf5c255c5606cec3c62e63e7da8b94d99ec7d7de3481997478b71a31e9d41b48f3daba4b5c0362c7e427e553a325f44
-EBUILD transcode-1.1.7-r3.ebuild 3428 SHA256 91b6241f80e2ec9bc2af42b2626074438e2cd03f21f2a65c14baedfca9b44643 SHA512 db583e23ab492f5bac61fefa16095d457aacee534dda3d703476fcdd6dd13331a82c63958f03c0dfd992c6089685680b25cdec4238913316b0d0d5e578f36340 WHIRLPOOL 6a185c1730aafc47c21ae51c615f26a2d10cfca2a598dcb992ec0af70510b1f23f874010e23646dcc1c2d39156793c7a5c871002f382fde5cc7d1b9ed1fe551c
-MISC ChangeLog 53373 SHA256 76ed0b01f6bb35ac78f8e8cce7fed2ff98704beacb7032518c0a155ffadc1c71 SHA512 e83e04778e92aabc077f50ac91f8093d482980e0d036dcf9460bd2ff4a33b7d3dde73a436365dbbd8ce857b3200ed2f8cdbf0b5f8d913c6ec26447dc8a5fc8e7 WHIRLPOOL 22fda77d00099947272edbd1e225c1e16488cba66dd31c868b72ec4a4876049fbda1910982757c554be15b829c3eaacc4ad027358ce124e14d125182d9476251
+EBUILD transcode-1.1.7-r1.ebuild 3460 SHA256 4c5890b60cdaa7b8c3513bced24a2a1988ffbfb05a9c0f243d5d207d3c867b51 SHA512 951b0fa751984367704db14ef94c8a8e8f7323951ef37f85f4306f041397876010ea3a58b5e752e6b500736400c06912d0768f5e8c29f1ffb3e0115d568762b9 WHIRLPOOL a954beada787110fdb62b59c45953f4558b8192e8dd7484f9d90815a973f235c0ad73c5c5dae96e45fde778ec7e3cf7602aeb180cfd3ba104c99c5095a5c8eff
+EBUILD transcode-1.1.7-r2.ebuild 3502 SHA256 e14d9c78fc329645b1deb4cda774ec9c5923e4f31714caafd0708a5292240380 SHA512 40fdea0f56fc6d9e2ef85b3ed742caea51776b1c838bb92fa2bad4379994a10a86ab31ca9042b092018ae4d76b3ba62d67e3d59aa7f332c0fecd02fa43ecf98d WHIRLPOOL 74103e3a08ad0f73a2af37ffb39ba3f1f5a2e8ab6071ddf14c2bb339a95f77d35f49fc042ae62fcf66b7398407c497be62b9bb0b055fe7d3c75f99482ac5261c
+EBUILD transcode-1.1.7-r3.ebuild 3655 SHA256 756473dc5ef390b613f686ffea1ce78198ac43590bbcd55fcd62e204dc0431dd SHA512 bfae1e696789889d35605adcd55d06ed4e59042a6ff2641937857583a27274ca449f1a9a4253255d96ff65224bdc2b712fcf4b53632d34a10fde86a0e4abd081 WHIRLPOOL eff63e916d6acc28fe23c09ee7a4a91f799e15aeed4b281e52680d6578ddb60ec95e3c2418e0892cd9cf16e8ec4b19a618f6941eed81ca1eb9b774fd931b57e2
+MISC ChangeLog 53533 SHA256 6f80d4bda0fbac28ee4130f5c317ca05ff3802126102a206596bed4d335eb501 SHA512 3a14a4395a7cf4d9e0f281f5e1266a640318c54d7774d5b516c1f1ed81f355e337fd5a678bc855485fcd55380cf45793fc99ea1e74e375d52512a6b4b5ec9673 WHIRLPOOL 300a89a8e4f5fe5a255ae643d646a5b7b6c05a2103d97ec0d690c0b798db64a18de2c2066ae8364b58a6019ac4fce6cbbe5e9ae21fc94ab94f273e56719124ce
 MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ1KSEACgkQvFcC4BYPU0pDYwCeIhfwM+Cbj6Qf+2iE5Pjtwd3U
-4qsAnis5rEdwL9YW/9hJiprPEoJ0d67h
-=qQL3
+iQJ8BAEBCABmBQJUyxdiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdAoQALE1WgENcbkh2HXNVHxxQFOX
+LOxYipqz61bufuJLiYkZUFOVq7MxOJQhYztwGPxMLutHZe31CNFNa+xYk/TF4wmS
+QHbxpOb2hx2N6BDVUkBQIQflaJJX/hBTwlJk/66gT1x7kW6mLDkogsarVWb2gdjP
+Kr8eo/isiv2UjnMICREvcT2/1psRbfRklv6hDUn8/OH3+tYf1bP733LRlfTqBCoM
+6CxkIcFTmInsIxFGquEQ72aH/sWXGfRVtB75wmUJQPVZVW9mSB/uT5GrUjtCBQWb
+33fNqzUFe/gYG/UmS5qSjolhCXquZzJ4Oa2Pb3B1FdOIIbr3jeS1dqeeYDHQM1m4
+iWRAkg+zBfYKXV4m6I+2tj+jM9Vrlo/usKkJiXQHjXdB56vyFxWT5K6iqRMVoKM6
+UXpO2uBT+2+rzy3Gg9lmx4+8+T/8B32B7M1GqGFmXAgZRvqXiggyVOtGC3KXtgLs
+3aSzVyR1qFlQ2Y74bsJ+8vnsT7wysCVShbdMKXx0ZXjg6qfFPbCTmLlkgBdjy+My
+PhiVADuDt66VSGpNf0ZiwVkE4OH2nU/KXigVSjPINgNtoa6+Zs3PW6BtlCuYy9U6
+G1xb8zoVHjJtfbXyHYcn/E98SbM5JIfptlNneP1wGWYlv5cKkLyDDG5K2p6Qf0qt
+FL3D0ij51OfsusbrFZAe
+=3wYO
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-1.1.7-r1.ebuild b/media-video/transcode/transcode-1.1.7-r1.ebuild
index 506e8f9e7b38..48c31f487a06 100644
--- a/media-video/transcode/transcode-1.1.7-r1.ebuild
+++ b/media-video/transcode/transcode-1.1.7-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/transcode/transcode-1.1.7-r1.ebuild,v 1.11 2014/07/06 13:21:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r1.ebuild,v 1.12 2015/01/30 05:32:17 mgorny Exp $
 
 EAPI=4
 inherit eutils libtool multilib
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
 	>=virtual/ffmpeg-0.10
@@ -49,9 +49,9 @@ DEPEND="
 	"
 
 REQUIRED_USE="
-	sse? ( mmx )
-	sse2? ( mmx sse )
-	3dnow? ( mmx )
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 	nuv? ( lzo )
 	"
 
@@ -70,10 +70,10 @@ src_configure() {
 	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
 
 	econf \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable altivec) \
 		$(use_enable v4l libv4l2) \
 		$(use_enable v4l libv4lconvert) \
diff --git a/media-video/transcode/transcode-1.1.7-r2.ebuild b/media-video/transcode/transcode-1.1.7-r2.ebuild
index 53df0858ecda..ac35b7c59b41 100644
--- a/media-video/transcode/transcode-1.1.7-r2.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r2.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/transcode/transcode-1.1.7-r2.ebuild,v 1.2 2014/07/06 13:21:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r2.ebuild,v 1.3 2015/01/30 05:32:17 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool multilib
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
 	>=virtual/ffmpeg-0.10
@@ -49,9 +49,9 @@ DEPEND="
 	"
 
 REQUIRED_USE="
-	sse? ( mmx )
-	sse2? ( mmx sse )
-	3dnow? ( mmx )
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 	nuv? ( lzo )
 	"
 
@@ -71,10 +71,10 @@ src_configure() {
 	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
 
 	econf \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable altivec) \
 		$(use_enable v4l libv4l2) \
 		$(use_enable v4l libv4lconvert) \
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 1e6be6654b6a..7d30503ee663 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.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/transcode/transcode-1.1.7-r3.ebuild,v 1.10 2014/10/08 12:08:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.11 2015/01/30 05:32:17 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool multilib
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
 	>=virtual/ffmpeg-0.10
@@ -49,9 +49,9 @@ DEPEND="
 	"
 
 REQUIRED_USE="
-	sse? ( mmx )
-	sse2? ( mmx sse )
-	3dnow? ( mmx )
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 	nuv? ( lzo )
 	"
 
@@ -75,10 +75,10 @@ src_configure() {
 	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
 
 	econf \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable altivec) \
 		$(use_enable v4l libv4l2) \
 		$(use_enable v4l libv4lconvert) \