Dnia 2015-06-27, o godz. 22:02:21 "Johannes Huber (johu)" <j...@gentoo.org> napisał(a):
> johu 15/06/27 22:02:21 > > Modified: ChangeLog kde5-functions.eclass kde5.eclass > Log: > Sync kde5*eclass with kde overlay. Handle more whitespace variations by > Michael Palimaka <kensing...@gentoo.org>. Fixes translation handling by > Michael Palimaka <kensing...@gentoo.org> and Andreas Sturmlechner > <andreas.sturmlech...@gmail.com>, bug #552664. Raises deps on KDE Frameworks > and KDE Plasma Manuel Rüger <mr...@gentoo.org>. > > Revision Changes Path > 1.1691 eclass/ChangeLog > > file : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&view=markup > plain: > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&content-type=text/plain > diff : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1690&r2=1.1691 > > Index: ChangeLog > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v > retrieving revision 1.1690 > retrieving revision 1.1691 > diff -u -r1.1690 -r1.1691 > --- ChangeLog 27 Jun 2015 17:41:20 -0000 1.1690 > +++ ChangeLog 27 Jun 2015 22:02:21 -0000 1.1691 > @@ -1,6 +1,14 @@ > # ChangeLog for eclass directory > # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 > -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27 > 17:41:20 mpagano Exp $ > +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1691 2015/06/27 > 22:02:21 johu Exp $ > + > + 27 Jun 2015; Johannes Huber <j...@gentoo.org> kde5-functions.eclass, > + kde5.eclass: > + Sync kde5*eclass with kde overlay. Handle more whitespace variations by > + Michael Palimaka <kensing...@gentoo.org>. Fixes translation handling by > + Michael Palimaka <kensing...@gentoo.org> and Andreas Sturmlechner > + <andreas.sturmlech...@gmail.com>, bug #552664. Raises deps on KDE > Frameworks > + and KDE Plasma Manuel Rüger <mr...@gentoo.org>. > > 27 Jun 2015; Mike Pagano <mpag...@gentoo.org> kernel-2.eclass: > Fix conditional bug for UNIPATCH_DROP > > > > 1.9 eclass/kde5-functions.eclass > > file : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&view=markup > plain: > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&content-type=text/plain > diff : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.8&r2=1.9 > > Index: kde5-functions.eclass > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v > retrieving revision 1.8 > retrieving revision 1.9 > diff -u -r1.8 -r1.9 > --- kde5-functions.eclass 8 Jun 2015 12:27:32 -0000 1.8 > +++ kde5-functions.eclass 27 Jun 2015 22:02:21 -0000 1.9 > @@ -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.8 > 2015/06/08 12:27:32 mrueg Exp $ > +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.9 > 2015/06/27 22:02:21 johu Exp $ > > # @ECLASS: kde5-functions.eclass > # @MAINTAINER: > @@ -26,12 +26,12 @@ > # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL > # @DESCRIPTION: > # Minimal Frameworks version to require for the package. > -: ${FRAMEWORKS_MINIMAL:=5.10.0} > +: ${FRAMEWORKS_MINIMAL:=5.11.0}> - RDEPEND+=" > > # @ECLASS-VARIABLE: PLASMA_MINIMAL > # @DESCRIPTION: > # Minimal Plasma version to require for the package. > -: ${PLASMA_MINIMAL:=5.3.0} > +: ${PLASMA_MINIMAL:=5.3.1} > > # @ECLASS-VARIABLE: KDE_APPS_MINIMAL > # @DESCRIPTION: > @@ -218,7 +218,7 @@ > local prefix=${1} > local dep=${2} > > - pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" > CMakeLists.txt > "${T}/bogus${dep}" > + pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" > CMakeLists.txt > "${T}/bogus${dep}" > > # pcregrep returns non-zero on no matches/error > if [[ $? != 0 ]] ; then > @@ -232,7 +232,7 @@ > 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 > + sed -e > "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i > CMakeLists.txt || die > fi > } > > > > > 1.11 eclass/kde5.eclass > > file : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&view=markup > plain: > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&content-type=text/plain > diff : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.10&r2=1.11 > > Index: kde5.eclass > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -r1.10 -r1.11 > --- kde5.eclass 31 May 2015 15:51:21 -0000 1.10 > +++ kde5.eclass 27 Jun 2015 22:02:21 -0000 1.11 > @@ -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.eclass,v 1.10 2015/05/31 > 15:51:21 mrueg Exp $ > +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.11 2015/06/27 > 22:02:21 johu Exp $ > > # @ECLASS: kde5.eclass > # @MAINTAINER: > @@ -142,10 +142,7 @@ > fi > > if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; > then > - RDEPEND+=" > - !kde-apps/${PN}:4 > - !kde-base/${PN} > - " > + RDEPEND+=" !kde-apps/${PN}:4" > fi > ;; > esac > @@ -376,11 +373,20 @@ > # enable only the requested translations > # when required > if [[ ${KDE_BUILD_TYPE} = release ]] ; then > - for lang in $(ls po 2> /dev/null) ; do > - if ! has ${lang} ${LINGUAS} ; then > - rm -rf po/${lang} > - fi > - done > + if [[ -d po ]] ; then > + pushd po > /dev/null ||die. > + for lang in $(ls) ; do How about... for lang in *? > + if ! has ${lang} ${LINGUAS} ; then > + if [[ ${lang} != CMakeLists.txt ]] ; > then > + rm -rf ${lang} ||die. > + fi > + if [[ -e CMakeLists.txt ]] ; then > + comment_add_subdirectory ${lang} > + fi > + fi > + done > + popd > /dev/null ||die. > + fi > > if [[ ${KDE_HANDBOOK} = true ]] ; then > pushd doc > /dev/null Here too btw. -- Best regards, Michał Górny <http://dev.gentoo.org/~mgorny/>
pgpBIGNXjpfKf.pgp
Description: OpenPGP digital signature
