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.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 9 insertions, 69 deletions

diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index d10349ec96ff..208cdb8a6332 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkworkspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.88 2011/03/04 18:00:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.89 2011/04/06 14:19:27 scarabeus Exp $
+
+*libkworkspace-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libkworkspace-4.5.5.ebuild, -libkworkspace-4.6.0.ebuild,
+  -libkworkspace-4.6.1.ebuild, +libkworkspace-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *libkworkspace-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/libkworkspace/libkworkspace-4.5.5.ebuild b/kde-base/libkworkspace/libkworkspace-4.5.5.ebuild
deleted file mode 100644
index 25ba66520825..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.5.5.ebuild
+++ /dev/null
@@ -1,34 +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/libkworkspace/libkworkspace-4.5.5.ebuild,v 1.1 2011/01/10 11:53:46 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# FIXME dependencies until activities API is moved to kdelibs (4.6)
-DEPEND="
-	>=dev-libs/shared-desktop-ontologies-0.4
-	>=dev-libs/soprano-2.4.64[raptor,redland]
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.6.0.ebuild b/kde-base/libkworkspace/libkworkspace-4.6.0.ebuild
deleted file mode 100644
index d48f74b45f17..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.6.0.ebuild
+++ /dev/null
@@ -1,33 +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/libkworkspace/libkworkspace-4.6.0.ebuild,v 1.3 2011/02/27 21:42:24 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libXcomposite
-"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.6.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.6.2.ebuild
index 0b8d0cc18e77..5374bc4d23e8 100644
--- a/kde-base/libkworkspace/libkworkspace-4.6.1.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-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/libkworkspace/libkworkspace-4.6.1.ebuild,v 1.1 2011/03/04 18:00:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.6.2.ebuild,v 1.1 2011/04/06 14:19:27 scarabeus Exp $
 
 EAPI=3