From: Alexis Ballier Date: Mon, 19 Dec 2011 16:44:45 +0000 (+0000) Subject: dvdnav requires dvd, no need to protect the deps X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c7b07c92ca56a8cc566a0e62a5ca8f720f3e496f;p=gentoo.git dvdnav requires dvd, no need to protect the deps Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index b49d9361acb8..bcb4c4952499 100644 --- 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.829 2011/12/19 16:43:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.830 2011/12/19 16:44:45 aballier Exp $ + + 19 Dec 2011; Alexis Ballier mplayer-9999.ebuild: + dvdnav requires dvd, no need to protect the deps 19 Dec 2011; Alexis Ballier mplayer-9999.ebuild: Simplify X checks in ebuild: use REQUIRED_USE instead of silently disabling diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index e9c6a631353c..71fc0a98419e 100644 --- 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 17716 RMD160 71e1bc1f94590dcc866a662766ec6abea5a3e7ad SHA1 2670baf161175a9aa47fa5a2b9bdc175ffe590e7 SHA256 e7c6e504f9348c38588a123df5a78669cef2a253e5bdb6b46eec42452c449884 -MISC ChangeLog 144945 RMD160 600d1684b2b91de23950a0b6e3085c3835837795 SHA1 492082e515551fba408916eaf99b1fd26593a0c3 SHA256 1819a109e8595d4f6fc040a8e1826530948cc2c94aad404f4062bdbed0ba929e +EBUILD mplayer-9999.ebuild 17712 RMD160 a732e703a95f61656e74d87565b5fcf47afffad2 SHA1 1f7946f71dc5ee35d4d87cfa89f5a51aa0327dd3 SHA256 ded829a665d6418a8a9b300ac46abb1f7179cb4dbc8f6ba6fae7dcf3a7a5be50 +MISC ChangeLog 145070 RMD160 d35f71cc163f81be0f47707de5c147da6350a07a SHA1 486f0512f72ea6da65f5eb3162038e1e99aa5786 SHA256 52842e3b3eeeb0e5a56f4fdf4e4b01eb7d5c14a88262b72130781028f27af352 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7vaaYACgkQvFcC4BYPU0qBdQCaAypbm05CirIWJz8RAstfNZ4o -08YAn3nMNYIbFrrOuWBcr+6RXBwHd0xW -=5rQv +iEYEARECAAYFAk7vagMACgkQvFcC4BYPU0qeSACgtOS6jUzN/6ON8xtJWXaczpVq +daIAoLFIfPLbUrpcLV0cIKbLoTUHVYhR +=GSEo -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 59f9938b85aa..7958a99885b7 100644 --- 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.121 2011/12/19 16:43:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.122 2011/12/19 16:44:45 aballier Exp $ EAPI=4 @@ -77,10 +77,8 @@ RDEPEND+=" dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( media-tv/linuxtv-dvb-headers ) - dvd? ( - >=media-libs/libdvdread-4.1.3 - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - ) + dvd? ( >=media-libs/libdvdread-4.1.3 ) + dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame )