public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jonathan Callen" <abcd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kolourpaint/
Date: Sun, 27 Mar 2011 00:31:20 +0000 (UTC)	[thread overview]
Message-ID: <d1de7d182d6d7bcad32398f3718ba8c767f79aad.abcd@gentoo> (raw)

commit:     d1de7d182d6d7bcad32398f3718ba8c767f79aad
Author:     abcd <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:36:58 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 00:30:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d1de7d18

[kde-base/kolourpaint] Make handbook optional again and actually install it

(Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --force, 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/kolourpaint/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 @@
 
 EAPI=3
 
+KDE_HANDBOOK="optional"
 if [[ ${PV} == *9999 ]]; then
-# Not sure how to handle this...
-KDE_HANDBOOK="required"
 KDE_SCM="git"
 inherit kde4-base
 else
-KDE_HANDBOOK="optional"
 KMNAME="kdegraphics"
 inherit kde4-meta
 fi
@@ -19,3 +17,14 @@ DESCRIPTION="Paint Program for KDE"
 KEYWORDS=""
 LICENSE="BSD LGPL-2"
 IUSE="debug"
+
+if [[ ${PV} == *9999 ]]; then
+src_prepare() {
+	# Upstream forgot to add_subdirectory(doc), so HACK it in
+	if ! grep -qi '^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*doc[[:space:]]*)' CMakeLists.txt; then
+		echo "add_subdirectory(doc)" >> CMakeLists.txt
+	fi
+
+	kde4-base_src_prepare
+}
+fi



             reply	other threads:[~2011-03-27  0:31 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-27  0:31 Jonathan Callen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-05-12 20:32 [gentoo-commits] proj/kde:master commit in: kde-base/kolourpaint/ Marc Schiffbauer
2011-05-26  5:14 Jorge Manuel B. S. Vicetto
2011-06-08 22:15 Andreas Hüttel
2011-06-08 22:49 Andreas Hüttel
2011-08-27  7:50 Andreas Hüttel
2011-10-16 10:05 Marc Schiffbauer
2013-06-03 12:23 Michael Palimaka
2013-06-03 18:21 Johannes Huber
2013-08-29 13:13 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d1de7d182d6d7bcad32398f3718ba8c767f79aad.abcd@gentoo \
    --to=abcd@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox