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, 9 insertions, 77 deletions

diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index b988cc93a203..b7897265bfe7 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.174 2011/03/04 18:00:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.175 2011/04/06 14:19:11 scarabeus Exp $
+
+*kscreensaver-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kscreensaver-4.5.5.ebuild, -kscreensaver-4.6.0.ebuild,
+  -kscreensaver-4.6.1.ebuild, +kscreensaver-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kscreensaver-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kscreensaver/kscreensaver-4.5.5.ebuild b/kde-base/kscreensaver/kscreensaver-4.5.5.ebuild
deleted file mode 100644
index ea1abf7331f4..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.5.5.ebuild
+++ /dev/null
@@ -1,37 +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/kscreensaver/kscreensaver-4.5.5.ebuild,v 1.1 2011/01/10 11:53:40 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep kcheckpass)
-	>=x11-libs/libxklavier-3.2
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	pam? ( >=kde-base/kdebase-pam-7 )
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
-
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/kscreensaver-4.6.0.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.0.ebuild
deleted file mode 100644
index c17c7d2a5f69..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.6.0.ebuild
+++ /dev/null
@@ -1,38 +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/kscreensaver/kscreensaver-4.6.0.ebuild,v 1.1 2011/01/26 20:29:24 alexxy Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep kcheckpass)
-	>=x11-libs/libxklavier-3.2
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXtst
-	opengl? ( virtual/opengl )
-	pam? ( >=kde-base/kdebase-pam-7 )
-"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-"
-
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/kscreensaver-4.6.1.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.2.ebuild
index 48e72d230d92..07c49d2e672e 100644
--- a/kde-base/kscreensaver/kscreensaver-4.6.1.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-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/kscreensaver/kscreensaver-4.6.1.ebuild,v 1.1 2011/03/04 18:00:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.6.2.ebuild,v 1.1 2011/04/06 14:19:11 scarabeus Exp $
 
 EAPI=3