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 1Q3dtZ-00032R-Pp for garchives@archives.gentoo.org; Sun, 27 Mar 2011 00:31:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FB5C1C0A3; Sun, 27 Mar 2011 00:31:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CDEAA1C09F for ; Sun, 27 Mar 2011 00:31:21 +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 5075C1B4144 for ; Sun, 27 Mar 2011 00:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A349480079 for ; Sun, 27 Mar 2011 00:31:20 +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: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kolourpaint/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kolourpaint/kolourpaint-9999.ebuild X-VCS-Directories: kde-base/kolourpaint/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: d1de7d182d6d7bcad32398f3718ba8c767f79aad Date: Sun, 27 Mar 2011 00:31:20 +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: 1fcffb051d3fa34538641c2529190ec8 commit: d1de7d182d6d7bcad32398f3718ba8c767f79aad Author: abcd gentoo org> AuthorDate: Sat Mar 26 17:36:58 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sun Mar 27 00:30:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dd1de7d18 [kde-base/kolourpaint] Make handbook optional again and actually install = it (Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --for= ce, signed Manifest commit with key 229E5838) --- kde-base/kolourpaint/kolourpaint-9999.ebuild | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/kde-base/kolourpaint/kolourpaint-9999.ebuild b/kde-base/kolo= urpaint/kolourpaint-9999.ebuild index aa57c3e..6f17050 100644 --- a/kde-base/kolourpaint/kolourpaint-9999.ebuild +++ b/kde-base/kolourpaint/kolourpaint-9999.ebuild @@ -4,13 +4,11 @@ =20 EAPI=3D3 =20 +KDE_HANDBOOK=3D"optional" if [[ ${PV} =3D=3D *9999 ]]; then -# Not sure how to handle this... -KDE_HANDBOOK=3D"required" KDE_SCM=3D"git" inherit kde4-base else -KDE_HANDBOOK=3D"optional" KMNAME=3D"kdegraphics" inherit kde4-meta fi @@ -19,3 +17,14 @@ DESCRIPTION=3D"Paint Program for KDE" KEYWORDS=3D"" LICENSE=3D"BSD LGPL-2" IUSE=3D"debug" + +if [[ ${PV} =3D=3D *9999 ]]; then +src_prepare() { + # Upstream forgot to add_subdirectory(doc), so HACK it in + if ! grep -qi '^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*do= c[[:space:]]*)' CMakeLists.txt; then + echo "add_subdirectory(doc)" >> CMakeLists.txt + fi + + kde4-base_src_prepare +} +fi