remove custom-cpuopts option: if anything breaks the build we can disallow it with...

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 44a7bd78e1f41aa6572b1cdf52a125df895df957..eb250a882af06852894f1a507f30061156645442 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.820 2011/12/17 15:52:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.821 2011/12/17 15:56:34 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove custom-cpuopts option: if anything breaks the build we can disallow it
+  with REQUIRED_USE
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   remove dead code: faac + bindist is disallowed by REQUIRED_USE

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bdfcf1bdc34f7f7fbe7a241d418ffc165bbd2ae4..aadbec6f48d7994d0b436c3d72dc96e8bdb9190a 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -12,13 +12,13 @@ DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08
 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19455 RMD160 2eb8087a10021f937cc894ffc840f08471a59f14 SHA1 ac7409811698ad1dac29d45ba8ead0a777891c0d SHA256 28678530fed056e3e826ebbddac5069ccb435adef250bda27fa4f41f85acbc8e
-EBUILD mplayer-9999.ebuild 19621 RMD160 d2c39e37a529cc1c32369e212c8def443d3d1807 SHA1 b4bd724173a18aa50b2b3177f31a3f39c476728c SHA256 6035b5341de469b80c5afbc616accd9da41c9bf8559cb1f9ece3fe6e08282a5c
-MISC ChangeLog 143508 RMD160 67c5cb83da4f0abef2fa970bf553c8711e99b255 SHA1 46a5dd3bd5c6aeed9d165f39d80ad36816d0bca9 SHA256 12f3a143144853b91b874b7cfdd998617e07bd111a5355f242817634894520f7
+EBUILD mplayer-9999.ebuild 18617 RMD160 35f9c3e3ebe81c7ee1f77c97ab5f7620e27c046b SHA1 3665ce1ce4316e75a4b92ae7bcd851dead0a786d SHA256 a30ae07f8f004f4e439508f00cece85b99f0ceb07c1027bdaf50caac1fd238e3
+MISC ChangeLog 143682 RMD160 ba44b7713211f8e8823857e6f3c7b062f49795d3 SHA1 94415ecbc8ddacf8b6a57630e374de7a4751e710 SHA256 857b96f08888f61c09ed3e971f71eb3c631f49f9fbd2b593154cdbf991e1647b
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7suqkACgkQvFcC4BYPU0pxMQCdHsM5pmFVujkBz0HnqJUR+uO2
-h0kAnjZkA0QnHjmd43bmGj9zsVpyRO/G
-=pUXp
+iEYEARECAAYFAk7su7gACgkQvFcC4BYPU0plpgCdE6ddFyBMBR2FdXrK5YVTbFf9
+JP4An1hgCayRL3pP8/lmmwqcIbMCy5SW
+=x3EM
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index e9cdc1bc5623a7f894b6b54a7684b75d7369b639..1a7efee6c8519af0ddc9b7c0a122506a52cd4def 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.113 2011/12/17 15:52:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.114 2011/12/17 15:56:34 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
+bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
@@ -208,23 +208,6 @@ pkg_setup() {
                ewarn "mplayer for this system. Also, if your compile fails, try"
                ewarn "disabling this use flag."
        fi
-
-       if use custom-cpuopts; then
-               ewarn
-               ewarn "You are using the custom-cpuopts flag which will"
-               ewarn "specifically allow you to enable / disable certain"
-               ewarn "CPU optimizations."
-               ewarn
-               ewarn "Most desktop users won't need this functionality, but it"
-               ewarn "is included for corner cases like cross-compiling and"
-               ewarn "certain profiles. If unsure, disable this flag and MPlayer"
-               ewarn "will automatically detect and use your available CPU"
-               ewarn "optimizations."
-               ewarn
-               ewarn "Using this flag means your build is unsupported, so"
-               ewarn "please make sure your CPU optimization use flags (3dnow"
-               ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
-       fi
 }
 
 src_unpack() {
@@ -520,16 +503,10 @@ src_configure() {
        # Platform specific flags, hardcoded on amd64 (see below)
        use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-       # Turning off CPU optimizations usually will break the build.
-       # However, this use flag, if enabled, will allow users to completely
-       # specify which ones to use. If disabled, mplayer will automatically
-       # enable all CPU optimizations that the host build supports.
-       if use custom-cpuopts; then
-               uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
-               for i in ${uses}; do
-                       myconf+=" $(use_enable ${i})"
-               done
-       fi
+       uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+       for i in ${uses}; do
+               myconf+=" $(use_enable ${i})"
+       done
 
        use debug && myconf+=" --enable-debug=3"