[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass

["Mike Pagano (mpagano)" <mpagano@gentoo.org>]

mpagano     15/06/27 00:50:55

  Modified:             ChangeLog kernel-2.eclass
  Log:
  Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds.

Revision  Changes    Path
1.1687               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1687&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1687&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1686&r2=1.1687

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1686
retrieving revision 1.1687
diff -u -r1.1686 -r1.1687
--- ChangeLog	26 Jun 2015 22:32:49 -0000	1.1686
+++ ChangeLog	27 Jun 2015 00:50:55 -0000	1.1687
@@ -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



1.307                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.307&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.307&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.306&r2=1.307

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- kernel-2.eclass	26 Jun 2015 22:32:49 -0000	1.306
+++ kernel-2.eclass	27 Jun 2015 00:50:55 -0000	1.307
@@ -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 @@
 
 	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_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