mpagano 15/06/27 17:41:20 Modified: ChangeLog kernel-2.eclass Log: Fix conditional bug for UNIPATCH_DROP
Revision Changes Path 1.1690 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1689&r2=1.1690 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1689 retrieving revision 1.1690 diff -u -r1.1689 -r1.1690 --- ChangeLog 27 Jun 2015 17:27:15 -0000 1.1689 +++ ChangeLog 27 Jun 2015 17:41:20 -0000 1.1690 @@ -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.1689 2015/06/27 17:27:15 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27 17:41:20 mpagano Exp $ + + 27 Jun 2015; Mike Pagano <[email protected]> kernel-2.eclass: + Fix conditional bug for UNIPATCH_DROP 27 Jun 2015; Mike Pagano <[email protected]> kernel-2.eclass: Fix for kdbus. Thanks to Arfrever. 1.310 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.309&r2=1.310 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- kernel-2.eclass 27 Jun 2015 17:27:15 -0000 1.309 +++ kernel-2.eclass 27 Jun 2015 17:41:20 -0000 1.310 @@ -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/kernel-2.eclass,v 1.309 2015/06/27 17:27:15 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.310 2015/06/27 17:41:20 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -1022,10 +1022,12 @@ fi # if kdbus use flag is not set, drop the kdbus patch - if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]] && ! use kdbus; then - UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" + if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]]; then + if ! has kdbus ${IUSE} || ! use kdbus; then + UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch" + fi fi - fi + fi done #populate KPATCH_DIRS so we know where to look to remove the excludes
