[app-emulation/xen-tools] Change use ioemu to qemu and edit metadata.xml, fixes Bug...

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index cb60246e9af531a5344d01048dbaa6f2b180eb6e..75206bfa217d025454e40da941b38d7b1d4f9734 100644 (file)
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.97 2011/09/29 14:22:28 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.98 2011/10/05 18:59:29 alexxy Exp $
+
+  05 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-3.4.2-r5.ebuild,
+  xen-tools-4.1.1-r5.ebuild, metadata.xml:
+  Change use ioemu to qemu and edit metadata.xml, fixes Bug 383337, add rdep
+  packages for use flag doc, fixes Bug 384357, add elog meassage re /.config,
+  fixes Bug 376819. Pathces by by Ian Delaney aka idella4
 
   29 Sep 2011; Thomas Kahle <tomka@gentoo.org> xen-tools-3.4.2-r3.ebuild:
   x86 stable per bug 379241

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 64c2a77db474d1d04ff10dc5016eafb43c3f173f..babb295a86c0fa34680253619e5d8cc53c2e0927 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -27,16 +27,26 @@ DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51
-EBUILD xen-tools-3.4.2-r5.ebuild 7121 RMD160 1373a4b9dbe6be180176b8489ff5ecaf30cc173f SHA1 76a0875cc6d6fad7a8acccacfe12e5b8cd6ac9fc SHA256 6672016920ab8c24c6bbd23d83f7f74a4c9918591943e7aaf63ef1fd7f909ee3
+EBUILD xen-tools-3.4.2-r5.ebuild 7398 RMD160 08e9b12c23c9d853f5b59ee2613a5e07a9623038 SHA1 0859af01b9dace9451e24f509c4b436a76b9da39 SHA256 92682159a7961a7ebebf523541f793e59e7b4807755e32e8787e70658bc3ff54
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.1-r5.ebuild 9879 RMD160 ca9d66695af20b3fcb9a55de588fc90ef296a7d7 SHA1 a6218a798cbba8fd47036af39b03cdbf6752c0be SHA256 2d857bd4b385d66cb1c5f6a90fcf0f941e990ec5c48627bd28de146d7456b7aa
+EBUILD xen-tools-4.1.1-r5.ebuild 10128 RMD160 f47f5f5a377970493c042a27fef4c37f74a5a81a SHA1 56679821ebe590f7eb67620f5e6b23d25f4e32d5 SHA256 6404ec9d05e45eac9d734905c54ef2602128f68f8f446359f837f0e8e1b21525
 EBUILD xen-tools-9999.ebuild 9682 RMD160 2f60aa64bb720767cee6b7a88a421613f92dcf02 SHA1 69a5487f75dd757d5da96bb2339c38819fe6d4d6 SHA256 20770f7c8a02ea141be8a8772624e6dcf8266dbee477b31e87f265695b939a69
-MISC ChangeLog 23849 RMD160 fccc60fcc384ded9b5e20688d268343e02e2db62 SHA1 76503717d28969b762178cf181c071db50ccc262 SHA256 98f6e1d27700cb5232b6815e1f4761332a8edd33953d2818dfa9df116107c200
-MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38
+MISC ChangeLog 24185 RMD160 0164f7d18ed05863b0168df15f7b5489708f78ef SHA1 25ae2f615f7a3ad153afd93d96d16ea6d3897205 SHA256 d0077829fe17c76f0322eea65457512eddcf0a9056acbcb776db362bc94b2e11
+MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6EfyoACgkQodBTJSDyo64ixgD9GBY0A9NVtCGWIJKpvFHOkv9l
-NuJOwxk4lrTcK0OsYGMA/AhE7Vg+Sl3MOuCixO2DIXIy4OFcRL7tS61jOh8Z+/u/
-=37Ct
+iQIcBAEBCAAGBQJOjKkoAAoJEOf+E+/4L5LmRyYP/RLuNlbswnwTG4aOc1g0EcqD
+5rYpNlpDNfsvoAnQ31FxSR0MtNt/rcGxjFvzWndGA/qL70AluT7H1Ak2qy4Q1p+J
+0Fejiw+yivKh6fkzxthJKxY3cy9fpMhgqs4FgQaBvv+Z1rBh7k2phzNRw6nZo7Ex
+4oreIx3d/QU7a+vC6FtfxKghbdNwjeKVaUJ4U/rSxjrr0T8akMcZSgaPnh3HLbbQ
+ZqqW3EuMqsOaPDLsUVvkmSgZIyZNlwEWMPYR/yyTcOefsxI0EhwMWx4Kr//6qsJF
+P79wFTcDIXzcBvFnaPgdSb8myMWVqFHGXX6/wxlWk6ugUypHJ+Q9jBB5aBA4C53S
+NqNlO7P9BCD+a+ptjprKcbXDUXsbwAae0340jh7N8nIOyx+I5Y3LWke43jSb6r4B
+6Bw9ZA4UHKVCqWNmtaNmBgMjQH5ALGLAfYuHjeUsZu18WQIGe8BL6IfphxN9Wk+6
+B6gSHkNmiD0/SHPkg2dg/KwXyLrUJ71iKFjCIX/DX6NkqZBNA6qwzFSpm4T2jZ0p
+C5Y1mKUuiL3AAL05+JCUQ+pgaipw4enm8clK1jVc6WlJCWm6dHMkx5tlx1Hl4PL4
+nYCw7GBSMUph5KG9XLju2BYRrgu9N+5AfOyMP0LagCRpP+GpDFrDAl5Mnye5syW+
+TZXp5YN5b9aRrp4usQ+g
+=NBOC
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 568adbf4c226067cca67bb3c809f4182ee8f53a4..501368b0793f017abfc252912c03a57037defee3 100644 (file)
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -7,11 +7,12 @@
                <name>Ian Delaney aka idella4 proxy maintainer</name>
        </maintainer>
        <use>
-               <flag name='acm'>Enable the ACM/sHype XSM module from IBM</flag>
+               <flag name='acm'>Enable the ACM/sHype XSM module from IBM for xen-3</flag>
                <flag name='api'>Build the C libxenapi bindings</flag>
                <flag name='flask'>Enable the Flask XSM module from NSA</flag>
-               <flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v</flag>
+               <flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
                <flag name='ioemu'>Enable IOEMU support</flag>
+               <flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
                <flag name='pygrub'>Install the pygrub boot loader</flag>
                <flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
                <flag name='xend'>Enable support the xend and xm to manage xen</flag>

diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
index 1a0660c977d1342b24d5f719e70f9d9a4baaffa4..6fd6ef19c5bebf1f3674ce432a4f366e4ab8821c 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4.2-r5.ebuild,v 1.2 2011/09/27 22:50:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.3 2011/10/05 18:59:29 alexxy Exp $
 
 EAPI="3"
 
@@ -39,9 +39,14 @@ DEPEND="${CDEPEND}
        doc? (
                app-doc/doxygen
                dev-tex/latex2html[png,gif]
-               dev-texlive/texlive-latexextra
                media-gfx/transfig
                media-gfx/graphviz
+               virtual/latex-base
+               dev-tex/latexmk
+               dev-texlive/texlive-latex
+               dev-texlive/texlive-pictures
+                dev-texlive/texlive-latexextra
+               dev-texlive/texlive-latexrecommended
        )
        hvm? (
                x11-proto/xproto
@@ -76,6 +81,10 @@ QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
        usr/share/xen/qemu/openbios-sparc64"
 
 pkg_setup() {
+       if [ -x /.config/ ]; then
+               die "the system has a dir /.config; this needs to be removed to allow the package to emerge"
+       fi
+
        export "CONFIG_LOMOUNT=y"
 
        if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then

diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
index 9232b8d5769c2536cb6b8ab10231cba2832ef181..9cb12442c55af9c5f1f1548b2f804bfd78e606b7 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.3 2011/09/25 01:44:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.4 2011/10/05 18:59:29 alexxy Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://xen.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm ioemu pygrub screen xend"
+IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend"
 
 CDEPEND="dev-lang/python
        dev-python/lxml
@@ -77,7 +77,7 @@ QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
 pkg_setup() {
        export "CONFIG_LOMOUNT=y"
 
-       if use ioemu; then
+       if use qemu; then
                export "CONFIG_IOEMU=y"
        else
                export "CONFIG_IOEMU=n"
@@ -123,6 +123,12 @@ pkg_setup() {
 
        use api     && export "LIBXENAPI_BINDINGS=y"
        use flask   && export "FLASK_ENABLE=y"
+
+       if use hvm && ! use qemu; then
+               elog "With qemu disabled, it is not possible to use HVM machines " \
+                       "or PVM machines with a framebuffer attached in the kernel config" \
+                       "The addition of use flag qemu is required when use flag hvm ise selected"
+       fi
 }
 
 src_prepare() {
@@ -160,8 +166,8 @@ src_prepare() {
        if ! use pygrub; then
                sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile
        fi
-       # Don't bother with ioemu, only needed for fully virtualised guests
-       if ! use ioemu; then
+       # Don't bother with qemu, only needed for fully virtualised guests
+       if ! use qemu; then
                sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk
                sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
                        -i Makefile
@@ -297,7 +303,7 @@ pkg_postinst() {
                elog "support enable the hvm use flag."
                elog "An x86 or amd64 multilib system is required to build HVM support."
                echo
-               elog "The ioemu use flag has been removed and replaced with hvm."
+               elog "The qemu use flag has been removed and replaced with hvm."
        fi
        if use xend; then
                echo