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, 10 insertions, 217 deletions

diff --git a/kde-base/kdebindings-ruby/ChangeLog b/kde-base/kdebindings-ruby/ChangeLog
index bd355e69f9e6..028575f49608 100644
--- a/kde-base/kdebindings-ruby/ChangeLog
+++ b/kde-base/kdebindings-ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebindings-ruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.33 2011/03/04 18:00:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.34 2011/04/06 14:19:12 scarabeus Exp $
+
+*kdebindings-ruby-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdebindings-ruby-4.5.5.ebuild, -kdebindings-ruby-4.6.0.ebuild,
+  -kdebindings-ruby-4.6.1.ebuild, +kdebindings-ruby-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *kdebindings-ruby-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild
deleted file mode 100644
index 14fefff39f13..000000000000
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild
+++ /dev/null
@@ -1,91 +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/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild,v 1.2 2011/01/30 13:09:48 tampakrap Exp $
-
-EAPI=3
-
-KMNAME="kdebindings"
-KMMODULE="ruby"
-WEBKIT_REQUIRED="optional"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
-"
-
-ruby_add_bdepend dev-ruby/rubygems
-
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-# Merged with kdebindings-ruby after 4.4.80
-add_blocker krossruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e "s#smoke/smoke.h#smoke.h#" \
-		ruby/qtruby/src/handlers.cpp \
-		ruby/qtruby/src/marshall.h \
-		ruby/qtruby/src/marshall_types.h \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/qtruby/src/qtruby.h \
-		ruby/qtruby/src/smokeruby.h || die
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt 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
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.1.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.1.ebuild
deleted file mode 100644
index 4e1dc25fed97..000000000000
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.1.ebuild
+++ /dev/null
@@ -1,123 +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/kdebindings-ruby/kdebindings-ruby-4.6.1.ebuild,v 1.1 2011/03/04 18:00:09 alexxy Exp $
-
-EAPI=3
-
-KMNAME="kdebindings"
-KMMODULE="ruby"
-DECLARATIVE_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-
-USE_RUBY="ruby18"
-# No ruby19 for three reasons:
-# 1) it does not build (yet) - will likely be solved soon
-# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
-# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-inherit kde4-meta ruby-ng
-
-DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
-"
-
-ruby_add_bdepend dev-ruby/rubygems
-
-RDEPEND="${DEPEND}
-	!dev-ruby/qt4-qtruby
-"
-
-# Merged with kdebindings-ruby after 4.4.80
-add_blocker krossruby
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	kde4-meta_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
-}
-
-all_ruby_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e "s#smoke/smoke.h#smoke.h#" \
-		ruby/qtruby/src/handlers.cpp \
-		ruby/qtruby/src/marshall.h \
-		ruby/qtruby/src/marshall_types.h \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/qtruby/src/qtruby.h \
-		ruby/qtruby/src/smokeruby.h || die
-
-	sed -i -e "s#include <smoke/qt/#include <smoke/#" -e "s#include <smoke/kde/#include <smoke/#" \
-		ruby/qtruby/src/Qt.cpp \
-		ruby/qtruby/src/marshall_types.cpp \
-		ruby/qtruby/modules/phonon/phonon.cpp \
-		ruby/qtruby/modules/qscintilla/qscintilla.cpp \
-		ruby/qtruby/modules/qtdeclarative/qtdeclarative.cpp \
-		ruby/qtruby/modules/qtuitools/qtuitools.cpp \
-		ruby/qtruby/modules/qtscript/qtscript.cpp \
-		ruby/qtruby/modules/qwt/qwt.cpp	\
-		ruby/qtruby/modules/qttest/qttest.cpp \
-		ruby/qtruby/modules/qtwebkit/qtwebkit.cpp \
-		ruby/qtruby/src/qtruby.cpp \
-		ruby/korundum/src/Korundum.cpp \
-		ruby/korundum/modules/soprano/soprano.cpp \
-		ruby/korundum/modules/akonadi/akonadi.cpp \
-		ruby/korundum/modules/kate/kate.cpp \
-		ruby/korundum/modules/khtml/khtml.cpp \
-		ruby/korundum/modules/kio/kio.cpp \
-		ruby/korundum/modules/ktexteditor/ktexteditor.cpp \
-		ruby/korundum/modules/okular/okular.cpp \
-		ruby/korundum/modules/solid/solid.cpp \
-		ruby/korundum/modules/nepomuk/nepomuk.cpp \
-		ruby/korundum/modules/plasma/src/plasma.cpp \
-		ruby/korundum/modules/plasma/src/plasmahandlers.cpp \
-		ruby/korundum/modules/nepomuk/nepomukhandlers.cpp || die
-
-	echo 'target_link_libraries(rubyqtdeclarative ${QT_QTDECLARATIVE_LIBRARY})' >> \
-		ruby/qtruby/modules/qtdeclarative/CMakeLists.txt || die
-}
-
-each_ruby_configure() {
-	CMAKE_USE_DIR=${S}
-	mycmakeargs=(
-		-DRUBY_LIBRARY=$(ruby_get_libruby)
-		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
-		-DRUBY_EXECUTABLE=${RUBY}
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable kate)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with qwt 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
-}
-
-each_ruby_compile() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_compile
-}
-
-each_ruby_install() {
-	CMAKE_USE_DIR=${S}
-	kde4-meta_src_install
-}
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.2.ebuild
index e8e18c3d6b0b..3209b33f96e0 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-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/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild,v 1.6 2011/02/10 08:28:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.2.ebuild,v 1.1 2011/04/06 14:19:12 scarabeus Exp $
 
 EAPI=3
 
@@ -19,7 +19,7 @@ USE_RUBY="ruby18"
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="