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 BD7B0138263 for ; Thu, 19 May 2016 14:17:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE4F4234012; Thu, 19 May 2016 14:17:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E31B8234004 for ; Thu, 19 May 2016 14:17:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC1D4340C23 for ; Thu, 19 May 2016 14:17:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE90533E for ; Thu, 19 May 2016 14:17:04 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1463667398.b30c3b5c81c723a8e705b05e4fef476011783c07.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: b30c3b5c81c723a8e705b05e4fef476011783c07 X-VCS-Branch: master Date: Thu, 19 May 2016 14:17:04 +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: 11c94acd-4b7b-45d1-9dd4-993e8a05a30f X-Archives-Hash: 2736cb2b8bbce3dec25b24450e815069 commit: b30c3b5c81c723a8e705b05e4fef476011783c07 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun May 15 09:03:57 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu May 19 14:16:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c3b5c kde4-base.eclass: Add exceptions to USE=+handbook kde-apps/kcontrol and kde-apps/knetattach also collide with slot 5. Signed-off-by: Johannes Huber gentoo.org> eclass/kde4-base.eclass | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 050f0c4..2d761f8 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -160,7 +160,7 @@ KDE_HANDBOOK="${KDE_HANDBOOK:-never}" # translations. (Mostly all kde ebuilds does not ship documentation # and translations in live ebuilds) if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then - # Kdebase actualy provides the handbooks even for live stuff + # Kdebase actually provides the handbooks even for live stuff [[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never KDE_LINGUAS="" fi @@ -358,11 +358,14 @@ case ${KDE_HANDBOOK} in [[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}" ;; optional) - if [[ ${PN} == kdesu ]] ; then - IUSE+=" handbook" - else - IUSE+=" +handbook" - fi + case ${PN} in + kcontrol | kdesu | knetattach) + _IUSE+=" handbook" + ;; + *) + IUSE+=" +handbook" + ;; + esac kdedepend+=" handbook? ( ${kdehandbookdepend} )" [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )" ;;