From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9892C138247 for ; Sat, 18 Jan 2014 04:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AF19E0CAB; Sat, 18 Jan 2014 04:34:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33EB4E0CA2 for ; Sat, 18 Jan 2014 04:34:04 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E8EE33F964 for ; Sat, 18 Jan 2014 04:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1D22B1872D for ; Sat, 18 Jan 2014 04:34:01 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1389981674.a2ed4b77c4cf76cb74bea4dd383f01e9f3ae6a74.robbat2@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde-frameworks.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: a2ed4b77c4cf76cb74bea4dd383f01e9f3ae6a74 X-VCS-Branch: master Date: Sat, 18 Jan 2014 04:34:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0e6f0c24-61d1-437a-a1bb-db738ec7b272 X-Archives-Hash: 1d80c6eb3f72f29fa3f5753e9b1c7d8a commit: a2ed4b77c4cf76cb74bea4dd383f01e9f3ae6a74 Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 17 18:01:14 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jan 17 18:01:14 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a2ed4b77 [eclass] Enable doxygen by default. --- eclass/kde-frameworks.eclass | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/eclass/kde-frameworks.eclass b/eclass/kde-frameworks.eclass index fb8ee1f..8d903fd 100644 --- a/eclass/kde-frameworks.eclass +++ b/eclass/kde-frameworks.eclass @@ -46,7 +46,7 @@ QT_MINIMAL="${QT_MINIMAL:-5.2.0}" # If set to "false", do nothing. # For any other value, add doc to IUSE, add a dependency on doxygen, # and generate and install API documentation. -: ${FRAMEWORKS_DOXYGEN:=false} +: ${FRAMEWORKS_DOXYGEN:=true} # @ECLASS-VARIABLE: FRAMEWORKS_EXAMPLES # @DESCRIPTION: @@ -77,7 +77,10 @@ case ${FRAMEWORKS_DOXYGEN} in false) ;; *) IUSE+=" doc" - DEPEND+=" doc? ( app-doc/doxygen )" + DEPEND+=" doc? ( + app-doc/doxygen + $(add_frameworks_dep kapidox) + )" esac case ${FRAMEWORKS_DEBUG} in @@ -292,7 +295,7 @@ kde-frameworks_src_compile() { # Build doxygen documentation if applicable if use_if_iuse doc ; then - doxygen "${S}" + /usr/share/kapidox/kgenapidox.py --doxdatadir=/usr/share/doc/HTML/en/common/ . fi } @@ -341,7 +344,7 @@ kde-frameworks_src_install() { # Install doxygen documentation if applicable if use_if_iuse doc ; then - dohtml -r html/* + dohtml -r ${P}-apidocs/html/* fi cmake-utils_src_install