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, 10 insertions, 85 deletions

diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog
index 01c829396100..fade2ae49cb2 100644
--- a/kde-base/kde-meta/ChangeLog
+++ b/kde-base/kde-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.181 2011/03/04 18:00:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.182 2011/04/06 14:18:52 scarabeus Exp $
+
+*kde-meta-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kde-meta-4.5.5.ebuild,
+  -kde-meta-4.6.0.ebuild, -kde-meta-4.6.1.ebuild, +kde-meta-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kde-meta-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kde-meta/kde-meta-4.5.5.ebuild b/kde-base/kde-meta/kde-meta-4.5.5.ebuild
deleted file mode 100644
index 5a9e0ab3e7e9..000000000000
--- a/kde-base/kde-meta/kde-meta-4.5.5.ebuild
+++ /dev/null
@@ -1,38 +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/kde-meta/kde-meta-4.5.5.ebuild,v 1.1 2011/01/10 11:53:24 tampakrap Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
-	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
-	)
-	semantic-desktop? ( >=kde-base/kdepim-meta-4.4.4 )
-	$(block_other_slots)
-"
diff --git a/kde-base/kde-meta/kde-meta-4.6.0.ebuild b/kde-base/kde-meta/kde-meta-4.6.0.ebuild
deleted file mode 100644
index c6871577b955..000000000000
--- a/kde-base/kde-meta/kde-meta-4.6.0.ebuild
+++ /dev/null
@@ -1,38 +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/kde-meta/kde-meta-4.6.0.ebuild,v 1.1 2011/01/26 20:28:23 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
-
-RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdeplasma-addons)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
-	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
-	)
-	semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kde-meta/kde-meta-4.6.1.ebuild b/kde-base/kde-meta/kde-meta-4.6.2.ebuild
index e611ce33be4a..22e528cd5a04 100644
--- a/kde-base/kde-meta/kde-meta-4.6.1.ebuild
+++ b/kde-base/kde-meta/kde-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/kde-meta/kde-meta-4.6.1.ebuild,v 1.1 2011/03/04 18:00:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.6.2.ebuild,v 1.1 2011/04/06 14:18:52 scarabeus Exp $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -34,5 +30,4 @@ RDEPEND="
 		$(add_kdebase_dep kdewebdev-meta)
 	)
 	semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
-	$(block_other_slots)
 "