Add modular X dependencies.

(Portage version: 2.1_pre6-r3)

4 files changed, 33 insertions, 14 deletions

diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
index 7b2f92a39091..04ef0e43e2bb 100644
--- a/media-tv/nvtv/ChangeLog
+++ b/media-tv/nvtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/nvtv
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.7 2004/06/25 00:33:34 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.8 2006/03/19 00:29:38 joshuabaergen Exp $
+
+  19 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org> nvtv-0.4.5.ebuild,
+  nvtv-0.4.6.ebuild, nvtv-0.4.7.ebuild:
+  Add modular X dependencies.
 
 *nvtv-0.4.7 (06 Jun 2004)
 
diff --git a/media-tv/nvtv/nvtv-0.4.5.ebuild b/media-tv/nvtv/nvtv-0.4.5.ebuild
index 67280617bb15..7f4edfe3bc41 100644
--- a/media-tv/nvtv/nvtv-0.4.5.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.7 2005/11/03 23:20:16 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.8 2006/03/19 00:29:38 joshuabaergen Exp $
 
 IUSE="X gtk"
 
@@ -12,9 +12,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
-DEPEND="sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
 	gtk? ( x11-libs/gtk+ )
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libXi
+				x11-libs/libXmu
+				x11-libs/libXxf86vm )
+			virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xf86vidmodeproto virtual/x11 ) )"
 
 src_compile() {
 	local myconf
diff --git a/media-tv/nvtv/nvtv-0.4.6.ebuild b/media-tv/nvtv/nvtv-0.4.6.ebuild
index 0c8885b49f23..24a07c48410e 100644
--- a/media-tv/nvtv/nvtv-0.4.6.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.6.ebuild,v 1.5 2005/11/09 12:13:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.6.ebuild,v 1.6 2006/03/19 00:29:38 joshuabaergen Exp $
 
 IUSE="X gtk"
 
@@ -12,9 +12,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
-DEPEND="sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
 	gtk? ( x11-libs/gtk+ )
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libXi
+				x11-libs/libXmu
+				x11-libs/libXxf86vm )
+			virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xf86vidmodeproto virtual/x11 ) )"
 
 src_compile() {
 	local myconf
diff --git a/media-tv/nvtv/nvtv-0.4.7.ebuild b/media-tv/nvtv/nvtv-0.4.7.ebuild
index 92c4bd45a742..1ec784fcce82 100644
--- a/media-tv/nvtv/nvtv-0.4.7.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.7.ebuild,v 1.3 2005/11/03 23:20:16 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.7.ebuild,v 1.4 2006/03/19 00:29:38 joshuabaergen Exp $
 
 IUSE="X gtk"
 
@@ -12,9 +12,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
-DEPEND="sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
 	gtk? ( x11-libs/gtk+ )
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libXi
+				x11-libs/libXmu
+				x11-libs/libXxf86vm )
+			virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( x11-proto/xf86vidmodeproto virtual/x11 ) )"
 
 src_compile() {
 	local myconf