From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C4A7459CAF for ; Wed, 6 Apr 2016 16:49:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E021721C0AF; Wed, 6 Apr 2016 16:49:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8306621C0AF for ; Wed, 6 Apr 2016 16:49:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5897B340E62 for ; Wed, 6 Apr 2016 16:49:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95F1980 for ; Wed, 6 Apr 2016 16:49:19 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1459961343.ca38654b2b785d1468532ed315386b519f61cc77.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: ca38654b2b785d1468532ed315386b519f61cc77 X-VCS-Branch: master Date: Wed, 6 Apr 2016 16:49:19 +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: b65c85ba-1cb7-4360-987b-a8d7fa01dc16 X-Archives-Hash: 1543afed04b29d12eba615204ae47820 commit: ca38654b2b785d1468532ed315386b519f61cc77 Author: Michael Palimaka gentoo org> AuthorDate: Wed Apr 6 16:49:03 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Apr 6 16:49:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca38654b kde5-functions.eclass: improve single line dependencny handling Thanks to Arfrever. eclass/kde5-functions.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index be336be..1b882d4 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -274,7 +274,7 @@ punt_bogus_dep() { sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die if [[ ${length} = 1 ]] ; then - sed -e "/find_package\s*(\s*${prefix}\s*\(REQUIRED\)*\s*\(COMPONENTS\)*\s*)/I d" -i CMakeLists.txt || die + sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die fi }