diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 725e9d5333f8..c99e8c784c91 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.1686 2015/06/26 22:32:49 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1687 2015/06/27 00:50:55 mpagano Exp $ + + 27 Jun 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: + Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds. 26 Jun 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: Add the option to include the kdbus patchset into gentoo-sources. Default is diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c8c2b586e140..c75f66e79868 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -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.306 2015/06/26 22:32:49 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.307 2015/06/27 00:50:55 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -449,7 +449,7 @@ if [[ ${ETYPE} == sources ]]; then SLOT="${PVR}" DESCRIPTION="Sources based on the Linux Kernel." - IUSE="symlink build kdbus" + IUSE="symlink build" # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]] ; then @@ -1013,11 +1013,6 @@ unipatch() { 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 |