KDE SC 4.6.2 version bump. Drop 4.6.{0,1} and 4.5.5. This is our stable candidate so test and test more. Force due to some unmet deps. Filled as bug #362305.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 8 insertions, 117 deletions

diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index 8f81176314d2..faaf612a38f6 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.85 2011/03/07 23:16:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.86 2011/04/06 14:19:09 scarabeus Exp $
+
+*krunner-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -krunner-4.5.5.ebuild,
+  -krunner-4.6.0.ebuild, -krunner-4.6.1.ebuild, +krunner-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
   07 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> krunner-4.6.1.ebuild:
   No dependency or linking to libxf86misc found.
diff --git a/kde-base/krunner/krunner-4.5.5.ebuild b/kde-base/krunner/krunner-4.5.5.ebuild
deleted file mode 100644
index 4f658be86302..000000000000
--- a/kde-base/krunner/krunner-4.5.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.5.5.ebuild,v 1.1 2011/01/10 11:53:40 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	!aqua? (
-		x11-libs/libXxf86misc
-		x11-libs/libXcursor
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-libs/libXcursor
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/kephal/
-	libs/ksysguard/
-	libs/kworkspace/
-	libs/plasmagenericshell/
-	kcheckpass/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksysguard/
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/krunner/krunner-4.6.0.ebuild b/kde-base/krunner/krunner-4.6.0.ebuild
deleted file mode 100644
index b558b374c519..000000000000
--- a/kde-base/krunner/krunner-4.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.6.0.ebuild,v 1.1 2011/01/26 20:29:13 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kcheckpass)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	!aqua? (
-		x11-libs/libXxf86misc
-		x11-libs/libXcursor
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-libs/libXcursor
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-KMEXTRACTONLY="
-	libs/kdm/
-	libs/kephal/
-	libs/ksysguard/
-	libs/kworkspace/
-	libs/plasmagenericshell/
-	kcheckpass/
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksysguard/
-	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/krunner/krunner-4.6.1.ebuild b/kde-base/krunner/krunner-4.6.2.ebuild
index 339f23b262f7..bca180ea010c 100644
--- a/kde-base/krunner/krunner-4.6.1.ebuild
+++ b/kde-base/krunner/krunner-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.6.1.ebuild,v 1.2 2011/03/07 23:16:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.6.2.ebuild,v 1.1 2011/04/06 14:19:09 scarabeus Exp $
 
 EAPI=3
 
@@ -27,7 +27,6 @@ COMMONDEPEND="
 DEPEND="${COMMONDEPEND}
 	!aqua? (
 		x11-libs/libXcursor
-		x11-proto/xf86miscproto
 		x11-proto/scrnsaverproto
 	)
 "