Update the Xen homepage url, remove older kernels

svn path=/xen/; revision=26

5 files changed, 56 insertions, 33 deletions

diff --git a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
index 98f6029..b20f8c4 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
@@ -5,7 +5,7 @@
 inherit flag-o-matic distutils eutils multilib
 
 DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.sourceforge.net"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
 MY_PV=${PV/_p/_}
 SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
 S="${WORKDIR}/xen-${MY_PV}-src"
diff --git a/app-emulation/xen/xen-3.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild
index 71de120..1e2d91f 100644
--- a/app-emulation/xen/xen-3.0.4_p1.ebuild
+++ b/app-emulation/xen/xen-3.0.4_p1.ebuild
@@ -5,7 +5,7 @@
 inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.sourceforge.net"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
 MY_PV=${PV/_p/_}
 SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
 S="${WORKDIR}/xen-${MY_PV}-src"
@@ -18,7 +18,8 @@ IUSE="debug custom-cflags pae hardened"
 RDEPEND="|| ( sys-boot/grub
 		sys-boot/grub-static )
 		sys-kernel/xen-sources"
-PDEPEND="~app-emulation/xen-tools-${PV}"
+PDEPEND="~app-emulation/xen-tools-${PV}
+		 >=sys-kernel/xen-sources-2.6.16.33"
 
 RESTRICT="test"
 
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild
new file mode 100644
index 0000000..7d2c3fe
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+inherit kernel-2 eutils
+detect_arch
+detect_version
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+XEN_VERSION="3.0.4_1"
+MY_P="xen-${XEN_VERSION}-src"
+XEN_URI="http://bits.xensource.com/oss-xen/release/${XEN_VERSION/_/-}/src.tgz/${MY_P}.tgz"
+SRC_URI="${KERNEL_URI} ${XEN_URI}"
+
+KEYWORDS="~x86 ~amd64"
+
+src_unpack() {
+	kernel-2_src_unpack
+	cd "${WORKDIR}"
+	unpack "${MY_P}.tgz"
+
+	cd "${WORKDIR}"/${MY_P}
+	sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \
+		-i linux-2.6-xen-sparse/mkbuildtree || die
+
+	# Don't munge up EXTRAVERSION
+	sed -e 's:$$(XENGUEST)::' -i buildconfigs/mk.linux-2.6-xen
+
+	# No need to run oldconfig
+	sed -e 's:$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig::' \
+		-i buildconfigs/mk.linux-2.6-xen
+
+	# Move the kernel sources to pristine-linux-${PV}
+	mv "${WORKDIR}"/linux-${KV} pristine-linux-${PV} || die
+	touch pristine-linux-${PV}/.valid-pristine || die
+	
+	make LINUX_SRC_PATH=${DISTDIR} XEN_ROOT=${WORKDIR}/${MY_P} \
+		-f buildconfigs/mk.linux-2.6-xen \
+		linux-${PV}-xen/include/linux/autoconf.h || die
+	mv linux-${PV}-xen "${WORKDIR}"/linux-${KV} || die
+	rm -rf "${WORKDIR}/${MY_P}" || die
+}
+
+pkg_postinst() {
+	postinst_sources
+
+	elog "This kernel uses the linux patches released with Xen ${XEN_VERSION}"
+	elog "It may not work with other versions of Xen"
+}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.46.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.46.ebuild
deleted file mode 100644
index 8f405d1..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.46.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-inherit kernel-2
-detect_version
-
-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"
-
-XEN_VERSION="3.0.4_1"
-XEN_BASE_KV="2.6.16.33"
-XEN_PATCH="patch-${XEN_BASE_KV}_to_xen-${XEN_VERSION}.bz2"
-# Change to gentoo mirror when pushed into portage:
-PATCH_URI="http://dev.gentoo.org/~marineam/files/xen/${XEN_PATCH}"
-SRC_URI="${KERNEL_URI} ${PATCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}"
-
-KEYWORDS="~x86 ~amd64"
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel uses the linux patches released with Xen 3.0.4"
-	elog "It claims to have a 3.0.2 compatibility option but it may not work."
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
index 8f405d1..debd816 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
@@ -8,7 +8,7 @@ inherit kernel-2
 detect_version
 
 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"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
 
 XEN_VERSION="3.0.4_1"
 XEN_BASE_KV="2.6.16.33"