Bump xen to version 3.1.1

Package-Manager: portage-2.1.3.9

5 files changed, 135 insertions, 16 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 8d4c3093b1c5..a42bd9faeb57 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -55,6 +55,7 @@ RMD160 797b4db93fc54d217d7db98d2c408b03f993c47c files/xendomains.initd 2278
 SHA256 b0dd6c8e588ce76026488243dbe8d6adf9af7d8276fb268fcb439ba1ce59f756 files/xendomains.initd 2278
 DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
 DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
+DIST xen-3.1.1.tgz 6868014 RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 SHA1 203b51946dbcbfbdac506a718727ac8fdb2d4683 SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2
 EBUILD xen-tools-3.0.4_p1-r1.ebuild 6335 RMD160 604727bab5b20e6b81c65113251f53dc7ba8449c SHA1 620348fdeb27c1dea6ccd8f99adacf98e20c3309 SHA256 685d5ddcdb7ddced972ea89386d039464eeda4574c8ce5bb8303cb2ddf38c2f3
 MD5 f0ce63096d22fbd5f8cc7e01adea1ed2 xen-tools-3.0.4_p1-r1.ebuild 6335
 RMD160 604727bab5b20e6b81c65113251f53dc7ba8449c xen-tools-3.0.4_p1-r1.ebuild 6335
@@ -63,10 +64,14 @@ EBUILD xen-tools-3.1.0-r1.ebuild 6727 RMD160 3dcf37f8e54264284043e3770cc0f17ba3d
 MD5 a5828af91f8532b55eec7f3ed5020148 xen-tools-3.1.0-r1.ebuild 6727
 RMD160 3dcf37f8e54264284043e3770cc0f17ba3d8169e xen-tools-3.1.0-r1.ebuild 6727
 SHA256 390f6f8078f98e00ebedd5f77e2526d6d7c6a1da54861bc1abef72383b22e361 xen-tools-3.1.0-r1.ebuild 6727
-MISC ChangeLog 9261 RMD160 031856b4bfb48db0fee19c9bec5f97596987b7fe SHA1 0a9e03a2f54f7eb4fafa7a9f31876d5e8eefe878 SHA256 cd60ad981ed19d30ffa5f44d53a218ccbe7511043f181442ea4be56fbe0a69c6
-MD5 a55c2ed5a5ae19fec4952532339227c9 ChangeLog 9261
-RMD160 031856b4bfb48db0fee19c9bec5f97596987b7fe ChangeLog 9261
-SHA256 cd60ad981ed19d30ffa5f44d53a218ccbe7511043f181442ea4be56fbe0a69c6 ChangeLog 9261
+EBUILD xen-tools-3.1.1.ebuild 6595 RMD160 466f8aee1ad89628b4db2c86b743a4bb4850ef55 SHA1 dfc7cb0422e7c42e513806003f1a8f99a98b9160 SHA256 df7a30647e629a6b9454fbdba73648f91af9670c6814ac7a2faf83e201e8df1e
+MD5 ba72743f77dcfb597901e2ea5386cd46 xen-tools-3.1.1.ebuild 6595
+RMD160 466f8aee1ad89628b4db2c86b743a4bb4850ef55 xen-tools-3.1.1.ebuild 6595
+SHA256 df7a30647e629a6b9454fbdba73648f91af9670c6814ac7a2faf83e201e8df1e xen-tools-3.1.1.ebuild 6595
+MISC ChangeLog 9391 RMD160 6dc7ec766addb61c0a61a3178f3de14da17c2614 SHA1 ac81cb8322bd045a170e5d42ac1b3e8d75060afe SHA256 2dabd66fbb3c459bd71828a2f06f420b7eee682c8d28d6c4f7339494689de617
+MD5 49f95220ce8d88c3f7fa5787e8154ec9 ChangeLog 9391
+RMD160 6dc7ec766addb61c0a61a3178f3de14da17c2614 ChangeLog 9391
+SHA256 2dabd66fbb3c459bd71828a2f06f420b7eee682c8d28d6c4f7339494689de617 ChangeLog 9391
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -77,10 +82,13 @@ SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/di
 MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-tools-3.1.0-r1 235
 RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-tools-3.1.0-r1 235
 SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-tools-3.1.0-r1 235
+MD5 7a507c4f0b5864e5c1fc63947d75db65 files/digest-xen-tools-3.1.1 223
+RMD160 2c54489ac78687ede1e73b8949c1ad2d3a23da3c files/digest-xen-tools-3.1.1 223
+SHA256 fba65027f88a1e1a28e4a631bc4ba0b558fa5452d12aa10e6cda49a0a0c69f90 files/digest-xen-tools-3.1.1 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHAZRXiP+LossGzjARAsOpAKDX7NdHshSi+KmxyFMQTudUg6x9TACeO2MP
-MuCCqHKy6xl2SEwjyOsr0sk=
-=BPRj
+iD8DBQFHE7K+iP+LossGzjARAkYwAKDQUqbv+MWhFA+6pJrT8oqsrAM+fwCgmbGu
+DJJ9EkspZEiIFyQbCQls38E=
+=7pAC
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index afd8cfe69418..1c6b59937471 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.48 2007/08/27 17:19:12 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.49 2007/10/15 18:33:40 marineam Exp $
+
+*xen-3.1.1 (15 Oct 2007)
+
+  15 Oct 2007; Michael Marineau <marineam@gentoo.org> +xen-3.1.1.ebuild:
+  Version bump.
 
   27 Aug 2007; Michael Marineau <marineam@gentoo.org> xen-3.0.4_p1.ebuild,
   xen-3.1.0.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index fe12ac8a06a4..4827366880ca 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
 DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
+DIST xen-3.1.1.tgz 6868014 RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 SHA1 203b51946dbcbfbdac506a718727ac8fdb2d4683 SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2
 EBUILD xen-3.0.4_p1.ebuild 2565 RMD160 d0d79e91f517a6454a4bdf0d50fbc2b9233b119e SHA1 190e7dd5fe0e3e1cfc8adb059d23b4c115407617 SHA256 5f1a56971c8aad3c15769c32d12fb34916bc89cfb7684cd6b07aed6c597049aa
 MD5 bacccc2bd7cb9fb6878cba5d4c8ab90a xen-3.0.4_p1.ebuild 2565
 RMD160 d0d79e91f517a6454a4bdf0d50fbc2b9233b119e xen-3.0.4_p1.ebuild 2565
@@ -11,10 +12,14 @@ EBUILD xen-3.1.0.ebuild 2525 RMD160 6a63f2fdbf31a852a7a93089c4a7372d3e61c5b1 SHA
 MD5 fa2916292bb5dd459eb217e8d577bdf9 xen-3.1.0.ebuild 2525
 RMD160 6a63f2fdbf31a852a7a93089c4a7372d3e61c5b1 xen-3.1.0.ebuild 2525
 SHA256 79fd81652ce18349a9694b99a9cc91d3dc3bd04715579c2f26be2137907120ca xen-3.1.0.ebuild 2525
-MISC ChangeLog 8028 RMD160 d0445f53cd5cf2f24ebd166fcfff1d5ac051b051 SHA1 fe6ff2a4e667db2bfbbcb0f5197eaa1bf2c29bee SHA256 1bddc9689cf538f52d42af76e612a9a585606cfadc355fd3ad55df01059d1417
-MD5 2f4c1e78c3853c3fde64a6f25f53ba66 ChangeLog 8028
-RMD160 d0445f53cd5cf2f24ebd166fcfff1d5ac051b051 ChangeLog 8028
-SHA256 1bddc9689cf538f52d42af76e612a9a585606cfadc355fd3ad55df01059d1417 ChangeLog 8028
+EBUILD xen-3.1.1.ebuild 2707 RMD160 762a251549ba6e2195c79b9f928bac1f10faae0b SHA1 840432fefdd40d08df2beee1c7168c4647a6fdb8 SHA256 ee7956d8fdff715dd2c1baf12dfac7094b4499e4a8653dbee1885def103edf74
+MD5 bc29fcc071ca673e2e8defe7aa9212ad xen-3.1.1.ebuild 2707
+RMD160 762a251549ba6e2195c79b9f928bac1f10faae0b xen-3.1.1.ebuild 2707
+SHA256 ee7956d8fdff715dd2c1baf12dfac7094b4499e4a8653dbee1885def103edf74 xen-3.1.1.ebuild 2707
+MISC ChangeLog 8144 RMD160 25c6618ed9852c7cfb6214eb816eae95bfd4570e SHA1 9f485b94d715a6eed85c89cc4e871f737d03d623 SHA256 7125775f062b9c0a48812f7fc3fa894dffcc2474e2841d91dbba72b09a8b6aa2
+MD5 9142957eafc4e4077d22113bcafeb075 ChangeLog 8144
+RMD160 25c6618ed9852c7cfb6214eb816eae95bfd4570e ChangeLog 8144
+SHA256 7125775f062b9c0a48812f7fc3fa894dffcc2474e2841d91dbba72b09a8b6aa2 ChangeLog 8144
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -25,10 +30,13 @@ SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/di
 MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-3.1.0 235
 RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-3.1.0 235
 SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-3.1.0 235
+MD5 7a507c4f0b5864e5c1fc63947d75db65 files/digest-xen-3.1.1 223
+RMD160 2c54489ac78687ede1e73b8949c1ad2d3a23da3c files/digest-xen-3.1.1 223
+SHA256 fba65027f88a1e1a28e4a631bc4ba0b558fa5452d12aa10e6cda49a0a0c69f90 files/digest-xen-3.1.1 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG0weZiP+LossGzjARAif/AJoDKJJUikHXhZ5EvfmMGK4XlRlYNQCePVOI
-MMvU8bz10U6liNemG1klR6g=
-=TBxy
+iD8DBQFHE7KIiP+LossGzjARApRvAJ9/lN8JoDASny3x4wzt4XtdOGef3QCfet2E
+a9vK74NtEg4v/g6bK1hn3rE=
+=Pzak
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/files/digest-xen-3.1.1 b/app-emulation/xen/files/digest-xen-3.1.1
new file mode 100644
index 000000000000..e739866b2661
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.1.1
@@ -0,0 +1,3 @@
+MD5 d5bafac9c819206d6a85c11352cc90fd xen-3.1.1.tgz 6868014
+RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 xen-3.1.1.tgz 6868014
+SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2 xen-3.1.1.tgz 6868014
diff --git a/app-emulation/xen/xen-3.1.1.ebuild b/app-emulation/xen/xen-3.1.1.ebuild
new file mode 100644
index 000000000000..ee4ae38a5603
--- /dev/null
+++ b/app-emulation/xen/xen-3.1.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.1.ebuild,v 1.1 2007/10/15 18:33:40 marineam Exp $
+
+inherit mount-boot flag-o-matic
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+#SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz"
+#S="${WORKDIR}/xen-${PV}-src"
+
+# Temporary while we wait on the upstream tarball
+SRC_URI="http://dev.gentoo.org/~marineam/files/xen/xen-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug custom-cflags pae"
+
+RDEPEND="|| ( sys-boot/grub
+		sys-boot/grub-static )
+		>=sys-kernel/xen-sources-2.6.18"
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+	else
+		unset CFLAGS
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	echo
+	elog "Note: xen tools have been moved to app-emulation/xen-tools"
+
+	if use pae; then
+		echo
+		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
+}