mrueg 15/05/09 10:24:46 Modified: ChangeLog kde5-functions.eclass Log: Sync kde5-functions.eclass with overlay.
Revision Changes Path 1.1605 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1605&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1605&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1604&r2=1.1605 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1604 retrieving revision 1.1605 diff -u -r1.1604 -r1.1605 --- ChangeLog 9 May 2015 10:22:36 -0000 1.1604 +++ ChangeLog 9 May 2015 10:24:46 -0000 1.1605 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1604 2015/05/09 10:22:36 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1605 2015/05/09 10:24:46 mrueg Exp $ + + 09 May 2015; Manuel Rüger <[email protected]> kde5-functions.eclass: + Sync with overlay. 09 May 2015; Manuel Rüger <[email protected]> kde5.eclass: Sync with overlay. 1.7 eclass/kde5-functions.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.6&r2=1.7 Index: kde5-functions.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kde5-functions.eclass 11 Apr 2015 17:11:22 -0000 1.6 +++ kde5-functions.eclass 9 May 2015 10:24:46 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.6 2015/04/11 17:11:22 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.7 2015/05/09 10:24:46 mrueg Exp $ # @ECLASS: kde5-functions.eclass # @MAINTAINER: @@ -210,11 +210,30 @@ fi } -# @FUNCTION: punt_bogus_deps +# @FUNCTION: punt_bogus_dep +# @USAGE: <prefix> <dependency> # @DESCRIPTION: -# Remove hard-coded upstream dependencies that are not correct. -punt_bogus_deps() { - sed -e "/find_package(Qt5 /s/ Test//" -i CMakeLists.txt || die +# Removes a specified dependency from a find_package call with multiple components. +punt_bogus_dep() { + local prefix=${1} + local dep=${2} + + pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" + + # pcregrep returns non-zero on no matches/error + if [[ $? != 0 ]] ; then + return + fi + + local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1) + local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1) + local last=$(( ${length} + ${first} - 1)) + + sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die + + if [[ ${length} = 1 ]] ; then + sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die + fi } fi
