Add modular X dependencies (bug #124177).

Package-Manager: portage-2.1_pre5-r4

5 files changed, 60 insertions, 14 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/Manifest b/x11-libs/lesstif/Manifest
index dfa1cf0357d1..2ffddf3709e8 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,9 +1,27 @@
-MD5 d7e17c6a31ebf46f12fa9938a5e0442b ChangeLog 9804
+MD5 0d8cbf8ebb2c8ab91497f2973a2af4bf ChangeLog 9991
+RMD160 8cbbd39a5fcb4b0e3de2302ff47a25e2bff3e838 ChangeLog 9991
+SHA256 01b9f23c98cbe006f1a8bc8f0af29ae8f9267fb0ab19fe2441d79e214af4c7d4 ChangeLog 9991
 MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
+RMD160 a63ab47efb630423f2547dee911ea871071e2aa8 files/CAN-2005-0605.patch 1194
+SHA256 aaa8f3d35dbabbb65e3280051c9234d5e723bed0b89761cdb19da9f77ce8d2ed files/CAN-2005-0605.patch 1194
 MD5 c7b5275912acf7fd3ae16a24dca410ec files/digest-lesstif-0.93.94-r4 145
+RMD160 2dab679ab918ba0dfed30f967bcef53377d651eb files/digest-lesstif-0.93.94-r4 145
+SHA256 8bf053afcc8dfbd8964b077e46bd393aad00b73cb37cffc7ad0a322a98e846b0 files/digest-lesstif-0.93.94-r4 145
 MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
+RMD160 be73b27d47a4ff2aa207a1e75fd4d2cbde7bcd20 files/digest-lesstif-0.94.0-r2 68
+SHA256 44023297b9f817631130247a7df5ea11b590dd3876ae5a8931de88bd6d6d32ca files/digest-lesstif-0.94.0-r2 68
 MD5 453b25066fafd67eb2452071e518c71b files/digest-lesstif-0.94.4 68
-MD5 034a7bcd493e84385ffb6710413c7e53 lesstif-0.93.94-r4.ebuild 2757
-MD5 a90a4c4645ecc020a72ad76f78b6e6b6 lesstif-0.94.0-r2.ebuild 2109
-MD5 1f128cc9c529da9e66ee721a82f8c855 lesstif-0.94.4.ebuild 2696
+RMD160 a27350405c6678e8b8bfb65d50d49190aa51cc34 files/digest-lesstif-0.94.4 68
+SHA256 c90ca9cf8526255ccfb34bff43b19cbc089cbd08665aefa52ac609b58e76f23f files/digest-lesstif-0.94.4 68
+MD5 51de38a0f0107d35d3ed18392ebb9944 lesstif-0.93.94-r4.ebuild 2917
+RMD160 e81d6c980f88a90bf0eab0bf673d298d8f83cfb0 lesstif-0.93.94-r4.ebuild 2917
+SHA256 0a00d3123234f654cf453858a0df8d2823ba4241cc9ff984dd08ddfbb3bd046f lesstif-0.93.94-r4.ebuild 2917
+MD5 2f20a23a56aa9cd28116562775128673 lesstif-0.94.0-r2.ebuild 2293
+RMD160 2254116ac66ef8b36823b5672f7a24fd8032e43d lesstif-0.94.0-r2.ebuild 2293
+SHA256 8917347a76e33680b942f60a5960e4e232bdfe4ad7d4aa577a74290f4e1bc193 lesstif-0.94.0-r2.ebuild 2293
+MD5 a63a612d85f18a9255e062881bc0732f lesstif-0.94.4.ebuild 2855
+RMD160 ca7755c72d853d3dd3c69a47ff2098072f063b72 lesstif-0.94.4.ebuild 2855
+SHA256 665b3c7b6e68881afe91d527899a3b7a6138e18d082e1682257303f069163148 lesstif-0.94.4.ebuild 2855
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
+SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
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"