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

diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-base/kdemultimedia-meta/ChangeLog
index b11db2db8072..4f43f1547956 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-base/kdemultimedia-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.171 2011/03/04 18:00:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.172 2011/04/06 14:19:30 scarabeus Exp $
+
+*kdemultimedia-meta-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdemultimedia-meta-4.5.5.ebuild, -kdemultimedia-meta-4.6.0.ebuild,
+  -kdemultimedia-meta-4.6.1.ebuild, +kdemultimedia-meta-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kdemultimedia-meta-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.5.5.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.5.5.ebuild
deleted file mode 100644
index c35a853b895a..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.5.5.ebuild
+++ /dev/null
@@ -1,27 +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/kdemultimedia-meta/kdemultimedia-meta-4.5.5.ebuild,v 1.1 2011/01/10 11:53:28 tampakrap Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua ffmpeg kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep dragonplayer)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	$(add_kdebase_dep mplayerthumbs)
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.0.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.0.ebuild
deleted file mode 100644
index 5aa4fb098fa4..000000000000
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.0.ebuild
+++ /dev/null
@@ -1,27 +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/kdemultimedia-meta/kdemultimedia-meta-4.6.0.ebuild,v 1.1 2011/01/26 20:29:26 alexxy Exp $
-
-EAPI="3"
-inherit kde4-functions
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua ffmpeg kdeprefix"
-
-RDEPEND="
-	$(add_kdebase_dep dragonplayer)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	$(add_kdebase_dep mplayerthumbs)
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
-	$(block_other_slots)
-"
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild
index f8d7d03b68c6..696eec681596 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.1.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-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/kdemultimedia-meta/kdemultimedia-meta-4.6.1.ebuild,v 1.1 2011/03/04 18:00:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.6.2.ebuild,v 1.1 2011/04/06 14:19:30 scarabeus Exp $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua ffmpeg kdeprefix"
+IUSE="ffmpeg"
 
 RDEPEND="
 	$(add_kdebase_dep dragonplayer)
@@ -23,5 +19,4 @@ RDEPEND="
 	$(add_kdebase_dep libkcompactdisc)
 	$(add_kdebase_dep mplayerthumbs)
 	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
-	$(block_other_slots)
 "