From 0b94c148df192f0ab277d4d876eb7c0dde50df69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 30 Jan 2015 17:27:29 +0000 Subject: [PATCH] Convert to CPU_FLAGS_X86. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- media-video/mplayer2/ChangeLog | 7 +++- media-video/mplayer2/Manifest | 38 ++++++++++--------- .../mplayer2/mplayer2-2.0_p20130126.ebuild | 10 ++--- .../mplayer2/mplayer2-2.0_p20130428-r1.ebuild | 10 ++--- .../mplayer2/mplayer2-2.0_p20131009.ebuild | 8 ++-- media-video/mplayer2/mplayer2-9999.ebuild | 10 ++--- 6 files changed, 45 insertions(+), 38 deletions(-) diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index c78e29094b47..fc979158e560 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.138 2015/01/02 12:32:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.139 2015/01/30 17:27:26 mgorny Exp $ + + 30 Jan 2015; Michał Górny mplayer2-2.0_p20130126.ebuild, + mplayer2-2.0_p20130428-r1.ebuild, mplayer2-2.0_p20131009.ebuild, + mplayer2-9999.ebuild: + Convert to CPU_FLAGS_X86. 02 Jan 2015; Agostino Sarubbo mplayer2-2.0_p20131009.ebuild: Stable for sparc, wrt bug #531798 diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest index ce2b143b613e..b1f8b76a30fc 100644 --- a/media-video/mplayer2/Manifest +++ b/media-video/mplayer2/Manifest @@ -8,26 +8,28 @@ AUX mplayer2-py2compat.patch 2179 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e03 DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079 DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78 -EBUILD mplayer2-2.0_p20130126.ebuild 11686 SHA256 9a56cd8eb35665a77423fde35a76c98cc2b091f9837376821fb2271bfb4d94bb SHA512 9be3e0cc59a7166a615cce848be8b09db375a813fe774d221dde9624f79d954f820de092d39248ab79d8703670bbdd072bf670fcca609443c809f098e2fadc54 WHIRLPOOL d3aa4cf4d5a2c48a969c46bbf3bedbde8952026c0f58466fa3ebed5c2e359ae1688c1243f43dc31d2c4d2b0c25f5781cf57df4ca6692a4b064dc2f4aee60b27e -EBUILD mplayer2-2.0_p20130428-r1.ebuild 10363 SHA256 9d24e40045dce8048a2e2a2da2587ec2fd480e9656a1ba65c8dc5095ecdd2372 SHA512 a3ddd8624a2ec0fffe24098f8e8e6de721f98cc33e2b759ec3625c48d4218d2e83d6ee061d422e00b463b15f00b18e44aee2112ee08e99cc57a8238f77a5103c WHIRLPOOL 00770f86e17ee4d2edb75d1d93d67f057bd29c2c26f3d6b2e372c5ec0d72554557454c48fa21acd0c6074de449f91bb269c85ba73d856afaaac4abc6130c8728 -EBUILD mplayer2-2.0_p20131009.ebuild 10472 SHA256 4104cf2cc6d3a6b31d17f96ac1f144948fa85fd757515c6673075f7d6319894e SHA512 fbda2fa36efe7ef2b341a05de3380a95de271be9684e7fa8fb5535caf61a8c26b8b506e10400ebc45880920e7df6a56e75a500f8878e8e396366f60a8e755bf6 WHIRLPOOL 9b2d160e83fa8f004fcd50efff98e0934d4fa495b720630b057f98fb154ad38d05e14402e116c3b8c797200f589fa89a36a1aa07bd9a18bf45671f360861fbf7 -EBUILD mplayer2-9999.ebuild 10427 SHA256 cefb2b5111267ddf3147e27c35fc294c96ffddc7853dfee7a7834cf62d97d96e SHA512 d501f653137c2a10384e23fb5aafe35c06d41fb81a52070fe2a4c3e62d8611fba470892969830598d9a490c4d8b7992075f3a49aa9889e75b7cc59625a0f43ba WHIRLPOOL 11d89c2b98e77cfaa4ca49cc50035b4241afb3c85e9b17967b14d2b34d7c90240727ec3ec7c8a28a0102a49bbcfe2a339fd2c641c9cc83652632199c8c7605d7 -MISC ChangeLog 24911 SHA256 b3a5695fcd4ca29342f896c5b8cd40fcdba9c3906aa0f5edeed14ee1eaef1eb1 SHA512 05e6333bc22a79401406c3eb51fdf683004a7389df86def59dfdb44091feab0c4132390fbab9aa4f26b6011f9f34407962d06604930fb499202c564c1d675e9d WHIRLPOOL 7c934bf954d4496a3cbc69a3eae4271dfb21d5cf1cf6fd68212ef9ca2577f7aa795b47de50666e2362478989aed1ee49e7626934e8b3e8220072aa260ef1aa20 +EBUILD mplayer2-2.0_p20130126.ebuild 11842 SHA256 a0b0e2be323f3f8ffee7c01063d50a80d989f26b169d8807886d0137a7243d4f SHA512 372ecf65066e3c235c29680503e611510205ece3d6ecac94f6767121631c3676d102669854d1a87dc093d500ff70afeaa3b3a15ab814072a0eb9e4c4658b88e0 WHIRLPOOL 05ca9a84f311d14edb60deb4028aa540966006059f153e08adfc41beb6f3534a5925bc6c06ffe24776ed4c106dc2f27b72624e4474bfd77b23ec4d29ba368e63 +EBUILD mplayer2-2.0_p20130428-r1.ebuild 10517 SHA256 218c1b481bd74be4a9b2095e3b2336636d3df4a0414f5a5a5274a41086e28fd0 SHA512 1bf194ce10eba257b712e53db37710c4f654edf4045597c82e5b2522a8c03e883c95b429b95220b134471b79441396b9e49fa920e4a82f47672316d884d9f6ca WHIRLPOOL 7c2e1e37ea0e3a53dfdd499c6220f9a60a1626a6732a0b827fb52d3e7b7fa0bf9f4438bc16fbc523ee7ba845231ee82d9262bac8f984344149924c65b8a38233 +EBUILD mplayer2-2.0_p20131009.ebuild 10628 SHA256 9b7ce9bf8b09527d9ae12f84d392269c853dcc3e3501ad283ca484071508ab2d SHA512 01639bce5b693a0961eb84de695fba6e7a53fb3099e740e6fd8a1f04b0069cc66bba0f3fa63cc93e4ba01edbf8c14b199f2f4b57f45a02ce0fd62e28fc9674ef WHIRLPOOL b47aa7a4f6c06ec85aa9b59d68ea5cd9e09d4ed378ee5792d7f86d014f76adad73e6913c939215557eda18444cbad6ae03a80cf2f880d456fc9aaa6f3c2805ba +EBUILD mplayer2-9999.ebuild 10577 SHA256 53853aae3c4e69d1dc97d54d46554705df3993f1719e5758a901b1e236322b68 SHA512 d7a5659da0236f325b8d28cf73910ccd8eea69366722094d363cd1acfdbb9a0c389dc1706c4ba4e72c975185c7fad5269a411400dd27b3ae201cddb46011191a WHIRLPOOL 3bd12f8e5514c7f2df24ace0f1ebb2d561be6a25a68c4e56cf34b2ef7d8264944564fe704e9952cbc467ae12ea4f49cfc23a89db153596d12962a323482c05d3 +MISC ChangeLog 25115 SHA256 b0411afb423d8fd3008b4e2d99b232f5d8ad1913e77f6654cb0de8d7839ff3fc SHA512 802ee7b489fdf0184bdb47a09ae8b4140626e5e88e6641cdc853709828f448fbbc01f2b1c08172c441bb5886e9cfa32f1384b83ce621907c7df551b71fb57f41 WHIRLPOOL eb3cb8f09a04d65939e09b5df77ee1dd1f2657c1fb01b88d5da981bea4dc2b8e47baf223f266832303a611f6e1c416452d2539fcd0a3e469106ed41327f88236 MISC metadata.xml 3147 SHA256 b59a051d61995b8e8f565110f91005df45b271b19f55f12e873160189d523ed9 SHA512 88338f85b67efc54241fb4d6bb91883ee337fcabac184bf7cac2cb971e81bc53fd9bd9fbec1c71a2353ab5f5263218fc673d58f45642a42e9934dcf8240e9c11 WHIRLPOOL 98da9689a06cad004f9056e31766771bdd62274c05ad9334144845ea2be378197343e87c86debec08c6beaff027f82534792b3b76ae444ce7aa3eb2b4dca2cb6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUpo/qAAoJELp701BxlEWf/kQQALafCfvpwXlYCqf81TsmjCMf -qg09uPxFiNI/ljyhTFITsJAVoiMdOdCIppGpn8vpfWpiR2m8HJH8mPdaJtY1TdWv -UmUVLW62gQ1DEeZBuIz//zT/soJJ/y9O9NKtvcUE0AEe7QOdQ+aS/+KIQBGBImYn -jxpCxfMmlWEf3PgKrM+AVZlHoijjvHxWEwObu0oq9tcSaE0/rdZfIyiX/4zDP1Vi -rV7DNpyRid2NFpnVr0uC8j40BPKt70JHA5oAwF8HqxGJcvDtnK/w9cUvQpbv+g6y -j9YJJcKsZCHn6aR8TyJVcjVMdnPPSOW+2p0La4D3dXrrB0a0WClnhV5NxpXU2trE -5bg8SSvmqo+FlTPpSVFr0Bqj9MpV6xvP+X41lQtcGPJ6thOo+hmJgOAJuOGkoK8X -U38oDheq3fhFxt5gLoldhdymRddV5UafnF5uVXU0vlR2gDjN9hfHC7HP/jZqpYLL -FHFAxOy2VyfnSUJcKeFcTb4fXJJmJUITZiX5CyWNA6ZRvicQ+ul8ZxtkNTFz26wB -xQ3nvGSIQyPajQNU6OdoqNAdXFw9I40YSmg8Sjf7SPvSV/il+lFd30vDoBxinKjg -ucNA75CAUKuX/CJ8nG7IC3JzDVQS4/sGI9x28New+jtziaORgeWQ1zRDJPj2tiHT -vO9079UcmhsZCwdB4Vuf -=jfHE +iQJ8BAEBCABmBQJUy78AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZtAP/jfdYeEb9lX7JjLvU6xzkRMJ +QTKFDn6BXV3kbPrIRPjhFzXtkCHeuCHXdi8ch4ERtKfiZT3+ZS6XxljWh9xcZs2q +H2O4z3IzxG/aFa9mqpLjXx6EjM7pOLvkpH0v/d+rLYahvvfGZWAzDsavrr0vyqt/ +biPGzVC9H44YS8cwOBVNwv7MQlqDeb3V+Ft3YfE/xiNnp3TDyTdz0ZM3E0O8Gmm+ +8UEzG1fGa5Xuk0qszQbnGpibsOaa8ouQ5CJnvb1J/RYNNRd1VQD9FMxshbO/iDh1 +aLPzy7U1u6ZMgOJaro1dKMmXyQuoT1ZRzsaVnU62IlFobBAvDKY1cXpNN5vQVRBv +1PpT88z/C/uEvQY4MgTp4s9N+iXCzIVNlxccwqnw3gVhafr2F2BbacUCoaPweBu3 +ctsOLS83xRD/MNN3euwe1r2qjUTbKlKHrrl1Aph8dcRRjGQdDpSLbgpYRBRF0raY +EbN8ZkyrFW/BYrh2RfDg8339VInALYatf7ZUnZLDPeQUeFnuBvUAjNXDmkHO5duq +i/uFQCZ3QjNzzI9kmvFPEn11uzaC62sDM6R9OK5qdN1Qwl27iyguPOrKZmcDwuC1 +LjGN87SQt4xQNl8zsnBLRSURa3pUPsg7oCpxXgtMVBx1Zs3l2pOuomL9629OOqBK ++WpbbG4yJbOSYC+wYDaI +=ij85 -----END PGP SIGNATURE----- diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild index c6d2c493dc7a..6200eef8f8f8 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20130126.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/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.18 2014/01/29 22:58:13 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.19 2015/01/30 17:27:26 mgorny Exp $ EAPI=4 @@ -35,9 +35,9 @@ pulseaudio pvr quvi radio +rar +rtc samba sdl selinux +speex tga " IUSE+=" symlink" -CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3" +CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext +shm cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3" for x in ${CPU_FEATURES}; do - IUSE+=" ${x}" + IUSE+=" ${x%:*}" done REQUIRED_USE=" @@ -340,7 +340,7 @@ src_configure() { use cpudetection && myconf+=" --enable-runtime-cpudetection" for i in ${CPU_FEATURES//+/}; do - myconf+=" $(use_enable ${i})" + myconf+=" $(use_enable ${i%:*} ${i#*:})" done use debug && myconf+=" --enable-debug=3" diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild index 3614ce6868ce..d5f7f74d070a 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20130428-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/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.17 2014/11/02 12:03:50 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.18 2015/01/30 17:27:26 mgorny Exp $ EAPI=5 @@ -29,9 +29,9 @@ pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinera +xscreensaver +xv yuv4mpeg" IUSE+=" symlink" -CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3" +CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3" for x in ${CPU_FEATURES}; do - IUSE+=" ${x}" + IUSE+=" ${x%:*}" done REQUIRED_USE=" @@ -307,7 +307,7 @@ src_configure() { use shm || myconf+=" --disable-shm" for i in ${CPU_FEATURES//+/}; do - myconf+=" $(use_enable ${i})" + myconf+=" $(use_enable ${i%:*} ${i#*:})" done use debug && myconf+=" --enable-debug=3" diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild index 2c7cf6e40ee1..cb2a25b156ce 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.12 2015/01/02 12:32:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.13 2015/01/30 17:27:26 mgorny Exp $ EAPI=5 @@ -29,9 +29,9 @@ pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinera +xscreensaver +xv yuv4mpeg" IUSE+=" symlink" -CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3" +CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3" for x in ${CPU_FEATURES}; do - IUSE+=" ${x}" + IUSE+=" ${x%:*}" done REQUIRED_USE=" @@ -311,7 +311,7 @@ src_configure() { use shm || myconf+=" --disable-shm" for i in ${CPU_FEATURES//+/}; do - myconf+=" $(use_enable ${i})" + myconf+=" $(use_enable ${i%:*} ${i#*:})" done use debug && myconf+=" --enable-debug=3" diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index 25bdc6b33895..d427752a40a6 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-9999.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/mplayer2/mplayer2-9999.ebuild,v 1.69 2014/12/05 19:57:22 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.70 2015/01/30 17:27:26 mgorny Exp $ EAPI=5 @@ -29,9 +29,9 @@ pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinera +xscreensaver +xv yuv4mpeg" IUSE+=" symlink" -CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext sse sse2 ssse3" +CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3" for x in ${CPU_FEATURES}; do - IUSE+=" ${x}" + IUSE+=" ${x%:*}" done REQUIRED_USE=" @@ -310,7 +310,7 @@ src_configure() { use shm || myconf+=" --disable-shm" for i in ${CPU_FEATURES//+/}; do - myconf+=" $(use_enable ${i})" + myconf+=" $(use_enable ${i%:*} ${i#*:})" done use debug && myconf+=" --enable-debug=3" -- 2.26.2