add revision to install dir, bug #110752

(Portage version: 2.0.51.22-r3)

6 files changed, 8 insertions, 77 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 47b8382e1b2f..3396bf8bb25c 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/xen-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.11 2005/11/28 11:48:10 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.12 2005/11/30 20:44:56 chrb Exp $
+
+  30 Nov 2005; <chrb@gentoo.org> -xen-sources-2.6.12.5-r2.ebuild,
+  -xen-sources-2.6.12.5-r3.ebuild, xen-sources-2.6.12.5-r4.ebuild:
+  add revision to install dir, bug #110752
 
 *xen-sources-2.6.12.5-r4 (28 Nov 2005)
 
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r2 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r2
deleted file mode 100644
index ec037b0c0f59..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cff8abb6a5a992018cbcf382ff95c577 patch-2.6.12.5.bz2 14588
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 960e3bd28b9e2802d158d14dada74300 xen-unstable-20051027.tar.bz2 3419934
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r3 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r3
deleted file mode 100644
index 3a1040f8d115..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.12.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cff8abb6a5a992018cbcf382ff95c577 patch-2.6.12.5.bz2 14588
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 38bf7a5c9aa2c14582b8c5d16612f28d xen-unstable-20051122.tar.bz2 3510661
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r2.ebuild
deleted file mode 100644
index e3b75111b9e7..000000000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r2.ebuild
+++ /dev/null
@@ -1,34 +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/xen-sources/xen-sources-2.6.12.5-r2.ebuild,v 1.1 2005/10/27 16:42:40 chrb Exp $
-
-ETYPE="sources"
-inherit kernel-2 eutils
-detect_arch
-detect_version
-
-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"
-DATE="20051027"
-SRC_URI="${KERNEL_URI} mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
-
-KEYWORDS="~x86"
-DEPEND="=app-emulation/xen-3.0.0_pre${DATE}"
-S="${WORKDIR}"
-RESTRICT="nostrip"
-
-src_unpack() {
-	unpack xen-unstable-${DATE}.tar.bz2
-	cd xen-unstable-${DATE}
-	epatch ${FILESDIR}/mkbuildtree.patch
-	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}
-	echo ARCH=xen | cat - ${t}/Makefile | sed -e "s/-xen/.5-xen/" >${t}/Makefile.0
-	mv ${t}/Makefile.0 ${t}/Makefile
-	mv ${t} ${WORKDIR}/linux-2.6.12.5-xen
-	rm -rf ${WORKDIR}/xen-unstable-${DATE}
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r3.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r3.ebuild
deleted file mode 100644
index d27d733df516..000000000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r3.ebuild
+++ /dev/null
@@ -1,34 +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/xen-sources/xen-sources-2.6.12.5-r3.ebuild,v 1.1 2005/11/22 22:13:20 chrb Exp $
-
-ETYPE="sources"
-inherit kernel-2 eutils
-detect_arch
-detect_version
-
-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"
-DATE="20051122"
-SRC_URI="${KERNEL_URI} mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
-
-KEYWORDS="~x86"
-DEPEND="=app-emulation/xen-3.0.0_pre${DATE}"
-S="${WORKDIR}"
-RESTRICT="nostrip"
-
-src_unpack() {
-	unpack xen-unstable-${DATE}.tar.bz2
-	cd xen-unstable-${DATE}
-	epatch ${FILESDIR}/mkbuildtree.patch
-	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}
-	echo ARCH=xen | cat - ${t}/Makefile | sed -e "s/-xen/.5-xen/" >${t}/Makefile.0
-	mv ${t}/Makefile.0 ${t}/Makefile
-	mv ${t} ${WORKDIR}/linux-2.6.12.5-xen
-	rm -rf ${WORKDIR}/xen-unstable-${DATE}
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r4.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r4.ebuild
index 323283a6013d..628f589b7c75 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.12.5-r4.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.12.5-r4.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 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.5-r4.ebuild,v 1.1 2005/11/28 11:48:10 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.12.5-r4.ebuild,v 1.2 2005/11/30 20:44:56 chrb Exp $
 
 ETYPE="sources"
 inherit kernel-2 eutils
 detect_arch
 detect_version
+[ "${PR}" == "r0" ] && KV=${PV/_/-}-xen || KV=${PV/_/-}-xen-${PR}
 
 EXTRAVERSION=".${KV_EXTRA}-xen"
 
@@ -29,6 +30,6 @@ src_unpack() {
 	cp XEN-VERSION ${t}
 	echo ARCH=xen | cat - ${t}/Makefile | sed -e "s/-xen/.5-xen/" >${t}/Makefile.0
 	mv ${t}/Makefile.0 ${t}/Makefile
-	mv ${t} ${WORKDIR}/linux-2.6.12.5-xen
+	mv ${t} ${WORKDIR}/linux-${KV}
 	rm -rf ${WORKDIR}/xen-unstable-${DATE}
 }