commit: bee37d8a95c708e273b20f8f400ffeb7373c4f85
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 21:14:12 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 14:36:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bee37d8a
kde-apps/konqueror: Add konq-plugins dependencies, USE=activities
Package-Manager: portage-2.3.0
kde-apps/konqueror/konqueror-9999.ebuild | 27 ++++++++++++++++++---------
kde-apps/konqueror/metadata.xml | 6 ++++--
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild
b/kde-apps/konqueror/konqueror-9999.ebuild
index cb3ab5c..2b08513 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -15,11 +15,11 @@ HOMEPAGE="
https://konqueror.org/
"
KEYWORDS=""
-IUSE="X"
+IUSE="activities speech tidy X"
# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
+RESTRICT+=" test"
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
@@ -30,7 +30,9 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kded)
$(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
@@ -47,11 +49,18 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ speech? ( $(add_qt_dep qtspeech) )
+ tidy? ( app-text/htmltidy )
X? ( $(add_qt_dep qtx11extras) )
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kfind)
+ $(add_plasma_dep kde-cli-tools)
!kde-apps/kfmclient:4
+ !kde-apps/konq-plugins
"
S="${S}/${PN}"
@@ -59,14 +68,14 @@ S="${S}/${PN}"
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
- mv ../doc/${PN} "${S}"/doc || die
- echo "add_subdirectory( doc )" >> CMakeLists.txt || die
-
kde5_src_prepare
}
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_find_package activities KF5Activities)
+ $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+ $(cmake-utils_use_find_package tidy LibTidy)
$(cmake-utils_use_find_package X X11)
)
kde5_src_configure
@@ -76,7 +85,7 @@ pkg_postinst() {
kde5_pkg_postinst
if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
- elog "For bookmarks support, install the keditbookmarks:"
+ elog "For bookmarks support, install keditbookmarks:"
elog "kde-apps/keditbookmarks:${SLOT}"
fi
@@ -87,7 +96,7 @@ pkg_postinst() {
if ! has_version kde-apps/svg:${SLOT} ; then
elog "For konqueror to view SVGs, install the svg kpart:"
- elog "kde-apps/svg:${SLOT}"
+ elog "kde-apps/svgpart:${SLOT}"
fi
if ! has_version virtual/jre ; then
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 146bea6..e16d08a 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -6,7 +6,9 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="bookmarks">Add dependency on bookmark
package.</flag>
- <flag name="filemanager">Install the dolphin kpart for use as a
file manager.</flag>
+ <flag name="activities">Enable kactivities support</flag>
+ <flag name="bookmarks">Add dependency on bookmark package</flag>
+ <flag name="filemanager">Build the dolphin kpart for use as a
file manager</flag>
+ <flag name="speech">Build text-to-speech plugin</flag>
</use>
</pkgmetadata>
