Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/
Date: Sun, 21 Apr 2019 11:31:43
Message-Id: 1555846258.706903f88730654793624a6adc780b90af904090.asturm@gentoo
1 commit: 706903f88730654793624a6adc780b90af904090
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 21:40:53 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 21 11:30:58 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706903f8
7
8 kde-plasma/systemsettings: Re-apply fix for hang in src_configure
9
10 Same as commit af940af244b6c6d28d3ba2936976c80b9990414d
11
12 Closes: https://bugs.gentoo.org/683102
13 Package-Manager: Portage-2.3.64, Repoman-2.3.12
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 kde-plasma/systemsettings/systemsettings-5.15.4.ebuild | 8 ++++++++
17 1 file changed, 8 insertions(+)
18
19 diff --git a/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild
20 index 12a9f843d0f..3822242a75c 100644
21 --- a/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild
22 +++ b/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild
23 @@ -43,6 +43,14 @@ RDEPEND="${DEPEND}
24 gtk? ( $(add_plasma_dep kde-gtk-config) )
25 "
26
27 +src_prepare() {
28 + kde5_src_prepare
29 +
30 + # FIXME: hangs in chroot; similar to bug #640432
31 + sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
32 + -i CMakeLists.txt || die
33 +}
34 +
35 src_configure() {
36 local mycmakeargs=(
37 $(cmake-utils_use_find_package classic KF5KHtml)