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

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 40 insertions, 7 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/Manifest b/kde-base/kdebindings-ruby/Manifest
index 2f8e61504e62..1477812f37ed 100644
--- a/kde-base/kdebindings-ruby/Manifest
+++ b/kde-base/kdebindings-ruby/Manifest
@@ -4,6 +4,6 @@ DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf95
 DIST kdebindings-4.6.0.tar.bz2 7077714 RMD160 7f58d14cfa93b72a3201b143d78d4fc7ba8b404d SHA1 a2d641bbee7fddfbd76652fb41cd784d8c92288c SHA256 cf8e9fa0df35b15f768f4ccb4ee9f55b2a4c3e096608312c1c2936e5f3dbeff5
 EBUILD kdebindings-ruby-4.4.5.ebuild 2200 RMD160 9bf3b12f1828020a5247df98ff43781d5dc2fa17 SHA1 42eeb03c5cb44382f9840c20d2ffb7f3f5f6f914 SHA256 9d7a2d3e60191fe302469df664d7a16602e2ddacbe51415dabc2eeb4cc4eb21f
 EBUILD kdebindings-ruby-4.5.5.ebuild 2308 RMD160 4ef2fdd7f1801d7b4eb6cf9801a01c79c3eb4efd SHA1 14d72a03c6613031ceb7de7526395bbf349cb2cd SHA256 9ab5448c4856b6b5599cce1204038b7db0a128ac717821090e5cf3735fbc3934
-EBUILD kdebindings-ruby-4.6.0.ebuild 2379 RMD160 87fa6dd377285a3b8de53e671a4c43247cef5ac8 SHA1 4a84ee9a097892acfde26126980395a7738e7453 SHA256 8129cae58ad73ecb54cda0d51a50d0fcf403090f5b27736933943a85ad3fc74b
-MISC ChangeLog 4329 RMD160 1e3d8ebb178f6a419554cd8afa69340cff562a91 SHA1 f1fda46c5c6d3a791720a504bf2753107983861b SHA256 87267142769f2f37859e6d98b627f6b452d7c3c46556aea0e2f20ad016e025d7
-MISC metadata.xml 734 RMD160 4354992a8c9480e53f75bc4eb02f4823659c99d3 SHA1 f5b67b71eee52afed5fbfaba57de2afd68ff1631 SHA256 be7c2f5f31466fcb6aa63d96cf32259b1f1b9290bf3b519434987aaf49861059
+EBUILD kdebindings-ruby-4.6.0.ebuild 3623 RMD160 d52b5dcddf2e5f88126967a6f7753a8534ffb18f SHA1 b9eb9c50e7438e559dff74603aeadf235ecfa337 SHA256 7095c1ce518d2d94ec383a3c5e12f43d687dc7aa301be4b0ae3147ac20177f92
+MISC ChangeLog 4537 RMD160 61552f031ca084355819ebda29da9d18f060cccc SHA1 3613a0d7bff8f2cb9e207dc324eb25db122fa857 SHA256 45e5934db39ab02977e5bf982dea086ce1047f428cc71037edc94c1280dbf479
+MISC metadata.xml 824 RMD160 e0f4c2f6839966b3cb27a9366af5b4bed34efdb8 SHA1 a064dd6a83051fd2c78f78657be856fc77a0abf7 SHA256 47ce246de6c9f8a1f7f4be7a4afe4c68bc0a431c059a0a4596f1df8dc1228c68
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>