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 1ADAD1382C5 for ; Tue, 13 Feb 2018 20:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64253E09F6; Tue, 13 Feb 2018 20:25:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3DF2AE09F6 for ; Tue, 13 Feb 2018 20:25:59 +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 5A290335C43 for ; Tue, 13 Feb 2018 20:25:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C889A1DE for ; Tue, 13 Feb 2018 20:25:56 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1518553555.c43f6cb62d492c4f9a7d0e04abdc9d5d007a48be.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/gwenhywfar/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild X-VCS-Directories: sys-libs/gwenhywfar/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: c43f6cb62d492c4f9a7d0e04abdc9d5d007a48be X-VCS-Branch: master Date: Tue, 13 Feb 2018 20:25:56 +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-Archives-Salt: b68917e2-0eb6-4743-a1cb-f45dc2495dec X-Archives-Hash: e88531e340ae2e11c2724660a2ecd3f6 commit: c43f6cb62d492c4f9a7d0e04abdc9d5d007a48be Author: Jeroen Roovers gentoo org> AuthorDate: Tue Feb 13 20:25:41 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Feb 13 20:25:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43f6cb6 sys-libs/gwenhywfar: Do not run configuration in src_prepare() (bug #647478 again). Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild index 4c916a73918..6883b65fbc3 100644 --- a/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild +++ b/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 MY_P="${P/_beta/beta}" -inherit autotools qmake-utils +inherit qmake-utils DESCRIPTION="A multi-platform helper library for other libraries" HOMEPAGE="https://www.aquamaniac.de/aqbanking/" @@ -66,16 +66,14 @@ RESTRICT="test" S="${WORKDIR}/${MY_P}" -src_prepare() { +src_configure() { disableQtModule() { local module for module in ${@}; do - sed -e "/qtHaveModule(${module})/s/^/#DONT/" -i m4/ax_have_qt.m4 || die + sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die done } - default - use designer || disableQtModule designer uitools use qml || disableQtModule qml qmltest use sensors || disableQtModule sensors @@ -83,10 +81,6 @@ src_prepare() { use test || disableQtModule testlib use webkit || disableQtModule webkit webkitwidgets - eautoreconf -} - -src_configure() { local guis=() use fox && guis+=( fox16 ) use gtk && guis+=( gtk2 )