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 63959138335 for ; Sun, 21 Apr 2019 11:18:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DF8FE08BB; Sun, 21 Apr 2019 11:18:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 03CF8E08BB for ; Sun, 21 Apr 2019 11:18:33 +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 9961B341BD5 for ; Sun, 21 Apr 2019 11:18:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4504D5B0 for ; Sun, 21 Apr 2019 11:18:31 +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: <1555844834.0a15d4ce616703a9f53877d92b162329dd4af438.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/systemsettings/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild kde-plasma/systemsettings/systemsettings-9999.ebuild X-VCS-Directories: kde-plasma/systemsettings/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a15d4ce616703a9f53877d92b162329dd4af438 X-VCS-Branch: master Date: Sun, 21 Apr 2019 11:18:31 +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: d168e904-43e2-41ef-bd8e-6164f1a88400 X-Archives-Hash: 3233b51cc4029b9bddf5d976947a132b commit: 0a15d4ce616703a9f53877d92b162329dd4af438 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 20 21:40:53 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 11:07:14 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a15d4ce kde-plasma/systemsettings: Re-apply fix for hang in src_configure Same as commit af940af244b6c6d28d3ba2936976c80b9990414d Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild | 8 ++++++++ kde-plasma/systemsettings/systemsettings-9999.ebuild | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild index 159c06160c..20bada9ce1 100644 --- a/kde-plasma/systemsettings/systemsettings-5.15.49.9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.15.49.9999.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) diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild index 159c06160c..20bada9ce1 100644 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-9999.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)