[gentoo-commits] proj/kde:master commit in: kde-plasma/systemsettings/

[Andreas Sturmlechner]

commit:     0a15d4ce616703a9f53877d92b162329dd4af438
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 21:40:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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)