[kde-base/kdebindings-perl:4.6,smoke:4.6] Add QtHelp and QtDeclarative support

6 files changed, 15 insertions, 6 deletions

diff --git a/kde-base/kdebindings-perl/Manifest b/kde-base/kdebindings-perl/Manifest
index 27cbba453ca..9116a51f544 100644
--- a/kde-base/kdebindings-perl/Manifest
+++ b/kde-base/kdebindings-perl/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebindings-perl-4.5.9999.ebuild 433 RMD160 1874c7625f160552bd2beb287af88e368bcdd22c SHA1 82496a140f41df8714b09b3f1df716da6c1f4668 SHA256 0c55e596ce9bc4104ecf28a6d61f32439bf6a8f5b110d069c31b782a336908dd
-EBUILD kdebindings-perl-9999.ebuild 611 RMD160 6124d5e40ed4f495964eddb931f0d787e0a851f1 SHA1 faf38d80cfd626551ab045c6d84107a686e641b7 SHA256 adbdea67f6d68fb8f60a12a6e74906515517a119f014366815d7d0bf1413a2c7
-MISC metadata.xml 400 RMD160 c7f85d9947e59564f62d7ef8af50fdc85850eddb SHA1 c30278c925b20ac00ef50647aee2e96b4a7cc5d4 SHA256 79f6346722ea0e1542111a5d063d09a876ba24bcdc5621abe90c9f24dac82029
+EBUILD kdebindings-perl-9999.ebuild 789 RMD160 347a71c8bdbdda7e47588506bcdfb7cf9569a9b3 SHA1 083070c925827be8650a33d620090100fe400982 SHA256 978b0980c15d090c45017d600a9775f569c039671c18af9b76e836ea30c4ed4d
+MISC metadata.xml 585 RMD160 54605f40053ffe2e8a87171cfdc25c65c4e5d5c9 SHA1 658eceeade5581dfe5abf4244c41c4b730642d5f SHA256 51d4258087aa8741cc02f57b76f60008dc647f24b0dab55434881377787bb496
diff --git a/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild b/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
index f2962f0af08..3f17aef5bf7 100644
--- a/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
+++ b/kde-base/kdebindings-perl/kdebindings-perl-9999.ebuild
@@ -6,7 +6,9 @@ EAPI="2"
 
 KMNAME="kdebindings"
 KMMODULE="perl"
+DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
@@ -16,14 +18,16 @@ IUSE="debug plasma"
 
 DEPEND="
 	>=dev-lang/perl-5.10.1
-	$(add_kdebase_dep smoke 'multimedia?,webkit?')
+	$(add_kdebase_dep smoke 'declarative?,multimedia?,qthelp?,webkit?')
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_disable declarative QtDeclarative)
 		$(cmake-utils_use_disable multimedia QtMultimedia)
 		$(cmake-utils_use_disable plasma)
+		$(cmake-utils_use_disable qthelp QtHelp)
 		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
diff --git a/kde-base/kdebindings-perl/metadata.xml b/kde-base/kdebindings-perl/metadata.xml
index 72cc5b8b6a7..9eeed746bbc 100644
--- a/kde-base/kdebindings-perl/metadata.xml
+++ b/kde-base/kdebindings-perl/metadata.xml
@@ -3,8 +3,10 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
+	<flag name="declarative">Compile bindings for <pkg>x11-libs/qt-declarative</pkg>.</flag>
 	<flag name="multimedia">Compile bindings for <pkg>x11-libs/qt-multimedia</pkg>.</flag>
 	<flag name="plasma">Compile bindings for KDE's Plasma.</flag>
+	<flag name="qthelp">Compile bindings for QtHelp from <pkg>x11-libs/qt-assistant</pkg>.</flag>
 	<flag name="webkit">Compile bindings for <pkg>x11-libs/qt-webkit</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 7099e99a171..34aae0af8a3 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,4 +1,4 @@
 EBUILD smoke-4.4.9999.ebuild 1457 RMD160 f9e0fa681e4f3b43e3088c60ceedcbfcc2fe3f17 SHA1 f22529917cece17030df2ddda31bc338b6ee9aea SHA256 e73cd15601807cd3bbf932626df47fcece7ca7b58941bfdc82af46b62dea5f73
 EBUILD smoke-4.5.9999.ebuild 1378 RMD160 9143085cd06f6d68c7dc3d28c637e1bb6a9adde9 SHA1 e68e1d24c0f8847f03b3b13363bbb868be9b056b SHA256 9f5b027976e7947097eaeefd5f020aad986f855600e0633c3ae90f306c8445bf
-EBUILD smoke-9999.ebuild 1539 RMD160 97a252d3b45d399723ecf0767d664feb34db6852 SHA1 0a7e4a1e1161d0627293bdc00664202800db1e6d SHA256 e5f283b652101cff4259c95e057fa4bf793a6b2b712b67e3e5690a7f496738f3
-MISC metadata.xml 1017 RMD160 32e1179c188833a30651875dd55c4a343bedd939 SHA1 b67c1500b016f340998f3a0c0187b957eed1635e SHA256 760ed2191b0c7c1fd1f5ec53d30780cc1e06d2c4b9549405f13f826d8968f60d
+EBUILD smoke-9999.ebuild 1609 RMD160 df43850147112da8f6a95d8439d791da996f3dbc SHA1 b277dd71e66b8746d0759f3b2afd89ad16a52da9 SHA256 c21661a12a55d010a48a5d77e953f25c08d122be53b1ce8c3751312c84eb443a
+MISC metadata.xml 1113 RMD160 3d61e1c1502a06cea4ee9c82654833261cfd3767 SHA1 60a2e9952d4a074c766fa2e9cadeb3f9d0f41712 SHA256 8d460ad3997a166b5d6fdd6a345029ff22ce83a4638af2d794269196cfd85fd2
diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index 6463a8ddc53..068c352fc03 100644
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/metadata.xml
@@ -5,13 +5,14 @@
 <use>
 	<flag name="attica">Compile bindings for <pkg>dev-libs/libattica</pkg>.</flag>
 	<flag name="akonadi">Compile bindings for Akonadi.</flag>
-	<flag name="declarative">Compile bindings for <pkg>x11-libs/qt-declarative</pkg></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="multimedia">Compile bindings for <pkg>x11-libs/qt-multimedia</pkg>.</flag>
 	<flag name="okular">Compile bindings for <pkg>kde-base/okular</pkg>.</flag>
 	<flag name="phonon">Compile bindings for Phonon.</flag>
 	<flag name="qimageblitz">Compile bindings for <pkg>media-libs/qimageblitz</pkg>.</flag>
 	<flag name="qscintilla">Compile bindings for <pkg>x11-libs/qscintilla</pkg>.</flag>
+	<flag name="qthelp">Compile bindings for QtHelp from <pkg>x11-libs/qt-assistant</pkg>.</flag>
 	<flag name="qwt">Compile bindings for <pkg>x11-libs/qwt</pkg>.</flag>
 	<flag name="webkit">Compile bindings for <pkg>x11-libs/qt-webkit</pkg>.</flag>
 </use>
diff --git a/kde-base/smoke/smoke-9999.ebuild b/kde-base/smoke/smoke-9999.ebuild
index fb964e04440..638e593342d 100644
--- a/kde-base/smoke/smoke-9999.ebuild
+++ b/kde-base/smoke/smoke-9999.ebuild
@@ -7,6 +7,7 @@ EAPI="3"
 KMNAME="kdebindings"
 DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
@@ -42,6 +43,7 @@ src_configure() {
 		$(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_with qwt Qwt)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)