diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-12-17 15:52:03 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-12-17 15:52:03 +0000 |
| commit | b02667e92c177b379dc87e89c381b328ff9827b8 (patch) | |
| tree | b4cc95e24398681dbb62290ae982f9097cff324a /media-video | |
| parent | Version bump. Drop rbx until problems with it have been resolved. (diff) | |
| download | gentoo-2-b02667e92c177b379dc87e89c381b328ff9827b8.tar.gz gentoo-2-b02667e92c177b379dc87e89c381b328ff9827b8.tar.bz2 gentoo-2-b02667e92c177b379dc87e89c381b328ff9827b8.zip | |
remove dead code: faac + bindist is disallowed by REQUIRED_USE
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 4eda2a97388e..44a7bd78e1f4 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.819 2011/12/17 13:01:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.820 2011/12/17 15:52:03 aballier Exp $ + + 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + remove dead code: faac + bindist is disallowed by REQUIRED_USE 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-1.0_rc4_p20111215.ebuild, mplayer-9999.ebuild: diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index c3409df9d25e..e9cdc1bc5623 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.112 2011/12/17 13:01:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.113 2011/12/17 15:52:03 aballier Exp $ EAPI=4 @@ -99,7 +99,7 @@ RDEPEND+=" encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) - faac? ( !bindist? ( media-libs/faac ) ) + faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423 ) xvid? ( media-libs/xvid ) @@ -434,10 +434,6 @@ src_configure() { for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done - if use bindist && use faac; then - ewarn "faac is nonfree and cannot be distributed; disabling faac support." - myconf+=" --disable-faac" - fi else myconf+=" --disable-mencoder" for i in ${uses}; do |