Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/k3b/
Date: Thu, 27 Aug 2015 12:58:00
Message-Id: 1440680265.9daf120c09026e9d61cfab8d2a257a3334b2cff9.kensington@gentoo
1 commit: 9daf120c09026e9d61cfab8d2a257a3334b2cff9
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 27 12:56:34 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 27 12:57:45 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9daf120c
7
8 app-cdr/k3b: remove duplicate add_subdirectory.
9
10 This was causing build failure with kde-base/kdelibs-4.14.11.
11
12 Gentoo-bug: 558640
13
14 Package-Manager: portage-2.2.20.1
15
16 app-cdr/k3b/k3b-2.0.3-r2.ebuild | 7 +++++++
17 1 file changed, 7 insertions(+)
18
19 diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
20 index 68619e5..95a09a5 100644
21 --- a/app-cdr/k3b/k3b-2.0.3-r2.ebuild
22 +++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
23 @@ -72,6 +72,13 @@ REQUIRED_USE="
24 sox? ( encode )
25 "
26
27 +src_prepare() {
28 + kde4-base_src_prepare
29 +
30 + # bug 558640
31 + sed -i -e "/^add_subdirectory( doc )/d" CMakeLists.txt || die
32 +}
33 +
34 src_configure() {
35 mycmakeargs=(
36 -DK3B_BUILD_API_DOCS=OFF