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

diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index 3b96ce686dca..84b62933ea2d 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.179 2011/03/04 18:00:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.180 2011/04/06 14:19:26 scarabeus Exp $
+
+*kdeartwork-kscreensaver-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdeartwork-kscreensaver-4.5.5.ebuild, -kdeartwork-kscreensaver-4.6.0.ebuild,
+  -kdeartwork-kscreensaver-4.6.1.ebuild, +kdeartwork-kscreensaver-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kdeartwork-kscreensaver-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.5.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.5.ebuild
deleted file mode 100644
index ba24dff2f9bf..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.5.ebuild
+++ /dev/null
@@ -1,47 +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/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.5.ebuild,v 1.1 2011/01/10 11:53:25 tampakrap Exp $
-
-EAPI="3"
-
-KMMODULE="kscreensaver"
-KMNAME="kdeartwork"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +eigen opengl xscreensaver"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-RDEPEND="
-	$(add_kdebase_dep kscreensaver 'opengl?')
-	$(add_kdebase_dep libkworkspace)
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )
-"
-DEPEND="${RDEPEND}
-	eigen? ( dev-cpp/eigen:2 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
-
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DKSCREENSAVER_SOUND_SUPPORT=ON
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xscreensaver)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.0.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.0.ebuild
deleted file mode 100644
index 10d9a6ee614e..000000000000
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.0.ebuild
+++ /dev/null
@@ -1,48 +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/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.0.ebuild,v 1.1 2011/01/26 20:29:09 alexxy Exp $
-
-EAPI="3"
-
-KMMODULE="kscreensaver"
-KMNAME="kdeartwork"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +eigen opengl xscreensaver"
-
-# libkworkspace - only as a stub to provide KDE4Workspace config
-RDEPEND="
-	$(add_kdebase_dep kscreensaver 'opengl?')
-	$(add_kdebase_dep libkworkspace)
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )
-"
-DEPEND="${RDEPEND}
-	eigen? ( dev-cpp/eigen:2 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
-	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
-
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DKSCREENSAVER_SOUND_SUPPORT=ON
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xscreensaver)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.2.ebuild
index faa6a92942ad..d1830e709edf 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-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/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.1.ebuild,v 1.1 2011/03/04 18:00:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.2.ebuild,v 1.1 2011/04/06 14:19:26 scarabeus Exp $
 
 EAPI=3