Version bump + small tidy up

(Portage version: 2.0.51.19)

8 files changed, 15 insertions, 27 deletions

diff --git a/sys-kernel/vanilla-sources/ChangeLog b/sys-kernel/vanilla-sources/ChangeLog
index 36e6250a3ee5..f308872ab0b5 100644
--- a/sys-kernel/vanilla-sources/ChangeLog
+++ b/sys-kernel/vanilla-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/vanilla-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.60 2005/04/05 19:47:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.61 2005/04/13 12:47:04 johnm Exp $
+
+*vanilla-sources-2.6.11.7 (13 Apr 2005)
+*vanilla-sources-2.4.30 (13 Apr 2005)
+
+  13 Apr 2005; John Mylchreest <johnm@gentoo.org>
+  -vanilla-sources-2.4.26.ebuild, +vanilla-sources-2.4.30.ebuild,
+  -vanilla-sources-2.6.11.6.ebuild, +vanilla-sources-2.6.11.7.ebuild,
+  -vanilla-sources-2.6.12_rc1.ebuild:
+  Bumping 2.4/2.6. Also conveniently closes #88369
 
 *vanilla-sources-2.6.12_rc2 (05 Apr 2005)
 
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.26 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.26
deleted file mode 100644
index b3a3b9bad206..000000000000
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.30 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.30
new file mode 100644
index 000000000000..806b5618c2c0
--- /dev/null
+++ b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.30
@@ -0,0 +1 @@
+MD5 75d8ce40a3668603017cd186909efe8d linux-2.4.30.tar.bz2 31136728
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.11.6 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.11.7
index 3d8f18a53302..8a5d27ea6a75 100644
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.11.6
+++ b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.11.7
@@ -1,2 +1,2 @@
-MD5 e3c197b36659759f47fc1a3bd15b5c8e patch-2.6.11.6.bz2 8619
+MD5 9938022f8d9f1ae9f1627832e1ca9212 patch-2.6.11.7.bz2 10906
 MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.12_rc1 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.12_rc1
deleted file mode 100644
index 39c277a860e7..000000000000
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.6.12_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4a0ad3e1dc96d4a7bd93856df6c7adab patch-2.6.12-rc1.bz2 2463509
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.30.ebuild
index f718fcb41bc1..5433e3436352 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.26.ebuild,v 1.7 2005/01/12 23:13:38 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.30.ebuild,v 1.1 2005/04/13 12:47:04 johnm Exp $
 
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
@@ -11,4 +11,4 @@ detect_version
 DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="http://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
-KEYWORDS="x86 -ppc sparc alpha amd64"
+KEYWORDS="~x86 -ppc ~sparc ~alpha ~amd64"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.7.ebuild
index e9c1e03e701d..c64e8805077a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.6.ebuild,v 1.5 2005/04/05 22:22:20 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.6.11.7.ebuild,v 1.1 2005/04/13 12:47:04 johnm Exp $
 
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
@@ -15,4 +15,3 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI}"
 UNIPATCH_LIST="${ARCH_PATCH}"
 
 KEYWORDS="x86 ~ia64 ~ppc ~amd64 ~alpha ~arm ~ppc64"
-IUSE=""
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.6.12_rc1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.6.12_rc1.ebuild
deleted file mode 100644
index 2748189aa900..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.6.12_rc1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.6.12_rc1.ebuild,v 1.1 2005/03/28 14:48:50 brix Exp $
-
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-ETYPE="sources"
-inherit kernel-2
-detect_arch
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="http://www.kernel.org/"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}"
-UNIPATCH_LIST="${ARCH_PATCH}"
-
-KEYWORDS="~x86 ~ia64 ~ppc ~amd64 ~alpha ~arm"
-IUSE=""