Fix build, it was searching for smoke headers in wrong locations. Also, fix the declarative automagic. bug 353538

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 37 insertions, 4 deletions

diff --git a/kde-base/kdebindings-ruby/ChangeLog b/kde-base/kdebindings-ruby/ChangeLog
index 3516d72b471a..9326e859c76d 100644
--- a/kde-base/kdebindings-ruby/ChangeLog
+++ b/kde-base/kdebindings-ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2011/01/30 13:09:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/ChangeLog,v 1.30 2011/02/03 10:27:44 tampakrap Exp $
+
+  03 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  kdebindings-ruby-4.6.0.ebuild:
+  Fix build, it was searching for smoke headers in wrong locations. Also, fix
+  the declarative automagic. bug 353538
 
   30 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   kdebindings-ruby-4.4.5.ebuild, kdebindings-ruby-4.5.5.ebuild,
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild
index 49521dbee6a3..34596eff210a 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.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.2 2011/01/30 13:09:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild,v 1.3 2011/02/03 10:27:44 tampakrap Exp $
 
 EAPI=3
 
@@ -19,11 +19,11 @@ inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi debug kate okular phonon plasma qscintilla qwt semantic-desktop"
+IUSE="akonadi debug declarative kate okular phonon plasma qscintilla qwt semantic-desktop"
 
 # TODO add qt-declarative
 DEPEND="
-	$(add_kdebase_dep smoke 'akonadi?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,declarative?,kate?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?,webkit?')
 "
 
 ruby_add_bdepend dev-ruby/rubygems
@@ -59,6 +59,32 @@ all_ruby_prepare() {
 		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/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/khtml/khtml.cpp \
+		ruby/korundum/modules/kio/kio.cpp \
+		ruby/korundum/modules/ktexteditor/ktexteditor.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() {
@@ -69,6 +95,7 @@ each_ruby_configure() {
 		-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)
diff --git a/kde-base/kdebindings-ruby/metadata.xml b/kde-base/kdebindings-ruby/metadata.xml
index e42966f13e07..03c04060837c 100644
--- a/kde-base/kdebindings-ruby/metadata.xml
+++ b/kde-base/kdebindings-ruby/metadata.xml
@@ -4,6 +4,7 @@
 <herd>kde</herd>
 <use>
 	<flag name="akonadi">Compile bindings for Akonadi.</flag>
+	<flag name="declarative">Compile bindings for <pkg>x11-libs/qt-declarative</pkg>.</flag>
 	<flag name="kate">Compile bindings for KDE Advanced Text Editor.</flag>
 	<flag name="okular">Compile bindings for <pkg>kde-base/okular</pkg>.</flag>
 	<flag name="phonon">Compile bindings for Phonon.</flag>