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, 81 deletions

diff --git a/kde-base/kdegraphics-meta/ChangeLog b/kde-base/kdegraphics-meta/ChangeLog
index e87c62487855..58639122baeb 100644
--- a/kde-base/kdegraphics-meta/ChangeLog
+++ b/kde-base/kdegraphics-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.175 2011/03/04 17:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.176 2011/04/06 14:18:49 scarabeus Exp $
+
+*kdegraphics-meta-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdegraphics-meta-4.5.5.ebuild, -kdegraphics-meta-4.6.0.ebuild,
+  -kdegraphics-meta-4.6.1.ebuild, +kdegraphics-meta-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kdegraphics-meta-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.5.5.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.5.5.ebuild
deleted file mode 100644
index 386d6f7e3786..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.5.5.ebuild
+++ /dev/null
@@ -1,36 +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/kdegraphics-meta/kdegraphics-meta-4.5.5.ebuild,v 1.1 2011/01/10 11:53:28 tampakrap Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix scanner"
-
-RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-strigi-analyzer)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
-	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
-	)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.0.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.0.ebuild
deleted file mode 100644
index 32fff1be6cf6..000000000000
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.0.ebuild
+++ /dev/null
@@ -1,36 +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/kdegraphics-meta/kdegraphics-meta-4.6.0.ebuild,v 1.1 2011/01/26 20:28:27 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix scanner"
-
-RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-strigi-analyzer)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
-	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
-	)
-	$(block_other_slots)
-"
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild
index ecb30530cf2e..42f82976934c 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.1.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-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/kdegraphics-meta/kdegraphics-meta-4.6.1.ebuild,v 1.1 2011/03/04 17:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.6.2.ebuild,v 1.1 2011/04/06 14:18:49 scarabeus Exp $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix scanner"
+IUSE="scanner"
 
 RDEPEND="
 	$(add_kdebase_dep gwenview)
@@ -32,5 +28,4 @@ RDEPEND="
 		$(add_kdebase_dep ksaneplugin)
 		$(add_kdebase_dep libksane)
 	)
-	$(block_other_slots)
 "