Version bump to the Xen 3.2.1 release (bug #219339), thanks to Troy Bowman

for testig. Disable magic building of QEMU documentation (bug #192427).
Package-Manager: portage-2.1.5_rc4

4 files changed, 57 insertions, 19 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 75e17abb14cd..1ff79117ff0f 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.36 2008/02/08 22:17:46 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.37 2008/05/04 18:59:10 rbu Exp $
+
+*xen-tools-3.2.1 (04 May 2008)
+
+  04 May 2008; Robert Buchholz <rbu@gentoo.org>
+  +files/xen-tools-3.2.1-qemu-nodocs.patch, -xen-tools-3.1.2.ebuild,
+  +xen-tools-3.2.1.ebuild:
+  Version bump to the Xen 3.2.1 release (bug #219339), thanks to Troy Bowman
+  for testig. Disable magic building of QEMU documentation (bug #192427).
 
 *xen-tools-3.2.0 (08 Feb 2008)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 194f9be6aa03..3c41078c0c37 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,27 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
 AUX xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a
 AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223
 AUX xen-tools-3.1.0-xen-detect-nopie-fix.patch 385 RMD160 5ad84ac847c1eeeaa7aac2fbcfd3b476ee7c991d SHA1 bd59257c972b7cd976b4b1953ff44a43a1d2b003 SHA256 c8b7a0858001b15ff12cc652977eb7ada06b036a8c593fccac9015ce05c84816
 AUX xen-tools-3.1.3-network-bridge-broadcast.patch 490 RMD160 67a2a7f07e986b0c43f75ade5c073bbcfdae5fca SHA1 53171e6764c6018e529b805a98fa369d2568364b SHA256 1c971a0a81219b8626a25c2d135d51bc8108e7ac839794f356cc349386fe34e3
+AUX xen-tools-3.2.1-qemu-nodocs.patch 1377 RMD160 d20780a6ac4a9f2fee98523edd6701e6bc15951f SHA1 6d7cb96b5fd717291d9d18885bb7a6be869882e4 SHA256 f8dec919bb0187a71217643f302403de7d488729109e21349e5627b3bb569656
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef
 AUX xendomains.initd 2278 RMD160 797b4db93fc54d217d7db98d2c408b03f993c47c SHA1 4f23d42b6d400cf9b9915fdccf0f7dd86a67629a SHA256 b0dd6c8e588ce76026488243dbe8d6adf9af7d8276fb268fcb439ba1ce59f756
-DIST xen-3.1.2.tar.gz 6881935 RMD160 c0644576a3f5d8552c7359f53a29296458804d3b SHA1 82b31113b2ebbc0d958702a77e5a35b7e1a67a28 SHA256 711e97d8a4e711cd0d9e368999d83366ee93296d26034e773be15964e4f6422d
 DIST xen-3.1.3.tar.bz2 5852287 RMD160 df36208c8e709c61f2b4a74d18d2e81531ab4721 SHA1 5542d2bd07afaf80d70c85f7b75c6e6b432be08b SHA256 b94ab7a07269848dec8904625f348405c4af4ac7b579a402b2d830503ecd53a1
 DIST xen-3.2.0.tar.bz2 5452441 RMD160 4b3a144d6cc128ea4d523c9383f29b14587ba310 SHA1 23b962a79104769ed2e3293a279b285e2a27c36e SHA256 6f774a2dd55af81edb54b074ad3210438ab01568fe1c0b8eb68ad13ef1dd01e8
-EBUILD xen-tools-3.1.2.ebuild 6654 RMD160 d787a64d1c348ffebc1618cb143bcbb697f8ba0f SHA1 461d7f3a52f96e112427fbf16cd406c1e2d2fa92 SHA256 f31b38a1ae751e15fb0557cc09eaf1da84dd9296b0b384d9ae1b4af29cabb83c
+DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SHA1 753f3d79d7ae2175e78b261765a9935db6255996 SHA256 dc3c057acab2173330db88d1f1d0587caf5717a4a882b93694a1bc90c71ad12a
 EBUILD xen-tools-3.1.3.ebuild 6657 RMD160 908c386349e533e85e7ed3aaf30c21960da26d69 SHA1 240d5ee186ca824ea9ea8a727c7dc1460c4acd84 SHA256 f77bde05f6bfb6fb1b111b51837eec57872b0533219ddb300843aeb1733ff414
 EBUILD xen-tools-3.2.0.ebuild 6657 RMD160 c96aaa12d6c89da61bfde6d4134a812b8a571212 SHA1 5c9ed2bfacef74584631225c87b54d777c927221 SHA256 ccd1541da9a35eb9675ecf0cfcefc5497591508361e864d89e604f947795a8f2
-MISC ChangeLog 10891 RMD160 0f988ea276fd23e6267a2c2548850dbc679f54bf SHA1 d14aff095d2eb283ccd558bccf6c82c5da56d803 SHA256 e49816ee1270a6ffbecf9c1e5475bcc237f5c2c8438716547fdfa6cc2501a6e5
+EBUILD xen-tools-3.2.1.ebuild 6798 RMD160 faecdbda051e2d28649f32b3f715aea513516cf7 SHA1 96155100d37099d393d93967206bab7da6b7b443 SHA256 d3297e5eadd32a51047788fe5eace4164031f6b1c9ba6a11d774ae9a36b32642
+MISC ChangeLog 11214 RMD160 ec7361240fa9f672bdd9757c1fdbc97fe29b840a SHA1 39b2343ba77c4c2a4d7877130d74bc846a37773b SHA256 bc3e2869b0d50c50776d9bb505f2a5a8bb7e4213949285749ac6cc371acc4208
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHrNR8iP+LossGzjARAjanAJ9vjTrPXeuPz/9kViINf1PkmQuGkACgyzGR
-orwSsBAA0CTWrBxLhtHbloE=
-=/YER
------END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch b/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch
new file mode 100644
index 000000000000..d112dd4ac438
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch
@@ -0,0 +1,36 @@
+Introduce a configure option to disable building of qemu documentation.
+Gentoo Bug #192427
+
+Index: xen-3.2.1/tools/ioemu/configure
+===================================================================
+--- xen-3.2.1.orig/tools/ioemu/configure
++++ xen-3.2.1/tools/ioemu/configure
+@@ -214,6 +214,8 @@ for opt do
+   ;;
+   --disable-sdl) sdl="no"
+   ;;
++  --enable-docs) build_docs="yes"
++  ;;
+   --enable-coreaudio) coreaudio="yes"
+   ;;
+   --enable-alsa) alsa="yes"
+@@ -295,6 +297,7 @@ echo "  --enable-coreaudio       enable 
+ echo "  --enable-alsa            enable ALSA audio driver"
+ echo "  --enable-fmod            enable FMOD audio driver"
+ echo "  --enabled-dsound         enable DirectSound audio driver"
++echo "  --enable-docs            enable building of docs (requires texi2html and pod2man)"
+ echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
+ echo "  --enable-system          enable all system emulation targets"
+ echo "  --disable-system         disable all system emulation targets"
+@@ -576,8 +579,9 @@ EOF
+ fi
+ 
+ # Check if tools are available to build documentation.
+-if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then
+-  build_docs="yes"
++if [ ! -x "`which texi2html`" ] || [ ! -x "`which pod2man`" ]; then
++  echo "Missing texi2html or pod2man, will not build docs"
++  build_docs="no"
+ fi
+ 
+ if test "$mingw32" = "yes" ; then
diff --git a/app-emulation/xen-tools/xen-tools-3.1.2.ebuild b/app-emulation/xen-tools/xen-tools-3.2.1.ebuild
index 299d67122bcd..df3741a084e2 100644
--- a/app-emulation/xen-tools/xen-tools-3.1.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.1.2.ebuild,v 1.2 2007/12/14 17:26:58 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.2.1.ebuild,v 1.1 2008/05/04 18:59:10 rbu Exp $
 
 inherit flag-o-matic eutils multilib
 
 DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-SRC_URI="mirror://gentoo/xen-${PV}.tar.gz"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
 S="${WORKDIR}/xen-${PV}"
 
 LICENSE="GPL-2"
@@ -114,10 +114,13 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-3.0.4_p1--as-needed.patch"
 
 	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.0.4_p1-network-bridge-broadcast.patch"
+	epatch "${FILESDIR}/${PN}-3.1.3-network-bridge-broadcast.patch"
 
 	# Fix building small dumb utility called 'xen-detect' on hardened
 	epatch "${FILESDIR}/${PN}-3.1.0-xen-detect-nopie-fix.patch"
+
+	# Introduce a configure option to disable qemu documentation building, #192427
+	epatch "${FILESDIR}/${PN}-3.2.1-qemu-nodocs.patch"
 }
 
 src_compile() {