| 1 |
commit: bee37d8a95c708e273b20f8f400ffeb7373c4f85 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 18 21:14:12 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 21 14:36:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bee37d8a |
| 7 |
|
| 8 |
kde-apps/konqueror: Add konq-plugins dependencies, USE=activities |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
kde-apps/konqueror/konqueror-9999.ebuild | 27 ++++++++++++++++++--------- |
| 13 |
kde-apps/konqueror/metadata.xml | 6 ++++-- |
| 14 |
2 files changed, 22 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
| 17 |
index cb3ab5c..2b08513 100644 |
| 18 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
| 19 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
| 20 |
@@ -15,11 +15,11 @@ HOMEPAGE=" |
| 21 |
https://konqueror.org/ |
| 22 |
" |
| 23 |
KEYWORDS="" |
| 24 |
-IUSE="X" |
| 25 |
+IUSE="activities speech tidy X" |
| 26 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
| 27 |
-RESTRICT="test" |
| 28 |
+RESTRICT+=" test" |
| 29 |
|
| 30 |
-DEPEND=" |
| 31 |
+COMMON_DEPEND=" |
| 32 |
$(add_frameworks_dep karchive) |
| 33 |
$(add_frameworks_dep kbookmarks) |
| 34 |
$(add_frameworks_dep kcmutils) |
| 35 |
@@ -30,7 +30,9 @@ DEPEND=" |
| 36 |
$(add_frameworks_dep kcoreaddons) |
| 37 |
$(add_frameworks_dep kcrash) |
| 38 |
$(add_frameworks_dep kdbusaddons) |
| 39 |
+ $(add_frameworks_dep kded) |
| 40 |
$(add_frameworks_dep kdelibs4support) |
| 41 |
+ $(add_frameworks_dep kdesu) |
| 42 |
$(add_frameworks_dep khtml) |
| 43 |
$(add_frameworks_dep ki18n) |
| 44 |
$(add_frameworks_dep kiconthemes) |
| 45 |
@@ -47,11 +49,18 @@ DEPEND=" |
| 46 |
$(add_qt_dep qtgui) |
| 47 |
$(add_qt_dep qtwidgets) |
| 48 |
$(add_qt_dep qtxml) |
| 49 |
+ speech? ( $(add_qt_dep qtspeech) ) |
| 50 |
+ tidy? ( app-text/htmltidy ) |
| 51 |
X? ( $(add_qt_dep qtx11extras) ) |
| 52 |
" |
| 53 |
-RDEPEND="${DEPEND} |
| 54 |
+DEPEND="${COMMON_DEPEND} |
| 55 |
+ activities? ( $(add_frameworks_dep kactivities) ) |
| 56 |
+" |
| 57 |
+RDEPEND="${COMMON_DEPEND} |
| 58 |
$(add_kdeapps_dep kfind) |
| 59 |
+ $(add_plasma_dep kde-cli-tools) |
| 60 |
!kde-apps/kfmclient:4 |
| 61 |
+ !kde-apps/konq-plugins |
| 62 |
" |
| 63 |
|
| 64 |
S="${S}/${PN}" |
| 65 |
@@ -59,14 +68,14 @@ S="${S}/${PN}" |
| 66 |
src_prepare() { |
| 67 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 68 |
|
| 69 |
- mv ../doc/${PN} "${S}"/doc || die |
| 70 |
- echo "add_subdirectory( doc )" >> CMakeLists.txt || die |
| 71 |
- |
| 72 |
kde5_src_prepare |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
local mycmakeargs=( |
| 77 |
+ $(cmake-utils_use_find_package activities KF5Activities) |
| 78 |
+ $(cmake-utils_use_find_package speech Qt5TextToSpeech) |
| 79 |
+ $(cmake-utils_use_find_package tidy LibTidy) |
| 80 |
$(cmake-utils_use_find_package X X11) |
| 81 |
) |
| 82 |
kde5_src_configure |
| 83 |
@@ -76,7 +85,7 @@ pkg_postinst() { |
| 84 |
kde5_pkg_postinst |
| 85 |
|
| 86 |
if ! has_version kde-apps/keditbookmarks:${SLOT} ; then |
| 87 |
- elog "For bookmarks support, install the keditbookmarks:" |
| 88 |
+ elog "For bookmarks support, install keditbookmarks:" |
| 89 |
elog "kde-apps/keditbookmarks:${SLOT}" |
| 90 |
fi |
| 91 |
|
| 92 |
@@ -87,7 +96,7 @@ pkg_postinst() { |
| 93 |
|
| 94 |
if ! has_version kde-apps/svg:${SLOT} ; then |
| 95 |
elog "For konqueror to view SVGs, install the svg kpart:" |
| 96 |
- elog "kde-apps/svg:${SLOT}" |
| 97 |
+ elog "kde-apps/svgpart:${SLOT}" |
| 98 |
fi |
| 99 |
|
| 100 |
if ! has_version virtual/jre ; then |
| 101 |
|
| 102 |
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml |
| 103 |
index 146bea6..e16d08a 100644 |
| 104 |
--- a/kde-apps/konqueror/metadata.xml |
| 105 |
+++ b/kde-apps/konqueror/metadata.xml |
| 106 |
@@ -6,7 +6,9 @@ |
| 107 |
<name>Gentoo KDE Project</name> |
| 108 |
</maintainer> |
| 109 |
<use> |
| 110 |
- <flag name="bookmarks">Add dependency on bookmark package.</flag> |
| 111 |
- <flag name="filemanager">Install the dolphin kpart for use as a file manager.</flag> |
| 112 |
+ <flag name="activities">Enable kactivities support</flag> |
| 113 |
+ <flag name="bookmarks">Add dependency on bookmark package</flag> |
| 114 |
+ <flag name="filemanager">Build the dolphin kpart for use as a file manager</flag> |
| 115 |
+ <flag name="speech">Build text-to-speech plugin</flag> |
| 116 |
</use> |
| 117 |
</pkgmetadata> |
Archives