dvdnav requires dvd, simplifying ebuild

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9b97ed9a408399010302b6c8894e8ba85a1c4512..42e29cb64868b7a36714a74de5950510cafd654a 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.823 2011/12/17 17:47:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.824 2011/12/17 17:59:34 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  dvdnav requires dvd, simplifying ebuild
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   reflect some inter use flag dependencies by REQUIRED_USE

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 97fea1f7fdf8eeea524d6702bc4bdb4959236e1b..73ddc382dbddb9fce976a7c1167b0d1fcfba717a 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 18550 RMD160 cbec8ef4c8d558ef5ecdbcf21a2afd7b83581918 SHA1 59bd941368467860815c198da98c27ec4e43ed06 SHA256 46848297f61cc5cf7d422b040d1486ec1f9d417728290f98f008c4ded51fcd03
-MISC ChangeLog 143901 RMD160 93bc8f3f590527cd4d124130d2ed95eb596d2438 SHA1 7230cfa5047c034b050aafd2a393322a450c86f3 SHA256 f6434ac0661a38d4e5fb104d0099cd11eb63fb71c4cd474e4da2ee36a0c01134
+EBUILD mplayer-9999.ebuild 18522 RMD160 e1142a517b32cceff9d519d6a728808b5acb8fbb SHA1 7be3ab31ef4fde8996d93f3c374ae69cd5e6a94d SHA256 57cbb06c2f892da75be4f61c0a4f54de301d78ebe74a58569d271676b05457fd
+MISC ChangeLog 144017 RMD160 6aa035d0833e757e32f77bc5028983d6e2c89b5e SHA1 23f43fe3640231e343e3f67f0afafcfd913e1c8d SHA256 84a8911c2886e4fb536f9adae2e6c566345ddbaa353325684943c9bc9ed952a6
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7s1b4ACgkQvFcC4BYPU0p5BQCeKM22xuK8Ls5YbUwl2o+v/8Mo
-FmkAmQGE9lUfFFlXQdmXatYSOdekncZ8
-=9UNn
+iEYEARECAAYFAk7s2IwACgkQvFcC4BYPU0pk2gCaAq12/QnTwHzY0Xrf8AwK6rbg
+o9sAoIudFegHBErdIzaX/YPNmqVaDg3C
+=ng3/
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index fbba67700a9dd2e1e4d06584ba1f296d6d3f66ab..36eb991ef5bc6851eb15b97ff7578b5f2d89c1f5 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.116 2011/12/17 17:47:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.117 2011/12/17 17:59:34 aballier Exp $
 
 EAPI=4
 
@@ -184,6 +184,7 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="bindist? ( !faac !win32codecs )
+       dvdnav? ( dvd )
        ass? ( truetype )
        truetype? ( iconv )"
 
@@ -310,14 +311,8 @@ src_configure() {
        #
        # use external libdvdcss, dvdread and dvdnav
        myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-       if use dvd; then
-               use dvdnav || myconf+=" --disable-dvdnav"
-       else
-               myconf+="
-                       --disable-dvdnav
-                       --disable-dvdread
-               "
-       fi
+       use dvd || myconf+=" --disable-dvdread"
+       use dvdnav || myconf+=" --disable-dvdnav"
 
        #############
        # Subtitles #