mpagano 15/06/27 15:36:07 Modified: ChangeLog kernel-2.eclass Log: Add the kdbus use flag and eclass variable to the kernel-2.eclass for optional kdbus inclusion.
Revision Changes Path 1.1688 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1688&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1688&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1687&r2=1.1688 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1687 retrieving revision 1.1688 diff -u -r1.1687 -r1.1688 --- ChangeLog 27 Jun 2015 00:50:55 -0000 1.1687 +++ ChangeLog 27 Jun 2015 15:36:06 -0000 1.1688 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1687 2015/06/27 00:50:55 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1688 2015/06/27 15:36:06 mpagano Exp $ + + 27 Jun 2015; Mike Pagano <mpag...@gentoo.org> kernel-2.eclass: + Add the kdbus use flag and eclass variable to the kernel-2.eclass for + optional kdbus inclusion. 27 Jun 2015; Mike Pagano <mpag...@gentoo.org> kernel-2.eclass: Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds. 1.308 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.308&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.308&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.307&r2=1.308 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- kernel-2.eclass 27 Jun 2015 00:50:55 -0000 1.307 +++ kernel-2.eclass 27 Jun 2015 15:36:06 -0000 1.308 @@ -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.307 2015/06/27 00:50:55 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.308 2015/06/27 15:36:06 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -65,6 +65,9 @@ # K_LONGTERM - If set, the eclass will search for the kernel source # in the long term directories on the upstream servers # as the location has been changed by upstream +# K_KDBUS_AVAILABLE - If set, the ebuild contains the option of installing the +# kdbus patch. This patch is not installed without the 'kdbus' +# and 'experimental' use flags. # H_SUPPORTEDARCH - this should be a space separated list of ARCH's which # can be supported by the headers ebuild @@ -451,6 +454,10 @@ DESCRIPTION="Sources based on the Linux Kernel." IUSE="symlink build" + if [[ -n K_KDBUS_AVAILABLE ]]; then + IUSE="${IUSE} kdbus" + fi + # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]] ; then # Bug #359865, force a call to detect_version if needed @@ -1013,6 +1020,11 @@ UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" fi 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" + fi fi done
