Add modular X dependencies (bug #124177).

(Portage version: 2.1_pre5-r4)

4 files changed, 38 insertions, 10 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 0121ad9a13aa..fc6bf215305d 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.73 2006/03/10 06:05:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.74 2006/03/10 23:39:52 joshuabaergen Exp $
+
+  10 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  lesstif-0.93.94-r4.ebuild, lesstif-0.94.0-r2.ebuild,
+  lesstif-0.94.4.ebuild:
+  Add modular X dependencies (bug #124177).
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> lesstif-0.94.4.ebuild:
   Mark 0.94.4 stable on ia64
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
index a18c8ca07043..74ce459904d1 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.8 2006/02/16 19:51:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.9 2006/03/10 23:39:53 joshuabaergen Exp $
 
 inherit libtool flag-o-matic multilib
 
@@ -15,11 +15,18 @@ KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc-macos ppc64 sparc x86"
 IUSE="static"
 
 RDEPEND="virtual/libc
-	virtual/x11
+	|| ( ( x11-libs/libXp
+			x11-libs/libXt )
+		virtual/x11 )
 	>=x11-libs/motif-config-0.9"
 
 DEPEND="dev-lang/perl
-	${RDEPEND}"
+	${RDEPEND}
+	|| ( ( x11-libs/libXaw
+			x11-libs/libXft
+			x11-proto/printproto
+			x11-proto/xextproto )
+		virtual/x11 )"
 
 PROVIDE="virtual/motif"
 
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild
index 68f7f8bb1033..86b468a4aec1 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.0-r2.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/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild,v 1.9 2005/04/27 00:12:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r2.ebuild,v 1.10 2006/03/10 23:39:53 joshuabaergen Exp $
 
 inherit libtool flag-o-matic
 
@@ -13,8 +13,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ppc-macos sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11"
+RDEPEND="virtual/libc
+	|| ( ( x11-libs/libXp
+			x11-libs/libXt )
+		virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXaw
+			x11-libs/libXft
+			x11-proto/printproto
+			x11-proto/xextproto )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/lesstif/lesstif-0.94.4.ebuild b/x11-libs/lesstif/lesstif-0.94.4.ebuild
index 7c1fb15cc1b2..cf4241814611 100644
--- a/x11-libs/lesstif/lesstif-0.94.4.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.13 2006/03/10 06:05:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.14 2006/03/10 23:39:53 joshuabaergen Exp $
 
 inherit libtool flag-o-matic multilib
 
@@ -14,11 +14,18 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc-macos ppc64 sparc x86"
 IUSE="static"
 
 RDEPEND="virtual/libc
-	virtual/x11
+	|| ( ( x11-libs/libXp
+			x11-libs/libXt )
+		virtual/x11 )
 	>=x11-libs/motif-config-0.9"
 
 DEPEND="dev-lang/perl
 	${RDEPEND}
+	|| ( ( x11-libs/libXaw
+			x11-libs/libXft
+			x11-proto/printproto
+			x11-proto/xextproto )
+		virtual/x11 )
 	>=sys-devel/libtool-1.5.10"
 
 PROVIDE="virtual/motif"