remove <xorg-x11-7 deps per bug #167408

Package-Manager: portage-2.1.2.1

6 files changed, 59 insertions, 97 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index aa8535400d17..5efc20e4573b 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.348 2007/02/12 14:04:46 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.349 2007/03/08 20:21:57 caleb Exp $
+
+  08 Mar 2007; Caleb Tennis <caleb@gentoo.org> kdebase-3.5.5-r1.ebuild,
+  kdebase-3.5.5-r3.ebuild, kdebase-3.5.6-r1.ebuild:
+  remove <xorg-x11-7 deps per bug #167408
 
   12 Feb 2007; Simon Stelling <blubb@gentoo.org> kdebase-3.5.5-r3.ebuild:
   stable on amd64; bug 164080
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 0f41853a5f9a..4f420600c67b 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -33,22 +33,22 @@ SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2 files/ns
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
-EBUILD kdebase-3.5.5-r1.ebuild 6078 RMD160 a6ac9ee4d04b8d2c77a0147391687021521ffa41 SHA1 8d634d0ae28627e377dc05820d86eed68127f3a6 SHA256 6aa4d4629f5a6abfeead4d14a23798faaca7772aa25048eb274a517704cb456a
-MD5 ccd37f5c1d4eeac10da9f09827e5aecb kdebase-3.5.5-r1.ebuild 6078
-RMD160 a6ac9ee4d04b8d2c77a0147391687021521ffa41 kdebase-3.5.5-r1.ebuild 6078
-SHA256 6aa4d4629f5a6abfeead4d14a23798faaca7772aa25048eb274a517704cb456a kdebase-3.5.5-r1.ebuild 6078
-EBUILD kdebase-3.5.5-r3.ebuild 6162 RMD160 23bed9d0c301ff0bd075d32b9881c9bbb9a0d8e3 SHA1 02b98fcd9e6c7fd4a59b0c366caa5f6516571296 SHA256 892acfa986836c44c6a859fce366c698283317eef7cdff158860fe1050e5bd1a
-MD5 6502d96e81554a9418af647cb2d9d1c1 kdebase-3.5.5-r3.ebuild 6162
-RMD160 23bed9d0c301ff0bd075d32b9881c9bbb9a0d8e3 kdebase-3.5.5-r3.ebuild 6162
-SHA256 892acfa986836c44c6a859fce366c698283317eef7cdff158860fe1050e5bd1a kdebase-3.5.5-r3.ebuild 6162
-EBUILD kdebase-3.5.6-r1.ebuild 5918 RMD160 5da55a25a525ed9ae4ea40b7ea10747b489543f2 SHA1 dcba01881637c582d001d5a5f8a7d6982a448570 SHA256 eceede4a62c451ef12118bc86d13da6f290012053607f7bd1c9a49c9964eedfd
-MD5 babe1e1e7e2c7dda7f2aa13b5302214a kdebase-3.5.6-r1.ebuild 5918
-RMD160 5da55a25a525ed9ae4ea40b7ea10747b489543f2 kdebase-3.5.6-r1.ebuild 5918
-SHA256 eceede4a62c451ef12118bc86d13da6f290012053607f7bd1c9a49c9964eedfd kdebase-3.5.6-r1.ebuild 5918
-MISC ChangeLog 59765 RMD160 3ae2706e07c2601ac20359d76ce7a54892403af7 SHA1 604485e6f9fed033ac67d8c19f61de14463689c2 SHA256 82251bb8133e5629c8ecadea8a3646a11aca8742a98deec608819589c5af965a
-MD5 45efc6ebe5d00da398f840555cc2037c ChangeLog 59765
-RMD160 3ae2706e07c2601ac20359d76ce7a54892403af7 ChangeLog 59765
-SHA256 82251bb8133e5629c8ecadea8a3646a11aca8742a98deec608819589c5af965a ChangeLog 59765
+EBUILD kdebase-3.5.5-r1.ebuild 5908 RMD160 5f885f281109188f11ff75c9055a1343139c45c5 SHA1 7037fa8d9edb955ae95f8351241c233945b820c4 SHA256 6a137abd8e9ded6f94303aeb02ccee466614bd063ec276f93373edda03bae892
+MD5 19f7775a25b4c64c0d3507561163558e kdebase-3.5.5-r1.ebuild 5908
+RMD160 5f885f281109188f11ff75c9055a1343139c45c5 kdebase-3.5.5-r1.ebuild 5908
+SHA256 6a137abd8e9ded6f94303aeb02ccee466614bd063ec276f93373edda03bae892 kdebase-3.5.5-r1.ebuild 5908
+EBUILD kdebase-3.5.5-r3.ebuild 6042 RMD160 40dc0259046d5f334da0518a3586b3e2a74ae027 SHA1 af6452f1fee6b22a2876826c2534ad4810473124 SHA256 c2446fc90c6990404eeaec6766ada55385153e462185ff4b165044f5798fdc25
+MD5 cd3ce94b4099b3d35de765971ea1f75f kdebase-3.5.5-r3.ebuild 6042
+RMD160 40dc0259046d5f334da0518a3586b3e2a74ae027 kdebase-3.5.5-r3.ebuild 6042
+SHA256 c2446fc90c6990404eeaec6766ada55385153e462185ff4b165044f5798fdc25 kdebase-3.5.5-r3.ebuild 6042
+EBUILD kdebase-3.5.6-r1.ebuild 5799 RMD160 74eef1b99cc7af87c3300cab758f5ed0bcfc481d SHA1 0d2f7376b6b2f67b46ca4e7f3e76ebfca477ee51 SHA256 3c1f0dfc56fa0d4c7c6baddeaee9ff152741a2e7e2095499a18ddd25c4e0d165
+MD5 6635e5262b03d94e0b0b8e5600855795 kdebase-3.5.6-r1.ebuild 5799
+RMD160 74eef1b99cc7af87c3300cab758f5ed0bcfc481d kdebase-3.5.6-r1.ebuild 5799
+SHA256 3c1f0dfc56fa0d4c7c6baddeaee9ff152741a2e7e2095499a18ddd25c4e0d165 kdebase-3.5.6-r1.ebuild 5799
+MISC ChangeLog 59932 RMD160 e912c38e5c36792b9673b61050aff5aec564b355 SHA1 f585ae5b14c979a1e915853bcf73bf25f984772a SHA256 a67b1f378a8f08940b470eb9bddd27fe571b178da53af91d2f62cb39e14102ad
+MD5 50629d8dbf114f3b1ced3cc0daa23c0f ChangeLog 59932
+RMD160 e912c38e5c36792b9673b61050aff5aec564b355 ChangeLog 59932
+SHA256 a67b1f378a8f08940b470eb9bddd27fe571b178da53af91d2f62cb39e14102ad ChangeLog 59932
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
index 2b23d4a39e0a..6e54ea49fb4f 100644
--- a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r1.ebuild,v 1.14 2007/01/05 16:56:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r1.ebuild,v 1.15 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,21 +31,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) <virtual/x11-7 )"
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXext
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xinerama? ( x11-libs/libXinerama )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -64,16 +58,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
diff --git a/kde-base/kdebase/kdebase-3.5.5-r3.ebuild b/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
index c91521f35070..36d61ef9ff33 100644
--- a/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r3.ebuild,v 1.9 2007/02/12 14:04:47 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r3.ebuild,v 1.10 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -31,11 +31,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
 	|| ( (
 			x11-libs/libX11
 			x11-libs/libXau
@@ -64,16 +60,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
diff --git a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
index b74a691e76e9..f4fd37b04529 100644
--- a/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.2 2007/02/04 17:41:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r1.ebuild,v 1.3 2007/03/08 20:21:57 caleb Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -30,11 +30,7 @@ DEPEND=">=media-libs/freetype-2
 	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5* )
 	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
 	|| ( (
 			x11-libs/libX11
 			x11-libs/libXau
@@ -63,16 +59,10 @@ RDEPEND="${DEPEND}
 		) <virtual/x11-7 )"
 
 DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) <virtual/x11-7 )
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
 	dev-util/pkgconfig"
 
 need-kde 3.5.6
diff --git a/kde-base/kicker/Manifest b/kde-base/kicker/Manifest
index b7acbc74a5e3..aa212059a678 100644
--- a/kde-base/kicker/Manifest
+++ b/kde-base/kicker/Manifest
@@ -1,21 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
-EBUILD kicker-3.5.5.ebuild 1154 RMD160 3c63a953529a2d7a4a972be80db4785fb4e2643f SHA1 f96faec9b5443e38337ae1d4ad07b11e81c3ce52 SHA256 2c104bbde46e1a732928f0db35b4cd8e50327b96012574fc9cd3afff0342ba3d
-MD5 ea11b603375688f87a2a8dfff41c2a38 kicker-3.5.5.ebuild 1154
-RMD160 3c63a953529a2d7a4a972be80db4785fb4e2643f kicker-3.5.5.ebuild 1154
-SHA256 2c104bbde46e1a732928f0db35b4cd8e50327b96012574fc9cd3afff0342ba3d kicker-3.5.5.ebuild 1154
-EBUILD kicker-3.5.6.ebuild 1164 RMD160 c09158d08daf151754b72192a68e9e8a60023ad2 SHA1 12ba4d7606af0b90791165f1318bcd94945cfed0 SHA256 21e5b807b11a61901fd546d57102ba9e56d5f05d9b77738012815794808c71eb
-MD5 73c3c4d0642b4b2a1fe0f740b6382397 kicker-3.5.6.ebuild 1164
-RMD160 c09158d08daf151754b72192a68e9e8a60023ad2 kicker-3.5.6.ebuild 1164
-SHA256 21e5b807b11a61901fd546d57102ba9e56d5f05d9b77738012815794808c71eb kicker-3.5.6.ebuild 1164
-MISC ChangeLog 9312 RMD160 d6b7307d1871e7c4dfd3d31eddb000e59141033a SHA1 8be165f86bf4af39a899adad10a5a14d4b5bd276 SHA256 6b591c89570f659454b1d1e1fd91d832ba6a62fb035d49ec93507e3e290c90cb
-MD5 ed69b29f5b99de0bf9f369ff7eaa14c7 ChangeLog 9312
-RMD160 d6b7307d1871e7c4dfd3d31eddb000e59141033a ChangeLog 9312
-SHA256 6b591c89570f659454b1d1e1fd91d832ba6a62fb035d49ec93507e3e290c90cb ChangeLog 9312
+EBUILD kicker-3.5.5.ebuild 1019 RMD160 c99457299fa40ee1bf90ab89fd4d0445db24f98a SHA1 1d3f34928a37d5b58404f6ef09d49c4080e1ba8e SHA256 1f73de9ad0def78cf399e4b15a47b7bdca0a45e15d5505301f7c23bb32e2d79d
+MD5 1e6a7db770f00cd40ae02af5d9eab074 kicker-3.5.5.ebuild 1019
+RMD160 c99457299fa40ee1bf90ab89fd4d0445db24f98a kicker-3.5.5.ebuild 1019
+SHA256 1f73de9ad0def78cf399e4b15a47b7bdca0a45e15d5505301f7c23bb32e2d79d kicker-3.5.5.ebuild 1019
+EBUILD kicker-3.5.6.ebuild 1025 RMD160 8b8cf6c2f3a748e2ee7e813204b0ba23e22fcba1 SHA1 569df6379f3346eac29912bf353b7cd7e34223a5 SHA256 725c85cb99f6081cf0e9c6441efdfd8bff817951501a41edbc5b6140b6efe766
+MD5 bf209c5398e51feaf1318d6af12b3017 kicker-3.5.6.ebuild 1025
+RMD160 8b8cf6c2f3a748e2ee7e813204b0ba23e22fcba1 kicker-3.5.6.ebuild 1025
+SHA256 725c85cb99f6081cf0e9c6441efdfd8bff817951501a41edbc5b6140b6efe766 kicker-3.5.6.ebuild 1025
+MISC ChangeLog 9442 RMD160 85adcd8417e5c87d7bf37ae1faa7ec5a2fcbdd42 SHA1 573aca2c9511175e1de00dcf0abe52a1daff2eaf SHA256 9d2a72c1d518277c456430c5122bf2ef6c1f849ad452b4474c9f7b0745795e5a
+MD5 ce45422a1b531f2579ab3783e9bbeac8 ChangeLog 9442
+RMD160 85adcd8417e5c87d7bf37ae1faa7ec5a2fcbdd42 ChangeLog 9442
+SHA256 9d2a72c1d518277c456430c5122bf2ef6c1f849ad452b4474c9f7b0745795e5a ChangeLog 9442
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -26,10 +23,3 @@ SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/di
 MD5 ee171b889b6d1bf06db7b9807b6ecd54 files/digest-kicker-3.5.6 521
 RMD160 b1bca8eff5d846ea0f0d76494fc35c512f14ddba files/digest-kicker-3.5.6 521
 SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/digest-kicker-3.5.6 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxyGSAiZjviIA2XgRAoHOAKDG7/jy9v+qZu4I2bJM0RvxAHOx2ACeJVhP
-bXcCimr8TxEWiRaGxTNvIRk=
-=0+Tl
------END PGP SIGNATURE-----