Version 3 isn't really different from 2.6, therefore it can use the same virtual. As discussed on gentoo-kernel mailing list. Fixes bug 376461. Remove xrc USE flag.

(Portage version: 2.1.10.7/cvs/Linux x86_64)

4 files changed, 26 insertions, 59 deletions

diff --git a/virtual/linux-sources/ChangeLog b/virtual/linux-sources/ChangeLog
index 415f50f88231..d078c1abcefd 100644
--- a/virtual/linux-sources/ChangeLog
+++ b/virtual/linux-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for virtual/linux-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/ChangeLog,v 1.3 2011/07/25 14:07:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/ChangeLog,v 1.4 2011/07/26 13:16:41 ulm Exp $
+
+  26 Jul 2011; Ulrich Mueller <ulm@gentoo.org> linux-sources-2.6.ebuild,
+  -linux-sources-3.ebuild, metadata.xml:
+  Version 3 isn't really different from 2.6, therefore it can use the same
+  virtual. As discussed on gentoo-kernel mailing list. Fixes bug 376461.
+  Remove xrc USE flag.
 
 *linux-sources-3 (25 Jul 2011)
 
diff --git a/virtual/linux-sources/linux-sources-2.6.ebuild b/virtual/linux-sources/linux-sources-2.6.ebuild
index 5f430d38cc2c..b3edbba8bd7c 100644
--- a/virtual/linux-sources/linux-sources-2.6.ebuild
+++ b/virtual/linux-sources/linux-sources-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/linux-sources-2.6.ebuild,v 1.2 2011/06/30 21:46:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/linux-sources-2.6.ebuild,v 1.3 2011/07/26 13:16:41 ulm Exp $
 
 EAPI=2
 
@@ -11,26 +11,26 @@ SRC_URI=""
 LICENSE=""
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="hardened xrc"
+IUSE="hardened"
 
 DEPEND=""
 RDEPEND="|| (
-		hardened? ( =sys-kernel/hardened-sources-2.6* )
-		xrc? ( =sys-kernel/cluster-sources-2.6* )
-		=sys-kernel/gentoo-sources-2.6*
-		=sys-kernel/vanilla-sources-2.6*
-		=sys-kernel/cell-sources-2.6*
-		=sys-kernel/ck-sources-2.6*
-		=sys-kernel/git-sources-2.6*
-		=sys-kernel/hardened-sources-2.6*
-		=sys-kernel/mips-sources-2.6*
-		=sys-kernel/mm-sources-2.6*
-		=sys-kernel/openvz-sources-2.6*
-		=sys-kernel/pf-sources-2.6*
-		=sys-kernel/tuxonice-sources-2.6*
-		=sys-kernel/usermode-sources-2.6*
+		hardened? ( >=sys-kernel/hardened-sources-2.6 )
+		>=sys-kernel/gentoo-sources-2.6
+		>=sys-kernel/vanilla-sources-2.6
+		>=sys-kernel/cell-sources-2.6
+		>=sys-kernel/ck-sources-2.6
+		>=sys-kernel/cluster-sources-2.6
+		>=sys-kernel/git-sources-2.6
+		>=sys-kernel/hardened-sources-2.6
+		>=sys-kernel/mips-sources-2.6
+		>=sys-kernel/mm-sources-2.6
+		>=sys-kernel/openvz-sources-2.6
+		>=sys-kernel/pf-sources-2.6
+		>=sys-kernel/tuxonice-sources-2.6
+		>=sys-kernel/usermode-sources-2.6
 		sys-kernel/vserver-sources
-		=sys-kernel/xbox-sources-2.6*
-		=sys-kernel/xen-sources-2.6*
-		=sys-kernel/zen-sources-2.6*
+		>=sys-kernel/xbox-sources-2.6
+		>=sys-kernel/xen-sources-2.6
+		>=sys-kernel/zen-sources-2.6
 	)"
diff --git a/virtual/linux-sources/linux-sources-3.ebuild b/virtual/linux-sources/linux-sources-3.ebuild
deleted file mode 100644
index 8ba81080512c..000000000000
--- a/virtual/linux-sources/linux-sources-3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/linux-sources-3.ebuild,v 1.1 2011/07/25 14:07:27 ssuominen Exp $
-
-EAPI=2
-
-DESCRIPTION="Virtual for Linux kernel sources"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="hardened xrc"
-
-DEPEND=""
-RDEPEND="|| (
-		hardened? ( =sys-kernel/hardened-sources-3* )
-		xrc? ( =sys-kernel/cluster-sources-3* )
-		=sys-kernel/gentoo-sources-3*
-		=sys-kernel/vanilla-sources-3*
-		=sys-kernel/cell-sources-3*
-		=sys-kernel/ck-sources-3*
-		=sys-kernel/git-sources-3*
-		=sys-kernel/hardened-sources-3*
-		=sys-kernel/mips-sources-3*
-		=sys-kernel/mm-sources-3*
-		=sys-kernel/openvz-sources-3*
-		=sys-kernel/pf-sources-3*
-		=sys-kernel/tuxonice-sources-3*
-		=sys-kernel/usermode-sources-3*
-		sys-kernel/vserver-sources
-		=sys-kernel/xbox-sources-3*
-		=sys-kernel/xen-sources-3*
-		=sys-kernel/zen-sources-3*
-	)"
diff --git a/virtual/linux-sources/metadata.xml b/virtual/linux-sources/metadata.xml
index fa997a6122ea..8ca34864ea76 100644
--- a/virtual/linux-sources/metadata.xml
+++ b/virtual/linux-sources/metadata.xml
@@ -5,7 +5,4 @@
 <maintainer>
   <email>ulm@gentoo.org</email>
 </maintainer>
-<use>
-	<flag name='xrc'>Add support for infiniband xrc</flag>
-</use>
 </pkgmetadata>