Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qdoc/
Date: Sat, 06 Jan 2018 02:42:22
Message-Id: 1515206524.4e6dcea6ba01fd3fb245fbb073fa13e9330cd02a.kensington@gentoo
1 commit: 4e6dcea6ba01fd3fb245fbb073fa13e9330cd02a
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 6 02:40:28 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 6 02:42:04 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e6dcea6
7
8 dev-qt/qdoc: clang is now required
9
10 Upstream-commit: b032aee53c8fb6807485186f276ca25b86ac1251
11 Package-Manager: Portage-2.3.14, Repoman-2.3.6
12
13 dev-qt/qdoc/qdoc-5.9999.ebuild | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-qt/qdoc/qdoc-5.9999.ebuild b/dev-qt/qdoc/qdoc-5.9999.ebuild
17 index fff12942..61789076 100644
18 --- a/dev-qt/qdoc/qdoc-5.9999.ebuild
19 +++ b/dev-qt/qdoc/qdoc-5.9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -15,6 +15,7 @@ IUSE="qml"
27
28 DEPEND="
29 ~dev-qt/qtcore-${PV}
30 + sys-devel/clang:=
31 qml? ( ~dev-qt/qtdeclarative-${PV} )
32 "
33 RDEPEND="${DEPEND}"
34 @@ -27,5 +28,10 @@ src_prepare() {
35 qt_use_disable_mod qml qmldevtools-private \
36 src/qdoc/qdoc.pro
37
38 + export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
39 + # this is normally loaded in qttools.pro, so skipped by using
40 + # QT_TARGET_SUBDIRS causing build to fail
41 + sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
42 +
43 qt5-build_src_prepare
44 }