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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DAB46158086 for ; Sat, 8 Jan 2022 12:44:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07A1CE0798; Sat, 8 Jan 2022 12:44:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7F9FE0798 for ; Sat, 8 Jan 2022 12:43:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C105C342D08 for ; Sat, 8 Jan 2022 12:43:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11EFDD0 for ; Sat, 8 Jan 2022 12:43:57 +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: <1641645799.07f51c3d74c5387d581a95be90985a80c2155481.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 07f51c3d74c5387d581a95be90985a80c2155481 X-VCS-Branch: master Date: Sat, 8 Jan 2022 12:43:57 +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: 2099081a-b892-4c45-b8d7-c9f5755ac6f9 X-Archives-Hash: 3da2fe20861df08ea638ba41b9476ebe commit: 07f51c3d74c5387d581a95be90985a80c2155481 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 8 12:39:47 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 8 12:43:19 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07f51c3d ecm.eclass: Fix sed typo in _ecm_punt_kfqt_module() But also add '${dep}' info to 'removed by ecm.eclass' output. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 148a59369c..a0ba4090ce 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -335,11 +335,10 @@ _ecm_punt_kfqt_module() { local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1) local last=$(( length + first - 1)) - # FIXME: may leave empty find_package($prefix) behind (no regression, non-trivial) sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die if [[ ${length} -eq 1 ]] ; then - sed -e "/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by ecm.eclass - /" \ + sed -e "/find_package\s*(\s*${prefix}\([0-9]\|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# '${dep}' removed by ecm.eclass - /" \ -i CMakeLists.txt || die fi }