commit: 6473f642fd0bab0436b3599a28dc7db2bbaa50e2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Tue Dec 9 16:43:01 2014 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Dec 9 16:43:09 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6473f642
[kde-base/smokeqt] Solve automagic dependencies wrt bug #523172. Package-Manager: portage-2.2.15 --- kde-base/smokeqt/metadata.xml | 9 +++++---- kde-base/smokeqt/smokeqt-9999.ebuild | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kde-base/smokeqt/metadata.xml b/kde-base/smokeqt/metadata.xml index 77fdc5b..5a099b5 100644 --- a/kde-base/smokeqt/metadata.xml +++ b/kde-base/smokeqt/metadata.xml @@ -3,13 +3,14 @@ <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="declarative">Compile bindings for <pkg>dev-qt/qtdeclarative</pkg>.</flag> + <flag name="multimedia">Compile bindings for <pkg>dev-qt/qtmultimedia</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="qthelp">Compile bindings for QtHelp from <pkg>dev-qt/qthelp</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> + <flag name="webkit">Compile bindings for <pkg>dev-qt/qtwebkit</pkg>.</flag> + <flag name="xmlpatterns">Compile bindings for <pkg>dev-qt/qtxmlpatterns</pkg>.</flag> </use> </pkgmetadata> diff --git a/kde-base/smokeqt/smokeqt-9999.ebuild b/kde-base/smokeqt/smokeqt-9999.ebuild index 536ca13..25022b2 100644 --- a/kde-base/smokeqt/smokeqt-9999.ebuild +++ b/kde-base/smokeqt/smokeqt-9999.ebuild @@ -14,7 +14,7 @@ inherit kde4-base DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings" KEYWORDS="" -IUSE="debug +phonon qimageblitz qscintilla qwt webkit" +IUSE="debug +phonon qimageblitz qscintilla qwt webkit xmlpatterns" HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke" # Maybe make more of Qt optional? @@ -33,6 +33,7 @@ DEPEND=" qscintilla? ( x11-libs/qscintilla:= ) qwt? ( x11-libs/qwt:5[svg] ) webkit? ( dev-qt/qtwebkit:4 ) + xmlpatterns? ( dev-qt/qtxmlpatterns:4 ) " RDEPEND="${DEPEND}" @@ -47,8 +48,9 @@ src_configure() { $(cmake-utils_use_with qimageblitz QImageBlitz) $(cmake-utils_use_with qscintilla QScintilla) $(cmake-utils_use_disable qthelp QtHelp) - $(cmake-utils_use_disable qwt Qwt5) + $(cmake-utils_use_with qwt Qwt5) $(cmake-utils_use_disable webkit QtWebKit) + $(cmake-utils_use_disable xmlpatterns QtXmlPatterns) ) kde4-base_src_configure }