From 779ff0531c59777a28e158874fe5f006dd270661 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 17 Dec 2011 17:59:34 +0000
Subject: dvdnav requires dvd, simplifying ebuild

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
---
 media-video/mplayer/ChangeLog           |  5 ++++-
 media-video/mplayer/mplayer-9999.ebuild | 13 ++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'media-video/mplayer')

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9b97ed9a4083..42e29cb64868 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.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/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index fbba67700a9d..36eb991ef5bc 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.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 #
-- 
cgit v1.2.3-65-gdbad