more modular X dependencies

Package-Manager: portage-2.0.54

5 files changed, 34 insertions, 18 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 8044c616a06c..d048d028948b 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.63 2006/01/08 14:13:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.64 2006/01/30 07:15:01 mr_bones_ Exp $
+
+  30 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org> tk-8.4.6.ebuild,
+  tk-8.4.6-r1.ebuild, tk-8.4.9.ebuild:
+  more modular X dependencies
 
 *tk-8.4.11-r1 (08 Jan 2006)
 
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index c34a16e0e5a3..34615a5484ee 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,4 +1,4 @@
-MD5 1a5e414f2b85672ca3f7fb661a16b6dc ChangeLog 8159
+MD5 fd62954848b4fc7af40489ee328089c8 ChangeLog 8304
 MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
 MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11 65
 MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11-r1 65
@@ -15,6 +15,6 @@ MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
 MD5 f58279bb26ebf5341ddc04fe422a6afc tk-8.4.11-r1.ebuild 3008
 MD5 1a62fd1c184b67dc38bc87398d5c962d tk-8.4.11.ebuild 2923
-MD5 ecb6bd0ebe1e4441cccf70144b2e6104 tk-8.4.6-r1.ebuild 2762
-MD5 bccf47b736485ce7e8a457e6ce9a1a81 tk-8.4.6.ebuild 2385
-MD5 adeea912923cfc4dee0d578fb4002720 tk-8.4.9.ebuild 2851
+MD5 ba9899b0ace4194528167ac97b9e818d tk-8.4.6-r1.ebuild 2848
+MD5 988041e4ca6e6ecfb534d8745cab9f0b tk-8.4.6.ebuild 2471
+MD5 ba0db66a9f955928fe7c2f229089d122 tk-8.4.9.ebuild 2938
diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
index 896dfabd317b..c30e39befee7 100644
--- a/dev-lang/tk/tk-8.4.6-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.6-r1.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/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.13 2005/03/19 05:53:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.14 2006/01/30 07:15:01 mr_bones_ Exp $
 
 inherit eutils
 
@@ -13,10 +13,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="threads"
 
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-apps/portage-2.0.47-r10
-	virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	=dev-lang/tcl-${PV}*"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.47-r10
+	|| (
+		( x11-libs/libXt x11-proto/xproto )
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${PN}${PV}
 
diff --git a/dev-lang/tk/tk-8.4.6.ebuild b/dev-lang/tk/tk-8.4.6.ebuild
index 34e10858c544..62ed3b0fc692 100644
--- a/dev-lang/tk/tk-8.4.6.ebuild
+++ b/dev-lang/tk/tk-8.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/dev-lang/tk/tk-8.4.6.ebuild,v 1.14 2005/03/19 05:53:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.15 2006/01/30 07:15:02 mr_bones_ Exp $
 
 inherit eutils
 
@@ -13,10 +13,14 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc sparc mips alpha arm ~hppa amd64 ia64"
 IUSE="threads"
 
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-apps/portage-2.0.47-r10
-	virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	=dev-lang/tcl-${PV}*"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.47-r10
+	|| (
+		( x11-libs/libXt x11-proto/xproto )
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${PN}${PV}
 
diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
index ee4f3091516e..3edf1df85fc1 100644
--- a/dev-lang/tk/tk-8.4.9.ebuild
+++ b/dev-lang/tk/tk-8.4.9.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/dev-lang/tk/tk-8.4.9.ebuild,v 1.11 2006/01/02 21:27:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.12 2006/01/30 07:15:02 mr_bones_ Exp $
 
 inherit eutils
 
@@ -13,10 +13,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="threads"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	=dev-lang/tcl-${PV}*"
 DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.47-r10"
+	>=sys-apps/portage-2.0.47-r10
+	|| (
+		( x11-libs/libXt x11-proto/xproto )
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${PN}${PV}