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 3E6F413829C for ; Thu, 9 Jun 2016 09:02:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A286254024; Thu, 9 Jun 2016 09:02:44 +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 A3D11254024 for ; Thu, 9 Jun 2016 09:02:43 +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 21DB6340CD7 for ; Thu, 9 Jun 2016 09:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71E3C97B for ; Thu, 9 Jun 2016 09:02:39 +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: <1465460741.f67e010af76759039e645353736ce747489f6688.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: f67e010af76759039e645353736ce747489f6688 X-VCS-Branch: master Date: Thu, 9 Jun 2016 09:02:39 +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: eb2aba90-0a54-4d39-aefe-73d6908d1a92 X-Archives-Hash: 5f597675308e006d52bf7daff9c6f484 commit: f67e010af76759039e645353736ce747489f6688 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Jun 9 08:25:41 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 9 08:25:41 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f67e010a kde5-functions.eclass: Improve punt_bogus_dep The variable holding the min version requirement can be named anything. This should catch most cases, most importantly Qt5 modules. 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 435c838..b20d406 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -279,7 +279,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}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die + sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die fi }