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.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 8 insertions, 82 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index acedfcb19013..4b67ad42bd5b 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.91 2011/03/04 18:00:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.92 2011/04/06 14:19:23 scarabeus Exp $
+
+*dolphin-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -dolphin-4.5.5.ebuild,
+  -dolphin-4.6.0.ebuild, -dolphin-4.6.1.ebuild, +dolphin-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *dolphin-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/dolphin/dolphin-4.5.5.ebuild b/kde-base/dolphin/dolphin-4.5.5.ebuild
deleted file mode 100644
index 43cd513528a6..000000000000
--- a/kde-base/dolphin/dolphin-4.5.5.ebuild
+++ /dev/null
@@ -1,40 +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/dolphin-4.5.5.ebuild,v 1.1 2011/01/10 11:53:19 tampakrap Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep libkonq)
-	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-"
-PDEPEND="
-	thumbnail? (
-		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
-		)
-	)
-"
-
-KMLOADLIBS="libkonq"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.6.0.ebuild b/kde-base/dolphin/dolphin-4.6.0.ebuild
deleted file mode 100644
index 4ce2df30e753..000000000000
--- a/kde-base/dolphin/dolphin-4.6.0.ebuild
+++ /dev/null
@@ -1,40 +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/dolphin-4.6.0.ebuild,v 1.1 2011/01/26 20:29:23 alexxy Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep libkonq)
-	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-"
-PDEPEND="
-	thumbnail? (
-		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
-		)
-	)
-"
-
-KMLOADLIBS="libkonq"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.6.1.ebuild b/kde-base/dolphin/dolphin-4.6.2.ebuild
index df67e5ef75c3..779506c62edb 100644
--- a/kde-base/dolphin/dolphin-4.6.1.ebuild
+++ b/kde-base/dolphin/dolphin-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/dolphin-4.6.1.ebuild,v 1.1 2011/03/04 18:00:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.6.2.ebuild,v 1.1 2011/04/06 14:19:23 scarabeus Exp $
 
 EAPI=3