From 14cc295614cdb2a8f6b7731b231093a8cebb0c02 Mon Sep 17 00:00:00 2001
From: Caleb Tennis <caleb@gentoo.org>
Date: Thu, 8 Mar 2007 20:24:46 +0000
Subject: Remove <xorg-x11-7 deps per bug #167408 (Portage version: 2.1.2.1)

---
 kde-base/kicker/ChangeLog           |  6 +++++-
 kde-base/kicker/kicker-3.5.5.ebuild | 19 ++++++++-----------
 kde-base/kicker/kicker-3.5.6.ebuild | 17 +++++++----------
 3 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'kde-base')

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
-- 
cgit v1.2.3-65-gdbad