Add modular X dependencies.

Package-Manager: portage-2.0.53

4 files changed, 38 insertions, 8 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 8f9d61104cde..70bf119f7efd 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.267 2005/12/08 19:46:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.268 2005/12/11 08:06:57 spyderous Exp $
+
+  11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; qt-4.0.1.ebuild,
+  qt-4.1.0_rc1.ebuild:
+  Add modular X dependencies.
 
   08 Dec 2005; Caleb Tennis <caleb@gentoo.org> qt-4.1.0_rc1.ebuild:
   Add a sed statement to make Qt use /usr/XXX instead of /usr/X11R6/XXX
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index d2c344cc5ca5..28360d951870 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,4 @@
-MD5 952730f376eb6104203b735f56e78ca5 ChangeLog 3333
+MD5 c91217d6b98cf91e02f9d21c21d041ae ChangeLog 3463
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
@@ -21,5 +21,5 @@ MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
 MD5 444d3e2808bd881191e77cadd7c646aa qt-3.3.5.ebuild 9960
-MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
-MD5 63e9293741269da2076cdc2923ed604d qt-4.1.0_rc1.ebuild 5876
+MD5 e5670b3c7deb60be019b8cdec3f088a7 qt-4.0.1.ebuild 5938
+MD5 5ad5332e8f1e6c0c63b9c05ab6480333 qt-4.1.0_rc1.ebuild 6090
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
index 51b3b504ca63..61b6982edb70 100644
--- a/x11-libs/qt/qt-4.0.1.ebuild
+++ b/x11-libs/qt/qt-4.0.1.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/x11-libs/qt/qt-4.0.1.ebuild,v 1.11 2005/11/20 13:27:59 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.12 2005/12/11 08:06:57 spyderous Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -16,7 +16,20 @@ SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
 
-DEPEND="virtual/x11 virtual/xft >=media-libs/freetype-2
+DEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXfont
+			x11-proto/xextproto
+			x11-proto/xineramaproto
+			x11-proto/inputproto
+		)
+		virtual/x11
+	)
+	virtual/xft
+	>=media-libs/freetype-2
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
 	mng? ( media-libs/libmng )
diff --git a/x11-libs/qt/qt-4.1.0_rc1.ebuild b/x11-libs/qt/qt-4.1.0_rc1.ebuild
index 2d50907eb97c..9db29486ec35 100644
--- a/x11-libs/qt/qt-4.1.0_rc1.ebuild
+++ b/x11-libs/qt/qt-4.1.0_rc1.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/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.3 2005/12/08 19:46:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.4 2005/12/11 08:06:57 spyderous Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -17,7 +17,20 @@ SLOT="4"
 KEYWORDS="-*"
 IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
 
-DEPEND="virtual/x11 virtual/xft >=media-libs/freetype-2
+DEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXfont
+			x11-proto/xextproto
+			x11-proto/xineramaproto
+			x11-proto/inputproto
+		)
+		virtual/x11
+	)
+	virtual/xft
+	>=media-libs/freetype-2
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
 	mng? ( media-libs/libmng )