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, 8 insertions, 82 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 097b5a3e3630..15842ef01ce1 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.95 2011/03/27 17:29:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.96 2011/04/06 14:19:08 scarabeus Exp $
+
+*solid-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -solid-4.5.5.ebuild,
+  -solid-4.6.0.ebuild, -solid-4.6.1.ebuild, +solid-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
   27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Move USE="hal" description here from use.desc.
diff --git a/kde-base/solid/solid-4.5.5.ebuild b/kde-base/solid/solid-4.5.5.ebuild
deleted file mode 100644
index d30c279643fb..000000000000
--- a/kde-base/solid/solid-4.5.5.ebuild
+++ /dev/null
@@ -1,44 +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/solid/solid-4.5.5.ebuild,v 1.1 2011/01/10 11:53:49 tampakrap Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug +hal networkmanager wicd"
-
-# solid/CMakeLists.txt has an add_subdirectory statement that depends on
-# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
-# for now.
-DEPEND="
-	bluetooth? ( net-wireless/bluez )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep solid-runtime)
-	hal? ( sys-apps/hal )
-"
-
-KMEXTRA="
-	libs/solid/
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.69-darwin-compile-powermanager.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with bluetooth BlueZ)
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/solid/solid-4.6.0.ebuild b/kde-base/solid/solid-4.6.0.ebuild
deleted file mode 100644
index 8e7d0b4763b0..000000000000
--- a/kde-base/solid/solid-4.6.0.ebuild
+++ /dev/null
@@ -1,36 +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/solid/solid-4.6.0.ebuild,v 1.2 2011/02/02 11:25:09 scarabeus Exp $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug bluetooth networkmanager wicd"
-
-DEPEND="
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep solid-runtime)
-"
-
-PDEPEND="bluetooth? ( net-wireless/bluedevil )"
-
-KMEXTRA="
-	libs/solid/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/solid/solid-4.6.1.ebuild b/kde-base/solid/solid-4.6.2.ebuild
index a353e129dda3..b00a0c51d54f 100644
--- a/kde-base/solid/solid-4.6.1.ebuild
+++ b/kde-base/solid/solid-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/solid/solid-4.6.1.ebuild,v 1.1 2011/03/04 17:59:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.6.2.ebuild,v 1.1 2011/04/06 14:19:08 scarabeus Exp $
 
 EAPI=3