From 76eafdb9228df01df88b1b53291544ec86179b9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Tue, 26 Jul 2011 13:16:41 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- virtual/linux-sources/ChangeLog | 8 +++- virtual/linux-sources/Manifest | 15 ++++---- .../linux-sources/linux-sources-2.6.ebuild | 38 +++++++++---------- virtual/linux-sources/linux-sources-3.ebuild | 36 ------------------ virtual/linux-sources/metadata.xml | 3 -- 5 files changed, 33 insertions(+), 67 deletions(-) delete mode 100644 virtual/linux-sources/linux-sources-3.ebuild 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 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/Manifest b/virtual/linux-sources/Manifest index 0e8b2243b358..0075e93a4609 100644 --- a/virtual/linux-sources/Manifest +++ b/virtual/linux-sources/Manifest @@ -1,15 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 EBUILD linux-sources-2.4.ebuild 495 RMD160 aeace8ef87dccf5d5aaa196b850ec9d0e5942b7c SHA1 56fbf5cbd9d909c3f82ef9ce4b71281e4572e5b7 SHA256 fdb7141fcb800de7d73c40e35435f1ba57baf14e7a2b2769f076d46a66f1d3b6 -EBUILD linux-sources-2.6.ebuild 1061 RMD160 add1de41eb4242cef178e2a3daa9dc1df0302a30 SHA1 998c7f39c8d9464d26a3a44748e0cb3bf914187b SHA256 0511a10e41b4dd4d4b6ec8c44103ac0fe322297f536cc9cfd1e2059e27f71149 -EBUILD linux-sources-3.ebuild 1039 RMD160 4013be7a1fdffcd271a56146dce2d987c373a396 SHA1 e03e14a3b62297155d1969479f6bfa224a609621 SHA256 6b3b259b872649c6eaf3e23804d168f1237b5647aa28730c673fcd65ab07bd3e -MISC ChangeLog 782 RMD160 c975d678653bcaab88d1977abb82a1f73a31169d SHA1 d51db8fc6dbe30505637c789ab689597472dcaf1 SHA256 1250dd9facc4f25ba109cf2977c86c8bfd28fbc2f38faf3a65a23d0c34de0966 -MISC metadata.xml 292 RMD160 d7a8f601db69f03935fe2f3f5edaa0abb82a7200 SHA1 a90898b00e7210a3d61985fc1c7798bb9a8295a9 SHA256 ff86c34a3e42b6c8a71353dac70d58dd5299abbd737a4b54293302d9b80617ec +EBUILD linux-sources-2.6.ebuild 1045 RMD160 7352db3082cd02fa0e1f6769c2fac3b8cc850560 SHA1 5a5f0003903fa4c88515cb99cfd344214c41222f SHA256 4e1c27e8716065841ad2a2ba28505c68d89cd8defe8b66af32b28e7e60bf0f36 +MISC ChangeLog 1062 RMD160 5728c95665d30fb9a9f2c06900d83666d2eed83c SHA1 a3dbc68042b9b127ae33bacaae32abf314d8bf5e SHA256 71bacc648a63110e7f96f030d7442895650ead118fd8f88fbaa90b6a1869d514 +MISC metadata.xml 223 RMD160 0c98243dd50f5003369c4106e121634239fe82d3 SHA1 7eec52336746968073d1557b5437ea1f262128d2 SHA256 81397b5eb31af3dbcf2105207a21628be9a62fd03a105cc672ae99663b191a8c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk4teCsACgkQXkR9YqOcLPFo9wD+MlFO1N+zWzaDdPbr8haGYMEA -opdkXWzF4MfwQRZ7gMcA/iea4ZPolB9Y4ZD4VqWZEOjD1tv1L7dpvCWcQ/gfokeE -=ifdp +iEYEARECAAYFAk4uv2EACgkQOeoy/oIi7uzz/wCfTM76nxXZ4+sOHnuDqmm4hb90 +TvsAoMx3ev3EbNrQgliwmKULYhTEXKOj +=qQuq -----END PGP SIGNATURE----- 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 @@ ulm@gentoo.org - - Add support for infiniband xrc - -- 2.26.2