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 91EDF59CAF for ; Thu, 7 Apr 2016 19:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 851DE21C050; Thu, 7 Apr 2016 19:20:31 +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 3380D21C050 for ; Thu, 7 Apr 2016 19:20:31 +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 F0007340A7B for ; Thu, 7 Apr 2016 19:20:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 157A7C8 for ; Thu, 7 Apr 2016 19:20:21 +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: <1460056811.92c399440dbaaaaadc80669da9c7f7722b71e896.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: 92c399440dbaaaaadc80669da9c7f7722b71e896 X-VCS-Branch: master Date: Thu, 7 Apr 2016 19:20:21 +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: f045d1ec-97ea-4b34-8cc2-d07ef9573525 X-Archives-Hash: cda73a6f1b8ecb1fcf0e8d9a736c3653 commit: 92c399440dbaaaaadc80669da9c7f7722b71e896 Author: Michael Palimaka gentoo org> AuthorDate: Thu Apr 7 19:20:05 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Apr 7 19:20:11 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=92c39944 kde5-functions.eclass: further dependency punting improvements This now handles the case of 'find_package(Qt5 REQUIRED COMPONENTS )'. Thanks again 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 1b882d4..44bc296 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\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die + sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die fi }