dont install two source trees, dont set ARCH, #129431

Package-Manager: portage-2.1_pre7-r5

5 files changed, 28 insertions, 23 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index d0a595bb5a75..5ea23fe2d2dd 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.27 2006/04/10 08:09:19 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.28 2006/04/10 12:02:56 chrb Exp $
+
+*xen-sources-2.6.16-r1 (10 Apr 2006)
+
+  10 Apr 2006; <chrb@gentoo.org> -xen-sources-2.6.16.ebuild,
+  +xen-sources-2.6.16-r1.ebuild:
+  dont install two source trees, dont set ARCH, #129431
 
   10 Apr 2006; <chrb@gentoo.org> files/digest-xen-sources-2.6.16, Manifest:
   new digest
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index 004156caff95..f8ea532ba3b0 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 961a7a75ab0271056a4cc229f81dd92d ChangeLog 4196
-RMD160 719ebe5cc3f9bc350169b4f1c7b58f807f728991 ChangeLog 4196
-SHA256 593133ce34147e4b5b3783543a562c6397ebcf0ff6dae3bbcbf36174f23c09e7 ChangeLog 4196
+MD5 9fa98677db7b670e36ff1bd4d8d93ae2 ChangeLog 4385
+RMD160 28f54c459fe85bf40a6b9144035bc762321cde64 ChangeLog 4385
+SHA256 7644713bcc1c8711cd950b2ddb729e503cfbd9213de6fd1b88eb51d38acc5b16 ChangeLog 4385
 MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-sources-2.6.12.6-r3 63
 RMD160 897e07562d499a7ac4f74f324031738527ae38e2 files/digest-xen-sources-2.6.12.6-r3 63
 SHA256 b503a88ad3b4457384161967969c3d341ab7f3b09bf0925e925270650fb8d378 files/digest-xen-sources-2.6.12.6-r3 63
-MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-sources-2.6.16 235
-RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-sources-2.6.16 235
-SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-sources-2.6.16 235
+MD5 88bb5a61119cb53b85e996c007bf12f0 files/digest-xen-sources-2.6.16-r1 482
+RMD160 f878c1e36f9e70d0f99d1dc54ea93317a842e2cd files/digest-xen-sources-2.6.16-r1 482
+SHA256 68c78eb16ca1bd7d1a7a0ac82c61fd03f81a373d6d7f72bc3f4e301f7e21434d files/digest-xen-sources-2.6.16-r1 482
 MD5 d1a3cf237dab5ddaafa58201760e554f files/digest-xen-sources-2.6.16_rc5 204
 RMD160 5d0ee938d66218bba752bb8ab1c900b910f7e872 files/digest-xen-sources-2.6.16_rc5 204
 SHA256 f8cf6fc2d6c39e45bcfd5f11ac35420142a80f10707bfc046b573b83535e5b40 files/digest-xen-sources-2.6.16_rc5 204
@@ -16,9 +16,9 @@ SHA256 3482ccebd39bcc165316fdbcc79ad9f01922ce91798a7d83455e884e696ac658 metadata
 MD5 14f412b7909b133449f3f8300cc684a1 xen-sources-2.6.12.6-r3.ebuild 1401
 RMD160 c88a933d6b32cab8de74f12e6781d69ed822aa45 xen-sources-2.6.12.6-r3.ebuild 1401
 SHA256 08ad8c122c72cacf13de8c8bed4033b4b852f02ca9547282b59879f892be9fa8 xen-sources-2.6.12.6-r3.ebuild 1401
-MD5 0a7617874d68263ed37a74aa747a16f6 xen-sources-2.6.16.ebuild 1485
-RMD160 35d5ebbce25308502939a8a995b762ccfb335340 xen-sources-2.6.16.ebuild 1485
-SHA256 d08f26831b40c3a249b1d670c9d4972f4c72914045d562f1c646a03f1d84451f xen-sources-2.6.16.ebuild 1485
+MD5 3452dc878ed5863242d17da10f6b239c xen-sources-2.6.16-r1.ebuild 1260
+RMD160 f7e62e5a44ed1f783eefbdf44782b27432fccdd8 xen-sources-2.6.16-r1.ebuild 1260
+SHA256 aeb64e35826f7fe91129e0d7b3b6944dd44a3e341ea41792105bafd5e0ac6870 xen-sources-2.6.16-r1.ebuild 1260
 MD5 b9e618cf2a79108e4ddc4f491234c811 xen-sources-2.6.16_rc5.ebuild 1434
 RMD160 5ce03b03742069e54ff85d8b50e92fa81650b0fd xen-sources-2.6.16_rc5.ebuild 1434
 SHA256 864d6b395f492edd57ed087ae7970df725f139ebb7fe4f03717e7aef47e4b037 xen-sources-2.6.16_rc5.ebuild 1434
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16
deleted file mode 100644
index 724d092d5489..000000000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621
-RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621
-SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16-r1
new file mode 100644
index 000000000000..a6d0c77ba751
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16-r1
@@ -0,0 +1,6 @@
+MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
+RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
+SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
+MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621
+RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621
+SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16-r1.ebuild
index 27e0b06dd2f0..1d09d32678b5 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16-r1.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.ebuild,v 1.1 2006/04/09 21:28:41 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16-r1.ebuild,v 1.1 2006/04/10 12:02:56 chrb Exp $
 
 ETYPE="sources"
 inherit kernel-2 eutils
@@ -15,10 +15,9 @@ HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html"
 #REV="8738"
 #MY_P="xen-3.0-testing-${REV}"
 XEN_VERSION="3.0.2"
-KERNEL_VERSION="2.6.16"
 MY_P="xen-${XEN_VERSION}"
 #SRC_URI="${KERNEL_URI} mirror://gentoo/${MY_P}.tar.bz2"
-SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${XEN_VERSION}-src.tgz"
+SRC_URI="${KERNEL_URI} http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${XEN_VERSION}-src.tgz"
 
 KEYWORDS="~x86 ~amd64"
 DEPEND="~app-emulation/xen-${XEN_VERSION}"
@@ -30,13 +29,10 @@ src_unpack() {
 	cd ${MY_P}
 	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-${KERNEL_VERSION}-xen/include/linux/autoconf.h
-	t=linux-${KERNEL_VERSION}-xen
-#	cp XEN-VERSION ${t}
-	echo ARCH=xen | cat - ${t}/Makefile >${t}/Makefile.0
-	mv ${t}/Makefile.0 ${t}/Makefile
+	make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \
+		linux-${PV}-xen/include/linux/autoconf.h
+	t=linux-${PV}-xen
 	mv ${t} ${WORKDIR}/linux-${KV}
+	rm -rf ${WORKDIR}/linux-${PV}
 	rm -rf ${WORKDIR}/${MY_P}
 }