From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 6E0881582EF for ; Wed, 26 Feb 2025 22:15:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 58BE2343090 for ; Wed, 26 Feb 2025 22:15:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3A4861102C9; Wed, 26 Feb 2025 22:15:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 30D3C1102C9 for ; Wed, 26 Feb 2025 22:15:34 +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 DC34C343067 for ; Wed, 26 Feb 2025 22:15:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 484311EFA for ; Wed, 26 Feb 2025 22:15:32 +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: <1740608118.7651b6e1d796a7c05fd1198ae15f3ac365982e23.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: 7651b6e1d796a7c05fd1198ae15f3ac365982e23 X-VCS-Branch: master Date: Wed, 26 Feb 2025 22:15:32 +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: c7015709-07ab-444b-9246-c0c30ad635c9 X-Archives-Hash: b05b69fb94377e27301e001b207e102d commit: 7651b6e1d796a7c05fd1198ae15f3ac365982e23 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 26 22:01:34 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 26 22:15:18 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7651b6e1 ecm.eclass: Improve _ecm_punt_kdoctools_install(), ecm_punt_po_install() Allow for whitespace padding within kdoctools_install and ki18n_install. Odd that this hasn't come up before. Closes: https://bugs.gentoo.org/950317 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1d4b7e97c6..c9a2b7ef9c 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -477,7 +477,7 @@ ecm_punt_bogus_dep() { # @DESCRIPTION: # Disables kdoctools_install(po) call. _ecm_punt_kdoctools_install() { - sed -e "s/^ *kdoctools_install.*(po.*)/#& # disabled by ecm.eclass/" \ + sed -e "s/^ *kdoctools_install.*(\s*po.*)/#& # disabled by ecm.eclass/" \ -i CMakeLists.txt || die } @@ -487,7 +487,7 @@ _ecm_punt_kdoctools_install() { # is outsourcing common files to a ${PN}-common split package. ecm_punt_po_install() { _ecm_punt_kdoctools_install - sed -e "s/^ *ki18n_install.*(po.*)/#& # disabled by ecm.eclass/" \ + sed -e "s/^ *ki18n_install.*(\s*po.*)/#& # disabled by ecm.eclass/" \ -i CMakeLists.txt || die }