diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 12 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 4f71066b4e7..384c7a35c3b 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -203,6 +203,7 @@ esac # KDE dependencies kdecommondepend=" + dev-lang/perl x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm @@ -232,9 +233,6 @@ kdedepend=" dev-util/pkgconfig >=sys-apps/sandbox-1.3.2 " -kderdepend=" - dev-lang/perl -" case ${KDE_REQUIRED} in always) COMMONDEPEND="${COMMONDEPEND} ${kdecommondepend}" @@ -464,14 +462,6 @@ kde4-base_src_configure() { append-cppflags -DQT_NO_DEBUG fi - # Enable generation of HTML handbook - # TODO kill it - if has htmlhandbook ${IUSE//+} && use htmlhandbook; then - ebegin "Enabling building of HTML handbook" - mycmakeargs="${mycmakeargs} -DKDE4_ENABLE_HTMLHANDBOOK=ON" - eend $? - fi - # Build tests in src_test only, where we override this value mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=OFF" diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index eb879ecf932..88045cfd4cc 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -323,7 +323,8 @@ kde4-meta_src_extract() { kde4-meta_create_extractlists() { debug-print-function ${FUNCNAME} "$@" - if has htmlhandbook ${IUSE//+} && use htmlhandbook; then + # TODO change to KMEXTRA for more strict check + if has doc ${IUSE//+} && use doc && [[ -n ${KMMODULE} ]]; then # We use the basename of $KMMODULE because $KMMODULE can contain # the path to the module subdirectory. KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}" |