use official tarball

(Portage version: 2.0.54)

5 files changed, 20 insertions, 15 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 49c0bdbe0f7f..0c17a824c7c8 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2006/02/04 19:05:00 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.18 2006/02/05 10:39:07 chrb Exp $
+
+*xen-sources-2.6.12.6-r2 (05 Feb 2006)
+
+  05 Feb 2006; <chrb@gentoo.org> -xen-sources-2.6.12.6-r1.ebuild,
+  +xen-sources-2.6.12.6-r2.ebuild:
+  use official tarball
 
   04 Feb 2006; <chrb@gentoo.org> -xen-sources-2.6.12.6.ebuild,
   xen-sources-2.6.12.6-r1.ebuild:
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index ff478f9fc833..53cce08eb603 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 e17ca4285d5f6969f7fabfed06d38515 ChangeLog 2691
-MD5 36370b6ab2e5c5cf4e407e8b9a7ff7b5 files/digest-xen-sources-2.6.12.6-r1 203
+MD5 ae282247c3273ba70a9f63968d6b6cc1 ChangeLog 2856
+MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-sources-2.6.12.6-r2 63
 MD5 2b3d2f6544952b8d49b77292ed16b249 files/mkbuildtree.patch 698
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 a2faab9574adc3ca0f1d23932e961765 xen-sources-2.6.12.6-r1.ebuild 1239
+MD5 796c72cd7526ae040406bc51b7d23321 xen-sources-2.6.12.6-r2.ebuild 1219
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r1
deleted file mode 100644
index 6af5ff14dd5a..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 5a17a6facda3a81c760adf29970b9e95 patch-2.6.12.6.bz2 15545
-MD5 479e40ab4cd2d972d39e56ca3998ec84 xen-3.0-testing-8738.tar.bz2 3278369
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-r2
new file mode 100644
index 000000000000..2e700fc09ce3
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.6-r2
@@ -0,0 +1 @@
+MD5 d30f17294957d8c0234f8a4ce6d68671 xen-3.0.1-src.tgz 4631469
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.6-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.ebuild
index 539fb0ec3cf9..ffe87e0d21ea 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.6-r1.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.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-r1.ebuild,v 1.2 2006/02/04 19:05:00 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.6-r2.ebuild,v 1.1 2006/02/05 10:39:07 chrb Exp $
 
 ETYPE="sources"
 inherit kernel-2 eutils
@@ -12,9 +12,11 @@ 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="8738"
-MY_P="xen-3.0-testing-${REV}"
-SRC_URI="${KERNEL_URI} mirror://gentoo/${MY_P}.tar.bz2"
+#REV="8738"
+#MY_P="xen-3.0-testing-${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-3.0.0"
@@ -22,14 +24,13 @@ S="${WORKDIR}"
 RESTRICT="nostrip"
 
 src_unpack() {
-	unpack ${MY_P}.tar.bz2
+	unpack ${A}
 	cd ${MY_P}
 	epatch ${FILESDIR}/mkbuildtree.patch
-	# 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 \
+	make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \
 		linux-2.6.12-xen/include/linux/autoconf.h
 	t=linux-2.6.12-xen
-	cp XEN-VERSION ${t}
+#	cp XEN-VERSION ${t}
 	echo ARCH=xen | cat - ${t}/Makefile >${t}/Makefile.0
 	mv ${t}/Makefile.0 ${t}/Makefile
 	mv ${t} ${WORKDIR}/linux-${KV}