From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sat, 25 Nov 2006 14:42:49 +0000 (+0000)
Subject: Fix kdelibs dependency, thanks to Mart Raudsepp (leio) in bug #156209.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29947eb78e7e8ffe8943ae40204ecb12ba15f8f2;p=gentoo.git

Fix kdelibs dependency, thanks to Mart Raudsepp (leio) in bug #156209.
Package-Manager: portage-2.1.2_rc2-r2
---

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 2eb37b3de737..0e8f003e9513 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.75 2006/11/24 15:15:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.76 2006/11/25 14:42:49 flameeyes Exp $
+
+  25 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> kwin-3.5.5-r2.ebuild:
+  Fix kdelibs dependency, thanks to Mart Raudsepp (leio) in bug #156209.
 
 *kwin-3.5.5-r2 (24 Nov 2006)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 37583b9b7f2e..1bc67710bb0d 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -28,14 +28,14 @@ EBUILD kwin-3.5.5-r1.ebuild 789 RMD160 b8d499d069efd5d14347a4e486a8842e8f2fe094
 MD5 e4b84c858a6c16cc037f015c12584496 kwin-3.5.5-r1.ebuild 789
 RMD160 b8d499d069efd5d14347a4e486a8842e8f2fe094 kwin-3.5.5-r1.ebuild 789
 SHA256 c921aa8ade4eac2e0c39bea1327140ef108a28c2eff8e4197c2a93418bd7d2a5 kwin-3.5.5-r1.ebuild 789
-EBUILD kwin-3.5.5-r2.ebuild 905 RMD160 66077065ccc32ac1d3df06389671c4bbb0a8ee57 SHA1 fa8e8de506befbe03663a4932672573d77bf87c7 SHA256 2ac75d323eedc5869fd094c73e3aa276b4800d48daba0267a75be6ca26ac7eb7
-MD5 12441e1e2be5336af60df2ae0f60aeb8 kwin-3.5.5-r2.ebuild 905
-RMD160 66077065ccc32ac1d3df06389671c4bbb0a8ee57 kwin-3.5.5-r2.ebuild 905
-SHA256 2ac75d323eedc5869fd094c73e3aa276b4800d48daba0267a75be6ca26ac7eb7 kwin-3.5.5-r2.ebuild 905
-MISC ChangeLog 9428 RMD160 77047aaa7b0bfddc18dacfc00a4f3666f9dd4e94 SHA1 df0fb61db5e7ceeadc81682f247e27c1de0873a8 SHA256 0d49f120e23598e20a6dcbdf3d4d70b89f01c0d458f9932a87d8648474f9bd82
-MD5 b7ef2a60dc6d0ab57387a13bc3435d6c ChangeLog 9428
-RMD160 77047aaa7b0bfddc18dacfc00a4f3666f9dd4e94 ChangeLog 9428
-SHA256 0d49f120e23598e20a6dcbdf3d4d70b89f01c0d458f9932a87d8648474f9bd82 ChangeLog 9428
+EBUILD kwin-3.5.5-r2.ebuild 812 RMD160 ccff7acd2442ecc7a842b42038da78f439864de5 SHA1 b45b742fae9ca8515b7b863351a49fcac1456135 SHA256 619cb87f174adaf3c6a3adbf578061049330618561fda96d1f7c9ce6e44d2b68
+MD5 c9d23923a6e14106dd0518d30221df43 kwin-3.5.5-r2.ebuild 812
+RMD160 ccff7acd2442ecc7a842b42038da78f439864de5 kwin-3.5.5-r2.ebuild 812
+SHA256 619cb87f174adaf3c6a3adbf578061049330618561fda96d1f7c9ce6e44d2b68 kwin-3.5.5-r2.ebuild 812
+MISC ChangeLog 9577 RMD160 013be3cf1090c7546cfa72ea99b0add361f3f8c2 SHA1 ce05d127543594802c7e212fde7c8f1b5779e06a SHA256 3f0b042b84315220c7d88ceff15a976d0fa3e9a625f8e85782cade30b5f15f7a
+MD5 8b968f9ac2ebfca2ea509706dd2af931 ChangeLog 9577
+RMD160 013be3cf1090c7546cfa72ea99b0add361f3f8c2 ChangeLog 9577
+SHA256 3f0b042b84315220c7d88ceff15a976d0fa3e9a625f8e85782cade30b5f15f7a ChangeLog 9577
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -52,7 +52,7 @@ SHA256 89dfd51c5417ff15ddb53f9a5b876f49737f7691e5c0ad1777e743305104cb5c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZwx/AiZjviIA2XgRAtvxAJ0ZBY8XGxuJs5ABDpr0isbTwWNbUgCfVymA
-d20iX3nJtWL8gp602gVrPpM=
-=8DRN
+iD8DBQFFaFaOAiZjviIA2XgRAjZ2AKCoRVTuhovDzUhPJwcGuj174ZRx6gCgmiW2
+4nN9NCRmPSwCNoMbAFgC/ls=
+=6MOo
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/kwin-3.5.5-r2.ebuild b/kde-base/kwin/kwin-3.5.5-r2.ebuild
index 98f25e2acdf8..9c2b03b26990 100644
--- a/kde-base/kwin/kwin-3.5.5-r2.ebuild
+++ b/kde-base/kwin/kwin-3.5.5-r2.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.5-r2.ebuild,v 1.1 2006/11/24 15:15:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.5-r2.ebuild,v 1.2 2006/11/25 14:42:49 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
+KM_DEPRANGE="3.5.5-r7 $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="xcomposite"
-RDEPEND="xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)"
+RDEPEND="xcomposite? (
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	)"
 DEPEND="${RDEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)"
+	xcomposite? (
+		x11-proto/compositeproto
+		x11-proto/damageproto
+	)"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${P}-seli-xinerama.patch.bz2"