reflect some inter use flag dependencies by REQUIRED_USE

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9da1cc60efbff9843a3623fe74763986a56d9288..9b97ed9a408399010302b6c8894e8ba85a1c4512 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.822 2011/12/17 15:57:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.823 2011/12/17 17:47:36 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  reflect some inter use flag dependencies by REQUIRED_USE
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   cosmetics

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 305cde6c44d53474c6fcf42441164c03ae4cfcc0..97fea1f7fdf8eeea524d6702bc4bdb4959236e1b 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 18604 RMD160 cd244216c62a01ce1c61089afc9090eaef0eebf9 SHA1 603da0b4e3804e2ad40666d3d0d1c4847c0cb294 SHA256 7b6d488fc6186beb33eb9dbe3ea5fac4454cbf22753dc5ae77bae738eb1e8238
-MISC ChangeLog 143768 RMD160 07788c5950c5dcaeac87fee92d619fde4abc0898 SHA1 f3a16e2f2ea26c2688db7ca9f74d2f4d7e6ecb82 SHA256 698f7c09936f2e4b9433bdfafdba239f03db2905fb022c4fdc236b2f36cd21c9
+EBUILD mplayer-9999.ebuild 18550 RMD160 cbec8ef4c8d558ef5ecdbcf21a2afd7b83581918 SHA1 59bd941368467860815c198da98c27ec4e43ed06 SHA256 46848297f61cc5cf7d422b040d1486ec1f9d417728290f98f008c4ded51fcd03
+MISC ChangeLog 143901 RMD160 93bc8f3f590527cd4d124130d2ed95eb596d2438 SHA1 7230cfa5047c034b050aafd2a393322a450c86f3 SHA256 f6434ac0661a38d4e5fb104d0099cd11eb63fb71c4cd474e4da2ee36a0c01134
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7svAkACgkQvFcC4BYPU0oghgCgzEN5mCa91LMwbcs7TlyzQpzt
-3RMAnReSvN4RYxUtaRdBkfeWbImV/ZdF
-=J6jH
+iEYEARECAAYFAk7s1b4ACgkQvFcC4BYPU0p5BQCeKM22xuK8Ls5YbUwl2o+v/8Mo
+FmkAmQGE9lUfFFlXQdmXatYSOdekncZ8
+=9UNn
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 736aee0a6ce00b573ce824e792874e8f5e98b0fe..fbba67700a9dd2e1e4d06584ba1f296d6d3f66ab 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.115 2011/12/17 15:57:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.116 2011/12/17 17:47:36 aballier Exp $
 
 EAPI=4
 
@@ -82,7 +82,7 @@ RDEPEND+="
        a52? ( media-libs/a52dec )
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
-       ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
+       ass? ( >=media-libs/libass-0.9.10[enca?] )
        bidi? ( dev-libs/fribidi )
        bluray? ( >=media-libs/libbluray-0.2.1 )
        bs2b? ( media-libs/libbs2b )
@@ -183,7 +183,9 @@ fi
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac !win32codecs )"
+REQUIRED_USE="bindist? ( !faac !win32codecs )
+       ass? ( truetype )
+       truetype? ( iconv )"
 
 pkg_setup() {
        if [[ ${PV} == *9999* ]]; then
@@ -324,15 +326,8 @@ src_configure() {
        # SRT/ASS/SSA (subtitles) requires freetype support
        # freetype support requires iconv
        # iconv optionally can use unicode
-       if ! use ass && ! use truetype; then
-               myconf+=" --disable-freetype"
-               if ! use iconv; then
-                       myconf+="
-                               --disable-iconv
-                               --charset=noconv
-                       "
-               fi
-       fi
+       use truetype || myconf+=" --disable-freetype"
+       use iconv || myconf+=" --disable-iconv --charset=noconv"
        use iconv && use unicode && myconf+=" --charset=UTF-8"
 
        #####################################
@@ -643,7 +638,7 @@ src_install() {
                dohtml -r "${S}"/DOCS/HTML/*
        fi
 
-       if ! use ass && ! use truetype; then
+       if ! use truetype; then
                dodir /usr/share/mplayer/fonts
                # Do this generic, as the mplayer people like to change the structure
                # of their zips ...
@@ -667,7 +662,7 @@ _EOF_
                doins "${S}/etc/menu.conf"
        fi
 
-       if use ass || use truetype; then
+       if use truetype; then
                cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4