Simplify X checks in ebuild: use REQUIRED_USE instead of silently disabling features...

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 7e194b6ff30fc718f61d93da7c60576ef0647716..b49d9361acb82361618a1d936ff95277ff563c8d 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.828 2011/12/19 15:23:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.829 2011/12/19 16:43:12 aballier Exp $
+
+  19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Simplify X checks in ebuild: use REQUIRED_USE instead of silently disabling
+  features, people enabling X related features should know they will require X.
+  Remove video_cards_vesa useflag that does nothing.
 
   19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   some new formats have been added after ffmpeg 0.9 which mplayer trunk now

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 16defdf9b00716576d1c475187e7a1c574dad34d..e9c6a631353c131f8c59e1bbd5789d40e4ba2893 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 18228 RMD160 efcb2f04fbad7971ff56b18b0349f407877dd47a SHA1 26c35e38f08b4d4274aee32424045aa2d0561329 SHA256 1d3ed60656f49ecebf9b64511796b57e5ab16a37c29a170f55e77ea6680e0d11
-MISC ChangeLog 144660 RMD160 89deb7ef6ba1a6176b6b3da92ae98c0f6ada9fc8 SHA1 9171c563e075c51f6dcbb27498a3c2cf81190bb8 SHA256 83ffdb2344239d8cb382ab4620558b2d9f5e7567db8af337c4584e706f8e9721
+EBUILD mplayer-9999.ebuild 17716 RMD160 71e1bc1f94590dcc866a662766ec6abea5a3e7ad SHA1 2670baf161175a9aa47fa5a2b9bdc175ffe590e7 SHA256 e7c6e504f9348c38588a123df5a78669cef2a253e5bdb6b46eec42452c449884
+MISC ChangeLog 144945 RMD160 600d1684b2b91de23950a0b6e3085c3835837795 SHA1 492082e515551fba408916eaf99b1fd26593a0c3 SHA256 1819a109e8595d4f6fc040a8e1826530948cc2c94aad404f4062bdbed0ba929e
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7vVxAACgkQvFcC4BYPU0rSrwCeJyBUTPEWokvCJc4sEcAlaIUC
-1QQAn3EatxtT12rUl3Jep7bO+o6ufo/1
-=D50W
+iEYEARECAAYFAk7vaaYACgkQvFcC4BYPU0qBdQCaAypbm05CirIWJz8RAstfNZ4o
+08YAn3nMNYIbFrrOuWBcr+6RXBwHd0xW
+=5rQv
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index cdf0f2bb4cb2dd44e95f0f0acea0e1df9dddb95d..59f9938b85aa4ea5bb68ad14e491d79d7ed6040f 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.120 2011/12/19 15:23:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.121 2011/12/19 16:43:13 aballier Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
 
-VIDEO_CARDS="s3virge mga tdfx vesa"
+VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
        IUSE+=" video_cards_${x}"
 done
@@ -63,22 +63,6 @@ RDEPEND+="
                        win32codecs? ( media-libs/win32codecs )
                )
        )
-       X? (
-               ${X_RDEPS}
-               dga? ( x11-libs/libXxf86dga )
-               ggi? (
-                       media-libs/libggi
-                       media-libs/libggiwmh
-               )
-               opengl? ( virtual/opengl )
-               vdpau? ( x11-libs/libvdpau )
-               xinerama? ( x11-libs/libXinerama )
-               xscreensaver? ( x11-libs/libXScrnSaver )
-               xv? (
-                       x11-libs/libXv
-                       xvmc? ( x11-libs/libXvMC )
-               )
-       )
        a52? ( media-libs/a52dec )
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
@@ -88,6 +72,7 @@ RDEPEND+="
        bs2b? ( media-libs/libbs2b )
        cdio? ( dev-libs/libcdio )
        cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+       dga? ( x11-libs/libXxf86dga )
        directfb? ( dev-libs/DirectFB )
        dts? ( media-libs/libdca )
        dv? ( media-libs/libdv )
@@ -107,6 +92,7 @@ RDEPEND+="
        esd? ( media-sound/esound )
        enca? ( app-i18n/enca )
        faad? ( media-libs/faad2 )
+       ggi? ( media-libs/libggi media-libs/libggiwmh )
        gif? ( media-libs/giflib )
        gsm? ( media-sound/gsm )
        iconv? ( virtual/libiconv )
@@ -125,6 +111,7 @@ RDEPEND+="
        nas? ( media-libs/nas )
        nut? ( >=media-libs/libnut-661 )
        openal? ( media-libs/openal )
+       opengl? ( virtual/opengl )
        png? ( media-libs/libpng )
        pnm? ( media-libs/netpbm )
        pulseaudio? ( media-sound/pulseaudio )
@@ -140,8 +127,14 @@ RDEPEND+="
        speex? ( media-libs/speex )
        theora? ( media-libs/libtheora[encode?] )
        truetype? ( ${FONT_RDEPS} )
+       vdpau? ( x11-libs/libvdpau )
        vorbis? ( media-libs/libvorbis )
+       X? ( ${X_RDEPS} )
        xanim? ( media-video/xanim )
+       xinerama? ( x11-libs/libXinerama )
+       xscreensaver? ( x11-libs/libXScrnSaver )
+       xv? ( x11-libs/libXv )
+       xvmc? ( x11-libs/libXvMC )
 "
 
 X_DEPS="
@@ -151,13 +144,11 @@ X_DEPS="
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
-       X? (
-               ${X_DEPS}
-               dga? ( x11-proto/xf86dgaproto )
-               dxr3? ( media-video/em8300-libraries )
-               xinerama? ( x11-proto/xineramaproto )
-               xscreensaver? ( x11-proto/scrnsaverproto )
-       )
+       dga? ( x11-proto/xf86dgaproto )
+       dxr3? ( media-video/em8300-libraries )
+       X? ( ${X_DEPS} )
+       xinerama? ( x11-proto/xineramaproto )
+       xscreensaver? ( x11-proto/scrnsaverproto )
        amd64? ( ${ASM_DEP} )
        doc? (
                dev-libs/libxslt app-text/docbook-xml-dtd
@@ -186,7 +177,18 @@ fi
 REQUIRED_USE="bindist? ( !faac !win32codecs )
        dvdnav? ( dvd )
        ass? ( truetype )
-       truetype? ( iconv )"
+       truetype? ( iconv )
+       dxr3? ( X )
+       ggi? ( X )
+       xinerama? ( X )
+       dga? ( X )
+       opengl? ( X )
+       osdmenu? ( X )
+       vdpau? ( X )
+       vidix? ( X )
+       xscreensaver? ( X )
+       xv? ( X )
+       xvmc? ( xv )"
 
 pkg_setup() {
        if [[ ${PV} == *9999* ]]; then
@@ -500,52 +502,21 @@ src_configure() {
        # X enabled configuration #
        ###########################
        myconf+=" --disable-gui"
-       if use X; then
-               uses="dxr3 ggi xinerama"
-               for i in ${uses}; do
-                       use ${i} || myconf+=" --disable-${i}"
-               done
-               use dga || myconf+=" --disable-dga1 --disable-dga2"
-               use opengl || myconf+=" --disable-gl"
-               use osdmenu && myconf+=" --enable-menu"
-               use vdpau || myconf+=" --disable-vdpau"
-               use video_cards_vesa || myconf+=" --disable-vesa"
-               use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
-               use xscreensaver || myconf+=" --disable-xss"
-
-               if use xv; then
-                       if use xvmc; then
-                               myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-                       else
-                               myconf+=" --disable-xvmc"
-                       fi
-               else
-                       myconf+="
-                               --disable-xv
-                               --disable-xvmc
-                       "
-                       use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled."
-               fi
+       myconf+=" --disable-vesa"
+       uses="dxr3 ggi vdpau xinerama xv"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       use dga          || myconf+=" --disable-dga1 --disable-dga2"
+       use opengl       || myconf+=" --disable-gl"
+       use osdmenu      && myconf+=" --enable-menu"
+       use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+       use xscreensaver || myconf+=" --disable-xss"
+       use X            || myconf+=" --disable-x11"
+       if use xvmc; then
+               myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
        else
-               myconf+="
-                       --disable-dga1
-                       --disable-dga2
-                       --disable-dxr3
-                       --disable-ggi
-                       --disable-gl
-                       --disable-vdpau
-                       --disable-vidix
-                       --disable-vidix-pcidb
-                       --disable-xinerama
-                       --disable-xss
-                       --disable-xv
-                       --disable-xvmc
-                       --disable-x11
-               "
-               uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
-               for i in ${uses}; do
-                       use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
-               done
+               myconf+=" --disable-xvmc"
        fi
 
        ############################