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, 111 deletions

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index 524d69fd8ff2..4468715aec41 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.125 2011/03/26 17:14:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.126 2011/04/06 14:18:54 scarabeus Exp $
+
+*smoke-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -smoke-4.5.5.ebuild,
+  -smoke-4.6.0.ebuild, -smoke-4.6.1.ebuild, +smoke-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> smoke-4.4.5.ebuild,
   smoke-4.4.5-r1.ebuild, smoke-4.5.5.ebuild, smoke-4.6.0.ebuild,
diff --git a/kde-base/smoke/smoke-4.5.5.ebuild b/kde-base/smoke/smoke-4.5.5.ebuild
deleted file mode 100644
index f08597b730bf..000000000000
--- a/kde-base/smoke/smoke-4.5.5.ebuild
+++ /dev/null
@@ -1,52 +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/smoke/smoke-4.5.5.ebuild,v 1.3 2011/03/26 17:14:15 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-MULTIMEDIA_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi attica debug okular +phonon qimageblitz qscintilla qwt semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	attica? ( dev-libs/libattica )
-	okular? ( $(add_kdebase_dep okular) )
-	phonon? ( >=media-libs/phonon-4.3.80 )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRA="generator/"
-
-KMSAVELIBS=1
-
-src_configure() {
-	mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/smoke/smoke-4.6.0.ebuild b/kde-base/smoke/smoke-4.6.0.ebuild
deleted file mode 100644
index 0cbe2d1a950e..000000000000
--- a/kde-base/smoke/smoke-4.6.0.ebuild
+++ /dev/null
@@ -1,56 +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/smoke/smoke-4.6.0.ebuild,v 1.2 2011/03/26 17:14:15 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="kdebindings"
-DECLARATIVE_REQUIRED="optional"
-MULTIMEDIA_REQUIRED="optional"
-QTHELP_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi attica debug kate okular +phonon qimageblitz qscintilla qwt semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	attica? ( dev-libs/libattica )
-	kate? ( $(add_kdebase_dep kate) )
-	okular? ( $(add_kdebase_dep okular) )
-	phonon? ( >=media-libs/phonon-4.4.3 )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRA="generator/"
-
-KMSAVELIBS=1
-
-src_configure() {
-	mycmakeargs=(
-		-DDISABLE_Qt3Support=ON
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with qimageblitz QImageBlitz)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qthelp QtHelp)
-		$(cmake-utils_use_disable qwt)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_disable webkit QtWebKit)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/smoke/smoke-4.6.1.ebuild b/kde-base/smoke/smoke-4.6.2.ebuild
index 386654689d8a..f402668aa67f 100644
--- a/kde-base/smoke/smoke-4.6.1.ebuild
+++ b/kde-base/smoke/smoke-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/smoke/smoke-4.6.1.ebuild,v 1.2 2011/03/26 17:14:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.6.2.ebuild,v 1.1 2011/04/06 14:18:54 scarabeus Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="akonadi attica debug kate okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="