From: Caleb Tennis <caleb@gentoo.org>
Date: Thu, 8 Mar 2007 20:24:46 +0000 (+0000)
Subject: Remove <xorg-x11-7 deps per bug #167408
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb514ef3ab692a5c3e23c31bfe1c794b41c83233;p=gentoo.git

Remove <xorg-x11-7 deps per bug #167408
Package-Manager: portage-2.1.2.1
---

diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 3803b9c9e05d..451197d5df32 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.76 2007/02/05 12:22:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.77 2007/03/08 20:24:46 caleb Exp $
+
+  08 Mar 2007; Caleb Tennis <caleb@gentoo.org> kicker-3.5.5.ebuild,
+  kicker-3.5.6.ebuild:
+  Remove <xorg-x11-7 deps per bug #167408
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/applets-configure.in.in.diff:
diff --git a/kde-base/kicker/kicker-3.5.5.ebuild b/kde-base/kicker/kicker-3.5.5.ebuild
index 640743fd5804..c301c409662f 100644
--- a/kde-base/kicker/kicker-3.5.5.ebuild
+++ b/kde-base/kicker/kicker-3.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.5.ebuild,v 1.9 2006/12/11 11:12:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.5.ebuild,v 1.10 2007/03/08 20:24:46 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -17,16 +17,13 @@ IUSE="kdehiddenvisibility xcomposite"
 RDEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkonq)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
-	|| ( (
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-		) <virtual/x11-7 )
-	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	xcomposite? ( x11-libs/libXcomposite )"
 
-DEPEND="${RDEPEND}
-	xcomposite? ( || ( x11-proto/compositeproto <x11-base/xorg-x11-7 ) )"
+DEPEND="${RDEPEND}"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY="libkonq
diff --git a/kde-base/kicker/kicker-3.5.6.ebuild b/kde-base/kicker/kicker-3.5.6.ebuild
index 4297a4a1273b..a1843b65bfbd 100644
--- a/kde-base/kicker/kicker-3.5.6.ebuild
+++ b/kde-base/kicker/kicker-3.5.6.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/kicker/kicker-3.5.6.ebuild,v 1.1 2007/01/16 20:39:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.6.ebuild,v 1.2 2007/03/08 20:24:46 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -17,16 +17,13 @@ IUSE="kdehiddenvisibility xcomposite"
 RDEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkonq)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
-	|| ( (
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-		) <virtual/x11-7 )
-	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	xcomposite? ( x11-libs/libXcomposite )"
 
-DEPEND="${RDEPEND}
-	xcomposite? ( || ( x11-proto/compositeproto <x11-base/xorg-x11-7 ) )"
+DEPEND="${RDEPEND}"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY="libkonq
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 5cc133c063a6..b2d57745aa52 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kwin-3.5.5-input-shape.patch 2920 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 SHA1 3e1d3993ba87c157c6bf2c2db9f07a235e657568 SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db
 MD5 acec9d692344d8f456265c517248496b files/kwin-3.5.5-input-shape.patch 2920
 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 files/kwin-3.5.5-input-shape.patch 2920
@@ -8,22 +5,22 @@ SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db files/kw
 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
 DIST kwin-3.5.5-seli-xinerama.patch.bz2 7362 RMD160 e1c83cd6ca967b24e82851c0f286d57ab68d7730 SHA1 817d31516ad921f1bbcfbe96057fd624ae6bf590 SHA256 20baec02a66f500ea6e16a239aa123d2a62c2f80107b3a0a72b72ecd918aa0d3
-EBUILD kwin-3.5.5-r1.ebuild 806 RMD160 ab158697bb189aa1f0dfdae5b06b97cb21b4643d SHA1 cb05765ca76279bd56b1f419267cab1de90d0ca9 SHA256 1c7bb5ff201563125d21ecd0d06d76cd3832fd708201d9b4d749902eb7dd4210
-MD5 8731b6ea3ba535f9fbb72be47f7273be kwin-3.5.5-r1.ebuild 806
-RMD160 ab158697bb189aa1f0dfdae5b06b97cb21b4643d kwin-3.5.5-r1.ebuild 806
-SHA256 1c7bb5ff201563125d21ecd0d06d76cd3832fd708201d9b4d749902eb7dd4210 kwin-3.5.5-r1.ebuild 806
-EBUILD kwin-3.5.5-r2.ebuild 846 RMD160 a427aa8fb23ad93ca51788d87ab766bd56393093 SHA1 dfe97f2cff38f0a4aec93364b425554d32707ae5 SHA256 d22d710c5af36d475ebd0d64034463c812ad2fba2301105ed84548a37d94db68
-MD5 d73213547f0eea81ca7a5a13fc3de4bc kwin-3.5.5-r2.ebuild 846
-RMD160 a427aa8fb23ad93ca51788d87ab766bd56393093 kwin-3.5.5-r2.ebuild 846
-SHA256 d22d710c5af36d475ebd0d64034463c812ad2fba2301105ed84548a37d94db68 kwin-3.5.5-r2.ebuild 846
-EBUILD kwin-3.5.6.ebuild 822 RMD160 b3997d51cc8dc7256ab47d269628f6b518238cf9 SHA1 338755f8e1085e5a0e8da82a4b5ab6ed365de964 SHA256 9a5a953ad42349127db01d3a4f5aee75340183470d2888449d30d22d82e931eb
-MD5 d49d14fcf1e278e544813b7194a2836b kwin-3.5.6.ebuild 822
-RMD160 b3997d51cc8dc7256ab47d269628f6b518238cf9 kwin-3.5.6.ebuild 822
-SHA256 9a5a953ad42349127db01d3a4f5aee75340183470d2888449d30d22d82e931eb kwin-3.5.6.ebuild 822
-MISC ChangeLog 11394 RMD160 46174db4eb253dd07abb49cd5402a2bb870b6c84 SHA1 bac7b08306d9cdc3ef02ea51fcc7c45c7a460206 SHA256 0f4c4a7c1579384b5e4f09dff25bcdf76c6b1db3dbbc1240eb27b6bcb7012b71
-MD5 1e5e622a9149464f7722fd92b489989a ChangeLog 11394
-RMD160 46174db4eb253dd07abb49cd5402a2bb870b6c84 ChangeLog 11394
-SHA256 0f4c4a7c1579384b5e4f09dff25bcdf76c6b1db3dbbc1240eb27b6bcb7012b71 ChangeLog 11394
+EBUILD kwin-3.5.5-r1.ebuild 656 RMD160 12b09ec9dc85dae51fa3544b326e752a9080589a SHA1 0fa00eab341e525add9cf2c4fdde991a87cee63c SHA256 7dab5d6af66f773f087309813120b33d868b7cbbf86f3368dd208d11e2e1be1c
+MD5 10e152feece2352f86d295d689514cb1 kwin-3.5.5-r1.ebuild 656
+RMD160 12b09ec9dc85dae51fa3544b326e752a9080589a kwin-3.5.5-r1.ebuild 656
+SHA256 7dab5d6af66f773f087309813120b33d868b7cbbf86f3368dd208d11e2e1be1c kwin-3.5.5-r1.ebuild 656
+EBUILD kwin-3.5.5-r2.ebuild 771 RMD160 a0fb992da63eb3a92384f62e1706e32de70e7ffe SHA1 f6e7bf289d1a1ef8fc448ac0c64283b24d7ad891 SHA256 e966fa54be34db0fddecd907ac9a0e35446b1c371fc28e14814c4d65918868ae
+MD5 63238cdef95965c010d63c2897f84086 kwin-3.5.5-r2.ebuild 771
+RMD160 a0fb992da63eb3a92384f62e1706e32de70e7ffe kwin-3.5.5-r2.ebuild 771
+SHA256 e966fa54be34db0fddecd907ac9a0e35446b1c371fc28e14814c4d65918868ae kwin-3.5.5-r2.ebuild 771
+EBUILD kwin-3.5.6.ebuild 746 RMD160 17f1d5f4c8e979526ec230144f06f86ebcc169f4 SHA1 858310666679e7fe322f321eb6fa35ca5d6681e5 SHA256 48c35eaad330bef94d4542874a278d10ed24358decf802ddec528bd082e95b69
+MD5 3ed31d7e2ae2ed5c0e1021fd6322992e kwin-3.5.6.ebuild 746
+RMD160 17f1d5f4c8e979526ec230144f06f86ebcc169f4 kwin-3.5.6.ebuild 746
+SHA256 48c35eaad330bef94d4542874a278d10ed24358decf802ddec528bd082e95b69 kwin-3.5.6.ebuild 746
+MISC ChangeLog 11545 RMD160 498c3ce90360757d9dd0169b51ce0441bc871fc1 SHA1 866ddc4643e2024699c01be44c76bd8dc8d90717 SHA256 25e1abe23c9a8f5b6478aa43e46e8f7da1fc7aa71740d77c8c91d0259255f10f
+MD5 4d5feac5917410ed79a19fa3693619da ChangeLog 11545
+RMD160 498c3ce90360757d9dd0169b51ce0441bc871fc1 ChangeLog 11545
+SHA256 25e1abe23c9a8f5b6478aa43e46e8f7da1fc7aa71740d77c8c91d0259255f10f ChangeLog 11545
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -37,10 +34,3 @@ SHA256 89dfd51c5417ff15ddb53f9a5b876f49737f7691e5c0ad1777e743305104cb5c files/di
 MD5 d2c9c73ff14bdb3176912712ee5b6572 files/digest-kwin-3.5.6 527
 RMD160 9dd0513afd48abe9f0c899aea8fad044f7b6de87 files/digest-kwin-3.5.6 527
 SHA256 80c5a1b3057d5c009bfc6927e3bd53d82ba2f737f0973d1fb564d704034c64da files/digest-kwin-3.5.6 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzJNrkT4lNIS36YERAvEVAKCDrSx9HWVAjskKwP4cSNic4sTcFQCfYalQ
-WZoTnMb9rJpfD37cuvaZZZM=
-=73fu
------END PGP SIGNATURE-----