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

diff --git a/kde-base/dolphin-plugins/ChangeLog b/kde-base/dolphin-plugins/ChangeLog
index 191429030530..f8ace8f33f93 100644
--- a/kde-base/dolphin-plugins/ChangeLog
+++ b/kde-base/dolphin-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/dolphin-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.10 2011/03/04 18:00:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/ChangeLog,v 1.11 2011/04/06 14:18:53 scarabeus Exp $
+
+*dolphin-plugins-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -dolphin-plugins-4.5.5.ebuild, -dolphin-plugins-4.6.0.ebuild,
+  -dolphin-plugins-4.6.1.ebuild, +dolphin-plugins-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *dolphin-plugins-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.5.5.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.5.5.ebuild
deleted file mode 100644
index f4e3ac9b8c5d..000000000000
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.5.5.ebuild
+++ /dev/null
@@ -1,26 +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/dolphin-plugins/dolphin-plugins-4.5.5.ebuild,v 1.1 2011/01/10 11:53:20 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	dev-vcs/subversion
-	$(add_kdebase_dep kompare)
-"
-
-# SCM plugins moved from dolphin somewhere before 4.4.75
-add_blocker dolphin '<4.4.75'
-
-KMLOADLIBS="libkonq"
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.6.0.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.6.0.ebuild
deleted file mode 100644
index 73ac54affe8f..000000000000
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.6.0.ebuild
+++ /dev/null
@@ -1,39 +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/dolphin-plugins/dolphin-plugins-4.6.0.ebuild,v 1.1 2011/01/26 20:28:42 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdesdk"
-inherit kde4-meta
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +git +subversion"
-
-DEPEND="
-	$(add_kdebase_dep libkonq)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kompare)
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-# SCM plugins moved from dolphin somewhere before 4.4.75
-add_blocker dolphin '<4.4.75'
-
-KMLOADLIBS="libkonq"
-
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	( ! use git && ! use subversion ) || kde4-meta_src_install
-}
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.6.1.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.6.2.ebuild
index c88d9fcd46ee..5d6f42eea6f6 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.6.1.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-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/dolphin-plugins/dolphin-plugins-4.6.1.ebuild,v 1.1 2011/03/04 18:00:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.6.2.ebuild,v 1.1 2011/04/06 14:18:53 scarabeus Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ KMNAME="kdesdk"
 inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +git +subversion"
 
 DEPEND="