Bump unstable and get rid of mkbuildtree patch for 2.6.12.6.

Package-Manager: portage-2.0.54

8 files changed, 26 insertions, 39 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index dea155b2a5fe..51b8b73a3033 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/xen-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.22 2006/02/24 13:18:11 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.23 2006/03/02 11:50:18 chrb Exp $
+
+*xen-sources-2.6.16_rc5 (02 Mar 2006)
+*xen-sources-2.6.12.6-r3 (02 Mar 2006)
+
+  02 Mar 2006; <chrb@gentoo.org> -files/mkbuildtree.patch,
+  -xen-sources-2.6.12.6-r2.ebuild, +xen-sources-2.6.12.6-r3.ebuild,
+  -xen-sources-2.6.16_rc3-r1.ebuild, +xen-sources-2.6.16_rc5.ebuild:
+  Bump unstable and get rid of mkbuildtree patch for 2.6.12.6.
 
   24 Feb 2006; <chrb@gentoo.org> xen-sources-2.6.12.6-r2.ebuild:
   fix depend, bug #123854
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index e9726553f6b2..662f31a0e3a0 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,7 +1,6 @@
-MD5 4e09e95c42ee33aaeecb43049a25bd3a ChangeLog 3367
-MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-sources-2.6.12.6-r2 63
-MD5 4aec07e76d19276c5548316bb81a5fb9 files/digest-xen-sources-2.6.16_rc3-r1 204
-MD5 2b3d2f6544952b8d49b77292ed16b249 files/mkbuildtree.patch 698
+MD5 404ef65b2dcbc097ce17d14b379edb0a ChangeLog 3705
+MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-sources-2.6.12.6-r3 63
+MD5 d1a3cf237dab5ddaafa58201760e554f files/digest-xen-sources-2.6.16_rc5 204
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 18ba13fca9a6bbccf929084d06612c0b xen-sources-2.6.12.6-r2.ebuild 1334
-MD5 edff3f486c9fb7244ce3f7c35de7ffd7 xen-sources-2.6.16_rc3-r1.ebuild 1531
+MD5 3a83e9e02e0e0674096669e45be2ca2c xen-sources-2.6.12.6-r3.ebuild 1398
+MD5 66012018210fa4b973dfce3f9f4b4199 xen-sources-2.6.16_rc5.ebuild 1423
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r2 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r3
index 2e700fc09ce3..2e700fc09ce3 100644
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r2
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r3
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc3-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc3-r1
deleted file mode 100644
index 32aaae104313..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
-MD5 ecfd157754bfdfa6dd03d28c8dc9b369 patch-2.6.16-rc3.bz2 5105594
-MD5 cebdc6f0523a64a7a2f218d947b2109e xen-unstable-8885.tar.bz2 3429557
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc5 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc5
new file mode 100644
index 000000000000..195ef534c24f
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16_rc5
@@ -0,0 +1,3 @@
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 5235021
+MD5 d8183137f5cffdb1078c675c8b05369e xen-unstable-9029.tar.bz2 3450223
diff --git a/sys-kernel/xen-sources/files/mkbuildtree.patch b/sys-kernel/xen-sources/files/mkbuildtree.patch
deleted file mode 100644
index 6174215fda18..000000000000
--- a/sys-kernel/xen-sources/files/mkbuildtree.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- linux-2.6-xen-sparse/mkbuildtree.orig	2005-10-07 19:04:20.000000000 +0100
-+++ linux-2.6-xen-sparse/mkbuildtree	2005-10-07 21:19:15.000000000 +0100
-@@ -104,14 +104,14 @@
- for i in `find . -type l`; do rm -f $i; done
- 
- # Create symlinks of files and directories which exist in the sparse source
--relative_lndir ${RS}
-+cp -dpPR ${RS}/* .
- rm -f mkbuildtree
- 
- # Create links to the shared definitions of the Xen interfaces.
- rm -rf ${AD}/include/asm-xen/xen-public
- mkdir  ${AD}/include/asm-xen/xen-public
- cd     ${AD}/include/asm-xen/xen-public
--relative_lndir ../../../${RS}/../xen/include/public
-+cp -dpPR ../../../${RS}/../xen/include/public/* .
- 
- # Arch-specific post-processing
- cd ${AD}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.6-r3.ebuild
index e9d74a06908b..58de4cbbc59f 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.12.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.ebuild,v 1.4 2006/02/24 13:18:11 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.6-r3.ebuild,v 1.1 2006/03/02 11:50:18 chrb Exp $
 
 ETYPE="sources"
 inherit kernel-2 eutils
@@ -26,7 +26,8 @@ RESTRICT="nostrip"
 src_unpack() {
 	unpack ${A}
 	cd ${MY_P}
-	epatch ${FILESDIR}/mkbuildtree.patch
+	sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \
+		-i linux-2.6-xen-sparse/mkbuildtree || die
 	# the echo is because the current sources seem to have no default for XEN_NETDEV_PIPELINED_TRANSMITTER
 	echo "n" | make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \
 		linux-2.6.12-xen/include/linux/autoconf.h
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16_rc3-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16_rc5.ebuild
index a877bf77c65f..aeeaab6e3521 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.16_rc3-r1.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16_rc3-r1.ebuild,v 1.1 2006/02/21 09:48:59 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16_rc5.ebuild,v 1.1 2006/03/02 11:50:18 chrb Exp $
 
 ETYPE="sources"
 inherit kernel-2 eutils
@@ -12,11 +12,9 @@ EXTRAVERSION=".${KV_EXTRA}-xen"
 
 DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
 HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html"
-REV="8885"
+REV="9029"
 MY_P="xen-unstable-${REV}"
-#MY_P="xen-3.0.1"
 SRC_URI="${KERNEL_URI} mirror://gentoo/${MY_P}.tar.bz2"
-#SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.1-src.tgz"
 
 KEYWORDS="~x86 ~amd64"
 DEPEND="=app-emulation/xen-${REV}"
@@ -29,11 +27,11 @@ src_unpack() {
 	sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \
 		-i linux-2.6-xen-sparse/mkbuildtree || die
 	# the echo is because the current sources seem to have no default for XEN_NETDEV_PIPELINED_TRANSMITTER
+	LINUX=linux-${PV/_/-}-xen
 	echo "n" | make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \
-		linux-2.6.16-rc3-xen/include/linux/autoconf.h || die
-	t=linux-2.6.16-rc3-xen
-	cp XEN-VERSION ${t}
-	mv ${t} ${WORKDIR}/linux-${KV}
+		${LINUX}/include/linux/autoconf.h || die
+	cp XEN-VERSION ${LINUX}
+	mv ${LINUX} ${WORKDIR}/linux-${KV}
 	rm -rf ${WORKDIR}/${MY_P}
 }