Version bump to 2.6.15-bs1 and genpatches-2.6.15-3

Package-Manager: portage-2.1_pre3-r1

7 files changed, 19 insertions, 43 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 7e688c3493b7..a96e4d261530 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.73 2005/12/29 20:27:54 dsd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.74 2006/01/21 20:38:30 dsd Exp $
+
+*usermode-sources-2.6.15 (21 Jan 2006)
+
+  21 Jan 2006; Daniel Drake <dsd@gentoo.org>
+  -usermode-sources-2.6.12-r2.ebuild, -usermode-sources-2.6.14.ebuild,
+  +usermode-sources-2.6.15.ebuild:
+  Version bump to 2.6.15-bs1 and genpatches-2.6.15-3
 
 *usermode-sources-2.6.14-r1 (29 Dec 2005)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 3aa527322383..984fee39cf99 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,8 +1,6 @@
-MD5 8d167b37793d8d1b0d11ff640fa9d9b5 ChangeLog 21340
-MD5 43a33a8da2581ad2cd22c793d81605c8 files/digest-usermode-sources-2.6.12-r2 213
-MD5 3d6960e2a809ef5a0c675e36cc5b43a1 files/digest-usermode-sources-2.6.14 210
+MD5 9cd974f5baad8a186532a0108c7d93bb ChangeLog 21585
 MD5 d78e5b1f5584d4472749b448ef8af871 files/digest-usermode-sources-2.6.14-r1 211
+MD5 dd822ef1a5ac761de98c69df60ff9767 files/digest-usermode-sources-2.6.15 211
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 d6c0fcb6a2420c8ae61c497be024ed47 usermode-sources-2.6.12-r2.ebuild 1001
 MD5 d6c0935b79e4dcc642457973b9a25e83 usermode-sources-2.6.14-r1.ebuild 886
-MD5 fc68a5682b821947396232b2a967e617 usermode-sources-2.6.14.ebuild 883
+MD5 3675218f52f1ab867d2709b29e9fabf6 usermode-sources-2.6.15.ebuild 883
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.12-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.12-r2
deleted file mode 100644
index 6997888ab17d..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.12-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 41af3b58c0fce0f3ab186c713d6fbdce genpatches-2.6.12-13.base.tar.bz2 49335
-MD5 b671377bfea38e983e300ad566587caf uml-2.6.12-bs11.patch.bz2 21543
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.14 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.14
deleted file mode 100644
index ea214d2b912e..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-MD5 aea18c4938456c90a32fc482ad901350 genpatches-2.6.14-1.base.tar.bz2 5500
-MD5 f7b9c6299bd26642214a00d31d33d9af uml-2.6.14-bs1.patch.bz2 13989
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15
new file mode 100644
index 000000000000..5d7e9894f4e2
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.15
@@ -0,0 +1,3 @@
+MD5 1d5fbdacd817651e4ff4f8ec178ed2d2 genpatches-2.6.15-3.base.tar.bz2 16532
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 83e7e427eea23c489d6f7419db82fd12 uml-2.6.15-bs1.patch.bz2 16326
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.12-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.12-r2.ebuild
deleted file mode 100644
index 6bd19cf13e39..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.12-r2.ebuild
+++ /dev/null
@@ -1,26 +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/usermode-sources/usermode-sources-2.6.12-r2.ebuild,v 1.1 2005/08/23 14:41:08 dsd Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
-inherit kernel-2
-detect_version
-
-UML_VER="uml-2.6.12-bs11"
-UNIPATCH_LIST="${DISTDIR}/${UML_VER}.patch.bz2"
-
-#The uml-2.6.12-bs11 patch has a collision with the 2.6.12.3 patch
-UNIPATCH_EXCLUDE="1003_linux-2.6.12.3.patch"
-
-DESCRIPTION="Full sources for the User Mode Linux kernel"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
-	http://www.user-mode-linux.org/~blaisorblade/patches/guest/${UML_VER}/${UML_VER}.patch.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-KEYWORDS="~x86"
-
-K_EXTRAEINFO="Since you are using UML, you may want to read the Gentoo Linux
-Developer's guide to system testing with User-Mode Linux that
-can be found at http://www.gentoo.org/doc/en/uml.xml"
-
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.14.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.15.ebuild
index 108d58cd4e25..ff2b11c07231 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.14.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.15.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.14.ebuild,v 1.1 2005/11/05 12:30:47 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.15.ebuild,v 1.1 2006/01/21 20:38:30 dsd Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="3"
 inherit kernel-2
 detect_version
 
-UML_VER="uml-2.6.14-bs1"
+UML_VER="uml-2.6.15-bs1"
 UNIPATCH_LIST="${DISTDIR}/${UML_VER}.patch.bz2"
 
 DESCRIPTION="Full sources for the User Mode Linux kernel"