From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50675138334 for ; Sun, 21 Apr 2019 11:31:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77337E08DC; Sun, 21 Apr 2019 11:31:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 607E8E08DC for ; Sun, 21 Apr 2019 11:31:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 143B6341BE1 for ; Sun, 21 Apr 2019 11:31:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBF8E5C3 for ; Sun, 21 Apr 2019 11:31:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1555846258.706903f88730654793624a6adc780b90af904090.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/systemsettings/systemsettings-5.15.4.ebuild X-VCS-Directories: kde-plasma/systemsettings/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 706903f88730654793624a6adc780b90af904090 X-VCS-Branch: master Date: Sun, 21 Apr 2019 11:31:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b32d9fb8-42f2-4cdb-8cf5-03e4c41a7713 X-Archives-Hash: 74b14c43bd076dad29c51761b43fed60 commit: 706903f88730654793624a6adc780b90af904090 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 20 21:40:53 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 11:30:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706903f8 kde-plasma/systemsettings: Re-apply fix for hang in src_configure Same as commit af940af244b6c6d28d3ba2936976c80b9990414d Closes: https://bugs.gentoo.org/683102 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/systemsettings/systemsettings-5.15.4.ebuild | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild index 12a9f843d0f..3822242a75c 100644 --- a/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.15.4.ebuild @@ -43,6 +43,14 @@ RDEPEND="${DEPEND} gtk? ( $(add_plasma_dep kde-gtk-config) ) " +src_prepare() { + kde5_src_prepare + + # FIXME: hangs in chroot; similar to bug #640432 + sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \ + -i CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package classic KF5KHtml)