Add modular X dependencies.

(Portage version: 2.0.53)

4 files changed, 26 insertions, 7 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index a6ed3a9f1fba..c3f3d255611f 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.47 2005/12/02 21:49:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.48 2005/12/12 05:02:10 spyderous Exp $
+
+  12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  libquicktime-0.9.7-r1.ebuild:
+  Add modular X dependencies.
 
   02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/libquicktime-0.9.6-cflags.patch, -libquicktime-0.9.3-r1.ebuild,
diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
index a3e22c1aeaca..a338ea89d3ab 100644
--- a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.5 2005/12/02 21:39:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.6 2005/12/12 05:02:10 spyderous Exp $
 
 inherit libtool eutils autotools
 
@@ -24,7 +24,13 @@ DEPEND=">=sys-apps/sed-4.0.5
 		sys-libs/libavc1394
 		sys-libs/libraw1394
 	)
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libXaw
+				x11-libs/libXv
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+	)
 	!virtual/quicktime"
 PROVIDE="virtual/quicktime"
 
diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index d7fddb162a3c..bb91ee462937 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xanim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.23 2005/10/30 22:59:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.24 2005/12/12 04:58:19 spyderous Exp $
+
+  12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xanim-2.80.1-r4.ebuild:
+  Add modular X dependencies.
 
   30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> xanim-2.80.1-r4.ebuild:
   Updated homepage as per bug #100878.
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index ba93f228ed56..ff54c3aabe8e 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.29 2005/10/30 22:59:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.30 2005/12/12 04:58:19 spyderous Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,10 +12,15 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXext
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
 	>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
+	>=sys-apps/sed-4.0.5
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 MY_P=${PN}${PV//.}
 S=${WORKDIR}/${MY_P}