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, 16 insertions, 69 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 88fae00a7468..c68fef72cef4 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.185 2011/03/04 18:00:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.186 2011/04/06 14:19:24 scarabeus Exp $
+
+*konsole-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -konsole-4.5.5.ebuild,
+  -konsole-4.6.0.ebuild, -konsole-4.6.1.ebuild, +konsole-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *konsole-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/konsole/konsole-4.5.5.ebuild b/kde-base/konsole/konsole-4.5.5.ebuild
deleted file mode 100644
index f5132f00e1cd..000000000000
--- a/kde-base/konsole/konsole-4.5.5.ebuild
+++ /dev/null
@@ -1,35 +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/konsole/konsole-4.5.5.ebuild,v 1.1 2011/01/10 11:53:38 tampakrap Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMONDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libxklavier-3.2
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-apps/bdftopcf
-		x11-proto/kbproto
-		x11-proto/renderproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-remember-size.patch"
-)
diff --git a/kde-base/konsole/konsole-4.6.0.ebuild b/kde-base/konsole/konsole-4.6.0.ebuild
deleted file mode 100644
index f86cbbccafb8..000000000000
--- a/kde-base/konsole/konsole-4.6.0.ebuild
+++ /dev/null
@@ -1,31 +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/konsole/konsole-4.6.0.ebuild,v 1.1 2011/01/26 20:28:34 alexxy Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-COMMONDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libxklavier-3.2
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? (
-		x11-apps/bdftopcf
-		x11-proto/kbproto
-		x11-proto/renderproto
-	)
-"
-RDEPEND="${COMMONDEPEND}"
diff --git a/kde-base/konsole/konsole-4.6.1.ebuild b/kde-base/konsole/konsole-4.6.2.ebuild
index b2d5b07bf500..8d76aebbbe76 100644
--- a/kde-base/konsole/konsole-4.6.1.ebuild
+++ b/kde-base/konsole/konsole-4.6.2.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.6.1.ebuild,v 1.1 2011/03/04 18:00:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.6.2.ebuild,v 1.1 2011/04/06 14:19:24 scarabeus Exp $
 
 EAPI=3
 
 KDE_HANDBOOK="optional"
 KMNAME="kdebase-apps"
-inherit kde4-meta
+EGIT_REPONAME="konsole"
+KDE_SCM="git"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit kde4-base
+else
+	inherit kde4-meta
+fi
 
 DESCRIPTION="X terminal for use with KDE."
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"