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, 11 insertions, 113 deletions

diff --git a/kde-base/kdebase-runtime-meta/ChangeLog b/kde-base/kdebase-runtime-meta/ChangeLog
index f71bfa7d94b2..d196a287d828 100644
--- a/kde-base/kdebase-runtime-meta/ChangeLog
+++ b/kde-base/kdebase-runtime-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-runtime-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.33 2011/03/04 18:00:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/ChangeLog,v 1.34 2011/04/06 14:19:29 scarabeus Exp $
+
+*kdebase-runtime-meta-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebase-runtime-meta-4.5.5.ebuild, -kdebase-runtime-meta-4.6.0.ebuild,
+  -kdebase-runtime-meta-4.6.1.ebuild, +kdebase-runtime-meta-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kdebase-runtime-meta-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.5.5.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.5.5.ebuild
deleted file mode 100644
index ec7d6e1988e1..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.5.5.ebuild
+++ /dev/null
@@ -1,52 +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/kdebase-runtime-meta/kdebase-runtime-meta-4.5.5.ebuild,v 1.1 2011/01/10 11:53:26 tampakrap Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua +handbook kdeprefix semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep attica)
-	$(add_kdebase_dep drkonqi)
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.0.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.0.ebuild
deleted file mode 100644
index f42bba2adddf..000000000000
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +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/kdebase-runtime-meta/kdebase-runtime-meta-4.6.0.ebuild,v 1.1 2011/01/26 20:29:24 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua +handbook kdeprefix semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep activitymanager)
-	$(add_kdebase_dep attica)
-	$(add_kdebase_dep drkonqi)
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kcontrol)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knetattach)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.1.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild
index 9742eae9c34e..b539f206988a 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.1.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.1.ebuild,v 1.1 2011/03/04 18:00:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.6.2.ebuild,v 1.1 2011/04/06 14:19:29 scarabeus Exp $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua +handbook kdeprefix semantic-desktop"
+IUSE="+handbook semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep activitymanager)
@@ -49,5 +45,4 @@ RDEPEND="
 	$(add_kdebase_dep solid-runtime)
 	handbook? ( $(add_kdebase_dep khelpcenter) )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
-	$(block_other_slots)
 "