From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3e8D-0005MR-2f for garchives@archives.gentoo.org; Sun, 27 Mar 2011 00:47:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D79F21C086; Sun, 27 Mar 2011 00:46:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A4D201C084 for ; Sun, 27 Mar 2011 00:46:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26A7F1B4144 for ; Sun, 27 Mar 2011 00:46:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 89CA08006A for ; Sun, 27 Mar 2011 00:46:32 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <5e3c31161d634d6ebab33589e95047abe101cce5.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 5e3c31161d634d6ebab33589e95047abe101cce5 Date: Sun, 27 Mar 2011 00:46:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d835f77c4f5930df6e563feb0ae78acf commit: 5e3c31161d634d6ebab33589e95047abe101cce5 Author: abcd gentoo org> AuthorDate: Sun Mar 27 00:45:07 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sun Mar 27 00:45:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D5e3c3116 [kde4-base.eclass] Actually disable the handbook for kde-base/ packages n= ot using kde4-meta --- eclass/kde4-base.eclass | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index f30aff8..77db5ad 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -744,8 +744,23 @@ kde4-base_src_prepare() { # Enable/disable handbooks for kde4-base packages # kde-l10n inherits kde4-base but is metpackage, so no check for doc # kdelibs inherits kde4-base but handle installing the handbook itself - if ! has kde4-meta ${INHERITED}; then - has handbook ${IUSE//+} && [[ ${PN} !=3D kde-l10n ]] && [[ ${PN} !=3D = kdelibs ]] && enable_selected_doc_linguas + if ! has kde4-meta ${INHERITED} && has handbook ${IUSE//+}; then + if [[ ${KDEBASE} =3D=3D kde-base ]]; then + if [[ ${PN} !=3D kde-l10n && ${PN} !=3D kdelibs ]] && use !handbook; = then + # documentation in kde4-functions + : ${KDE_DOC_DIRS:=3Ddoc} + local dir + for dir in ${KDE_DOC_DIRS}; do + sed -e "/^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*${di= r}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ + -e "/^[[:space:]]*ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[= [:space:]]*)/s/^/#DONOTCOMPILE /" \ + -e "/^[[:space:]]*macro_optional_add_subdirectory[[:space:]]*([[:s= pace:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ + -e "/^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY[[:space:]]*([[:s= pace:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ + -i CMakeLists.txt || die "failed to comment out handbook" + done + fi + else + enable_selected_doc_linguas + fi fi =20 # SCM bootstrap