Remove monolithic X11 support for 4.1.4 and 4.2.0

Package-Manager: portage-2.1.1_rc1-r5

4 files changed, 35 insertions, 47 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 5354e6598c58..d3bc7a4c0086 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.345 2006/09/07 16:54:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.346 2006/09/14 14:07:54 caleb Exp $
+
+  14 Sep 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4.ebuild,
+  qt-4.2.0_rc1.ebuild:
+  Remove monolithic qt deps from 4.1.4 and 4.2.0; must use modular from now on
 
   07 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> qt-4.1.4.ebuild:
   Add support again for different mkspecs and add ~x86-fbsd keyword to version
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 631f6e8be7e5..6323ecd18fcf 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
@@ -113,18 +110,18 @@ EBUILD qt-4.1.3.ebuild 6367 RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 SHA1
 MD5 6c5dd8d31125c5e8302c7dd3204aab22 qt-4.1.3.ebuild 6367
 RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 qt-4.1.3.ebuild 6367
 SHA256 a00d5b65b171fd3ebb2ba8a79d30bcf692dacce456868c113b0e8956308a1cbd qt-4.1.3.ebuild 6367
-EBUILD qt-4.1.4.ebuild 6801 RMD160 b29e2755de96a8189577ce1bc17f7ae79d7ca522 SHA1 d46ceca1eaa2d58ca2f6879e11a76a121afa668a SHA256 0478c864bf0361ccc7d32dcbe5774d1df7a51cd5447ec793254a57335a95b349
-MD5 baf8b1717f967a7575d8a619335c788a qt-4.1.4.ebuild 6801
-RMD160 b29e2755de96a8189577ce1bc17f7ae79d7ca522 qt-4.1.4.ebuild 6801
-SHA256 0478c864bf0361ccc7d32dcbe5774d1df7a51cd5447ec793254a57335a95b349 qt-4.1.4.ebuild 6801
-EBUILD qt-4.2.0_rc1.ebuild 6751 RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 SHA1 59ce5278972cef9dbee442e2d81a30a56d7c999d SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2
-MD5 d565480cd2c41ccd20fb5db7dc59db90 qt-4.2.0_rc1.ebuild 6751
-RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 qt-4.2.0_rc1.ebuild 6751
-SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2 qt-4.2.0_rc1.ebuild 6751
-MISC ChangeLog 14258 RMD160 82de584162f86cc806a9d7113c44f9e65d53ae67 SHA1 546c69bc4f9556ab712493b4b5944f7a3c3def19 SHA256 40162ec13d855a2ac640cf5fbc16fe6d4edc06b56bc0a21a0392780121ef9df6
-MD5 7173af59f01d9927c06bc37bb7d1e235 ChangeLog 14258
-RMD160 82de584162f86cc806a9d7113c44f9e65d53ae67 ChangeLog 14258
-SHA256 40162ec13d855a2ac640cf5fbc16fe6d4edc06b56bc0a21a0392780121ef9df6 ChangeLog 14258
+EBUILD qt-4.1.4.ebuild 6752 RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 SHA1 f8ea73ec0352d39827fac91a4d697d652a0c5fe0 SHA256 149481eae2815f9e65922d72026b096299f19368a3f1af0704d6dacc0eb9bb3e
+MD5 69c90c718544b9afaea468265802b111 qt-4.1.4.ebuild 6752
+RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 qt-4.1.4.ebuild 6752
+SHA256 149481eae2815f9e65922d72026b096299f19368a3f1af0704d6dacc0eb9bb3e qt-4.1.4.ebuild 6752
+EBUILD qt-4.2.0_rc1.ebuild 6706 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 SHA1 f99cbaf0f3a2fae7690e40e37624c84d58756d70 SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253
+MD5 427399b875cf9a84de35c3faee3b757b qt-4.2.0_rc1.ebuild 6706
+RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 qt-4.2.0_rc1.ebuild 6706
+SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253 qt-4.2.0_rc1.ebuild 6706
+MISC ChangeLog 14421 RMD160 ad8b106983ccb191f5b72c6865e9b52bff596473 SHA1 3042d3f555b5ba4a6f2f5282a3a19cc01b4ace72 SHA256 b1bfe665f02640dffb324ddeb78b169198db2de52f989480f66ed61140211e05
+MD5 f1be39394a99066e6ec0837e776e7a62 ChangeLog 14421
+RMD160 ad8b106983ccb191f5b72c6865e9b52bff596473 ChangeLog 14421
+SHA256 b1bfe665f02640dffb324ddeb78b169198db2de52f989480f66ed61140211e05 ChangeLog 14421
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -147,10 +144,3 @@ SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/di
 MD5 ea1cb36339ecc7954be532597c153c79 files/digest-qt-4.2.0_rc1 301
 RMD160 b055b1a3cfaee416de3d615c8b6fff1c9f150b61 files/digest-qt-4.2.0_rc1 301
 SHA256 2ec5ae0152c97cf52bf9a42854f2c202f97b1bf4b3f72c14e30bbd98f2f7352b files/digest-qt-4.2.0_rc1 301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFAE7fAiZjviIA2XgRArSRAJ9+TrFKQ+V1AQVD71feHuFZG+37VQCfY6ZN
-fGCqDDxkV9JHJJjHv1qe7yM=
-=+fsV
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-4.1.4.ebuild b/x11-libs/qt/qt-4.1.4.ebuild
index 999bc3deb237..a6b8306cf2af 100644
--- a/x11-libs/qt/qt-4.1.4.ebuild
+++ b/x11-libs/qt/qt-4.1.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/qt/qt-4.1.4.ebuild,v 1.11 2006/09/07 16:54:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4.ebuild,v 1.12 2006/09/14 14:07:54 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -16,17 +16,14 @@ SLOT="4"
 KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
 
-DEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXfont
-			x11-libs/libSM
-			x11-proto/xextproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-		)
-		<virtual/x11-7
-	)
+DEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXfont
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/inputproto
+	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
 	virtual/xft
 	>=media-libs/freetype-2
 	png? ( media-libs/libpng )
diff --git a/x11-libs/qt/qt-4.2.0_rc1.ebuild b/x11-libs/qt/qt-4.2.0_rc1.ebuild
index ce2bae1fd240..4484f78b2e2b 100644
--- a/x11-libs/qt/qt-4.2.0_rc1.ebuild
+++ b/x11-libs/qt/qt-4.2.0_rc1.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/qt/qt-4.2.0_rc1.ebuild,v 1.1 2006/09/06 12:15:50 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.0_rc1.ebuild,v 1.2 2006/09/14 14:07:54 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -19,17 +19,14 @@ IUSE="accessibility cups debug dbus doc examples firebird gif glib jpeg mng mysq
 
 # need glib and dbus
 
-DEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXfont
-			x11-libs/libSM
-			x11-proto/xextproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-		)
-		<virtual/x11-7
-	)
+DEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXfont
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/inputproto
+	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
 	virtual/xft
 	>=media-libs/freetype-2
 	dbus? ( >=sys-apps/dbus-0.62 )