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 96E41158087 for ; Sun, 26 Dec 2021 20:39:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C40C2BC010; Sun, 26 Dec 2021 20:39:07 +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 321782BC00E for ; Sun, 26 Dec 2021 20:39:07 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EED79342EC0 for ; Sun, 26 Dec 2021 20:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E256D233 for ; Sun, 26 Dec 2021 20:39:03 +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: <1640551083.4635dbecb2ee1129f6f7cde8a29fc27a618ecbbe.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: 4635dbecb2ee1129f6f7cde8a29fc27a618ecbbe X-VCS-Branch: master Date: Sun, 26 Dec 2021 20:39:03 +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: 99d50ed4-7bc8-464d-a754-af34323bfddf X-Archives-Hash: cf5351d4a90da31a28da3d8d0fcf4915 commit: 4635dbecb2ee1129f6f7cde8a29fc27a618ecbbe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 26 20:14:48 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 26 20:38:03 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4635dbec ecm.eclass: Case-insensitivity for grep and sed Reported-by: Milos Popovic gmail.com> Bug: https://bugs.gentoo.org/829998 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 5ae6e73401..baece9e6e6 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -380,7 +380,7 @@ ecm_src_prepare() { if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then ecm_punt_bogus_dep KF5 DocTools - sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die + sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die fi fi @@ -412,12 +412,12 @@ ecm_src_prepare() { local f pf="${T}/${P}"-tests-optional.patch touch ${pf} || die "Failed to touch patch file" for f in $(find . -type f -name "CMakeLists.txt" -exec \ - grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do + grep -li "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do cp ${f} ${f}.old || die "Failed to prepare patch origfile" pushd ${f%/*} > /dev/null || die ecm_punt_bogus_dep Qt5 Test sed -i CMakeLists.txt -e \ - "/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \ + "/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/I" \ || die popd > /dev/null || die diff -Naur ${f}.old ${f} 1>>${pf}