Version bump #542900 by Thomas Stein.
authorMike Frysinger <vapier@gentoo.org>
Wed, 11 Mar 2015 18:46:47 +0000 (18:46 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 11 Mar 2015 18:46:47 +0000 (18:46 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

app-emulation/qemu/ChangeLog
app-emulation/qemu/Manifest
app-emulation/qemu/qemu-2.2.1.ebuild [new file with mode: 0644]
app-emulation/qemu/qemu-9999.ebuild

index f640cab9ab5058416171ee0e6e99509d9a942a2c..2b110349af337f8802a0b35025970c1f81faafc7 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.313 2015/02/28 21:49:56 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.314 2015/03/11 18:46:46 vapier Exp $
+
+*qemu-2.2.1 (11 Mar 2015)
+
+  11 Mar 2015; Mike Frysinger <vapier@gentoo.org> +qemu-2.2.1.ebuild,
+  qemu-9999.ebuild:
+  Version bump #542900 by Thomas Stein.
 
   28 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   seccomp USE flag is now global, removing from metadata
index b8101a29190e9cd5daca3bc28dcedc2fb860b938..06a55a49f3ec67eda01a6602dabd33676f65aef5 100644 (file)
@@ -14,26 +14,28 @@ DIST qemu-2.1.2-20141214.tar.xz 5580 SHA256 bbf0e23f03f7ec5582ae522a194c5908a1ed
 DIST qemu-2.1.2.tar.bz2 23563255 SHA256 fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885 SHA512 73ef758c82b23eec649c807bee8937d7fbf267278f7777adbdb22b738672543b826d211a4b523f38cee3e2b01f05ccf40a75756fc19c911362988d8e86d5cd58 WHIRLPOOL 5703d0aa8bb4366bb7aeb44fa4f3d1b54f188de42cd8c82e894584f627802b80a3dde1aa3b15fe8602a1891ec61ac66b3cd44ec031385cca88768f375c15b554
 DIST qemu-2.1.3.tar.bz2 23570694 SHA256 9b68fd0e6f6c401939bd1c9c6ab7052d84962007bb02919623474e9269f60a40 SHA512 119d89d85a54a4225716f7d1b20dc624705c1893e782b6f75e8a31ec11d4ba0ed60b78dd59322c2acc7f132c2f167461cf354d6a5f18925cf594746375b7b8fa WHIRLPOOL 9535d18037d12f719a85b648f4b65ce762fc4832ccb1b6b9ad88042be49ceb3d4813bd68ec1c0a91c21629018d376de7ddc479b69e81051d0f8c0e6af7a148e6
 DIST qemu-2.2.0.tar.bz2 24316697 SHA256 b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c SHA512 c1a42cc53a01175875411cad13defaab46f97740897b89f19fbf345106534f83fc707fae4a58d890f64eea475b940b934c7531a6ed04aa01f54cadb52b0b5909 WHIRLPOOL a9cb92406d4f2cfd6b7989c9876f7df4b305083241110e7b2bf16642cfd77531c48a48753745dfeb31b9aa7d71a2d4d3f8c5aba797918c9c60e920c79066ea2d
+DIST qemu-2.2.1.tar.bz2 24483500 SHA256 4617154c6ef744b83e10b744e392ad111dd351d435d6563ce24d8da75b1335a0 SHA512 970ead0c92fc04502c6d3a8dbfafa5797667b3d276a1a25ddbe991d20d8e17a588905ecbffa77fb3b9d12e481ac3776ca4c38fe89a5e4c96dc2fb045214bfa9f WHIRLPOOL 9226ce4a4f5c7247d6ab34eb8b45c9a91416ee5849dbe25b9d15cddbd6aba2b8da77280f6055d363a81ddec515d28bf501351cb7e21ecfb4bfe42cdb7e349788
 EBUILD qemu-2.1.2-r2.ebuild 18532 SHA256 d795b0501835ba5e55aefd8bd9f3f5035dd5b6db298ef59016e07c914e275649 SHA512 844d2eec62e4b7c7c912e666962b8dd8abef76bf027a6a1ae568f5c4d1147d51b12a5eb878a5f2b6f389c07bfac57077e9eea38a5dbdb8a1dd199cbe4dfa00aa WHIRLPOOL 4afd4b566fa421168abcab83b1858ad8569cec3379615853af852fa6a455997462306a32c7f8ba4568d64825e23a55f5939456889750d09dc7c7a5f803234e73
 EBUILD qemu-2.1.3.ebuild 18523 SHA256 53842e99bd44dd35a5e5b92d864173b875755494e3e4b4dbf8ac07fd2641572c SHA512 8b5a58b9565d7d2c439750d9ac57e2d28cdb9b0efc7148f3266a52e569cf90668d3f5035a3a13ce7d1c03262f3da075b2037ef7183ada7e4685b4c14e068fdad WHIRLPOOL 89d3e9d420ae3869a963d84fea323cda518f9b74b6a2110ad77fd37987c5e1bd241ec0d81c94bfe573670939f789fff7109d0fff6961c7309b8d367b652231a8
 EBUILD qemu-2.2.0.ebuild 18396 SHA256 e7a1603c0be97ad59f9fbcce905dcbb8ca306533b676b6dc325c3a47f88274a0 SHA512 369b0e0151a414285c9cc76120f2b803797b146a03a6bf2ceb01508aea94f510185c23f545f6542fbd8d764ded0385324d82c2ab8a45f59ec2445a948647240b WHIRLPOOL ebaff44e91be3034d474bebda6e60e15af8cbf74a1e0455ba7066db95e77b966d2af2497b10b9b19e4d6732d5ae138cc21cebd9dc728519c348490abc2c3d0fd
-EBUILD qemu-9999.ebuild 18328 SHA256 4dfa3fb8bc8735e4e41bcf0b51c0d2546d6fb10e31801fce337930b586d544cf SHA512 3dfb14e40d98a7486fe78d21ca43ffa96f011d996ef142d7544c94b71997fd088c564a06aa21fbde2cedc2a2f71f3e0ab31fbf23bcbee48c322293939ed1f37f WHIRLPOOL a113c363e5704081439a83ae66ea569e9f6222e8442edfd2cf374f5a66403826da7f9d4b1290104029d2e1c7d19a82a01cd7eba8f03169168a80541d5cf9c929
-MISC ChangeLog 51586 SHA256 6c739d86bb25f85968dbca89ac2d1ba0e6c30ed13f1c33f129c60adc5d5a9699 SHA512 89ad4525e438bc3b57bd8b848aee2ebec17791dce15d1081a29a28cdd7375d96e6b9b84716d8f040d65382e6686ccf679472f9aa9c3462b795f783c53afc5401 WHIRLPOOL 3e1f175200e7636639b16eb904c5b739c7b910c8d9321a2304c57c8430a181e0e025a5d3473ff1a2e963ed7235ca7da6b79f34b6ebd70b747419048e4f51af89
+EBUILD qemu-2.2.1.ebuild 18342 SHA256 fe5daaaca5b38520fbacadcda2cfd2e66a3c0c84cbfdddf4c96188ca2c1ec35d SHA512 83a046c529979fa1b05aed3a8802709bd987aee6cae955845192e79b29e7d9d1fa874e1e23a170f39d16c11704edd926d08ff613b8d62e6e60085676fe127564 WHIRLPOOL 370e16f00b7c5c78a74afa0d3f8c36bd020835279ccdc339d26684d75802417d0d73fbbb74398b2362657b089629a2ab7bdcca41954bbcafbd329774836e54ef
+EBUILD qemu-9999.ebuild 18342 SHA256 13efcabf242de74dce41b78b757c8602f1cb20fa8312b82c8f4d888b39f22767 SHA512 6bce57aa4c6292ba24510e28c8f3d00f4c5ad9855e6b2cf8e923f1483f1f11f50912698e258f2d4875c45fbd4cc5027136bde5b3b719eb7232dfd9b930b2c21f WHIRLPOOL 4a2552b221e6984df860b535da4fd042ae59ffa0c83c11820128a0d652e0857238d327a77531a24ba8a88f25838da52d9fad94316df8c5f80bab066448677f7b
+MISC ChangeLog 51743 SHA256 1b48387c470c1788f32d004775dcabacf4e76ae5e0a2574c714f3a4b954195ca SHA512 85c2fa416e4d4247d6244711128fccad931a68795f94d2eafb25e7794e86241406006c6b574a53bd36e43b65c101e485559c42f9c14dc93f72357101a326ad01 WHIRLPOOL 075fdcd9201efe51a2778eb481df5b0bcafa953a899bfa5d0303258d25ea21f1020732109530261942e1f8651763147f2262c8587fb6e9c0d10633ebfb680438
 MISC metadata.xml 3595 SHA256 1f78b84a325125ff473ecb496a951898d139b73c755367fea5489406dd0a3c9c SHA512 d460ac28d0b1fbb0ceb5514a6f4e5c6bf27faa1dbeaa739890fbf4e9e9c28a8ec190b57a818a717baaa6384170f983c62be1b1f5044e8650b5559c80542bb880 WHIRLPOOL 12c616e8c9337382c31fa16464d5d5d880f911784f93f85937957b669387b201a15e421a62fd5c3132ba6166df3aac2656532e2e920932d1f7f19cb8275831f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8jgFAAoJEPZTWjO6HuSNaEAQAIJzVWOr7/XLld+Gp7N2qka/
-nZWdTehxHLG8VFusOOEzH53rrBEFvXuGQCzkD4J5IajpJfdh9jdwQJoraU2RFBbU
-6A/TBTjWb3dCcsnatbFPMHPa9A+b8iNC1XQHvMpesZjGPTZqiIsW7hkPlAywHBmB
-6nsY88amdh9u48KvhIiWrJgJTDvQWJdNdqelMIleDnY/rOg5rjeqpcyS7MbBPhsH
-7deXSbYtfAROWa8ZSPPjS1PQBdS5ljG43f3ANzKjmckSFkRXfswos8rOu0l0BYr+
-QB8bbngy0/R6bS749ezC0hQ62rQ/6fFH6SKlt40LckpjDmoezVpQyCRJXQkSAgcS
-R3KTEegV20uWTMtMN4WgGx0Zis+L2QLm/1ZSCsYgNq1Ykhy+LJqceljqCtcblvlA
-LsoVMh9FRRjDjfFkQB1tpwth5vbxldGQ8GLIZDkDUArXb9ZwowT/Xan4tmJPLT60
-0fe9teUag4nxTVDhNLScLjZzp8mat6t1RxkWDoB0h4rCSxSfrsU1vppacsyxh/Oo
-n7N6//VD1mD4eQ+Voq6XXhotEV0VeboDQx28sIEnAg4pKC6IHIMJwEQU3+BAJVaP
-Z1X/8xBFu3kahcNxGoZJyp7yO1XbSWEFDrt6vtY2u0neOeAh/OC3LBk0aD3lgvHY
-+E13E5UhUXouHmXTtoHs
-=O6HC
+iQIcBAEBCAAGBQJVAI2XAAoJEPGu1DbS6WIAlOkP/3hoI5+V+lPDSRkkkI0Z+Bda
+BKc8hSYZhtAvilO/Xjjh5sCTRTtHI+x8zfB4huMX9F0UekdcdhVxfDM7MZ0sY7KW
+HCiv3v2RnjGbIqcD3GJ9iv4dqJNNjcREWJIodSYcM7EqDViPyr+mqtb8pnSNIlKv
+ljDURqTDn5UTHyjbU96Vu53UY2p05rUI/qCcx/aKDDgoTjReI7Rpn2MsvsOeMpPW
+N927qignKhrj7xqcmDvnP+WrsE2A/LQv+dotwfWhwzIybbLo6NNOHmWxb3fpkenb
+fS8pRQA2qcCEnC19KOsJSQEbBsL1N26STri9yAk+Sxm5i/4GegyAunuGAMMzSB3U
+rsGN3BIy1IYsLuAfB2s9UOW+TZfRGMeLpCbvoSxzToab5+p7583ZEgPBmxrAcfki
+R4NkmbrffjTQd+cFmgVWvMGaaMY9P33peiUMLtw888Xpk8ahVbIwv30/iM1//mow
+mMfvICWAvjjBH9YfD/v1rLRG7QO0gk/b4B1hAP02nk8kJ+AaHMHR00J+4JsqsIOl
+h3g3JNR5ITjf5xk1aA7f+SHCyZvyz2y91pEjArs5bEQGYH9hcgaKaGEgisw2hca5
+e3fSiGUqQvprDZnvmmsKWce/IXWKpOeu1AZ3oU5flrX5Ci/ytwVTSe7ZWnpQE/C1
+JVvM3SHEqC3WBR7nuFgd
+=cxtx
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-2.2.1.ebuild b/app-emulation/qemu/qemu-2.2.1.ebuild
new file mode 100644 (file)
index 0000000..a9c97e2
--- /dev/null
@@ -0,0 +1,601 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1.ebuild,v 1.1 2015/03/11 18:46:46 vapier Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+       user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+       EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+       inherit git-2
+       SRC_URI=""
+       KEYWORDS=""
+else
+       SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+       ${BACKPORTS:+
+               http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+       KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+
+use_targets="
+       $(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+       $(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+"
+IUSE+=" ${use_targets}"
+
+# Require at least one softmmu or user target.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="|| ( ${use_targets} )
+       ${PYTHON_REQUIRED_USE}
+       qemu_softmmu_targets_arm? ( fdt )
+       qemu_softmmu_targets_microblaze? ( fdt )
+       qemu_softmmu_targets_ppc? ( fdt )
+       qemu_softmmu_targets_ppc64? ( fdt )
+       static? ( static-softmmu static-user )
+       static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
+       virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+       sys-libs/zlib[static-libs(+)]
+       xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+       >=x11-libs/pixman-0.28.0[static-libs(+)]
+       aio? ( dev-libs/libaio[static-libs(+)] )
+       caps? ( sys-libs/libcap-ng[static-libs(+)] )
+       curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+       fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+       glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+       infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
+       jpeg? ( virtual/jpeg[static-libs(+)] )
+       lzo? ( dev-libs/lzo:2[static-libs(+)] )
+       ncurses? ( sys-libs/ncurses[static-libs(+)] )
+       nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+       numa? ( sys-process/numactl[static-libs(+)] )
+       png? ( media-libs/libpng[static-libs(+)] )
+       rbd? ( sys-cluster/ceph[static-libs(+)] )
+       sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+       sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+       seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+       snappy? ( app-arch/snappy[static-libs(+)] )
+       spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+       ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+       tls? ( net-libs/gnutls[static-libs(+)] )
+       usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
+       uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+       vde? ( net-misc/vde[static-libs(+)] )
+       xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+       >=sys-firmware/ipxe-1.0.0_p20130624
+       pin-upstream-blobs? (
+               ~sys-firmware/seabios-1.7.5
+               ~sys-firmware/sgabios-0.1_pre8
+               ~sys-firmware/vgabios-0.7a
+       )
+       !pin-upstream-blobs? (
+               sys-firmware/seabios
+               sys-firmware/sgabios
+               sys-firmware/vgabios
+       )"
+CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+       !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+       qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+       qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+       accessibility? ( app-accessibility/brltty )
+       alsa? ( >=media-libs/alsa-lib-1.0.13 )
+       bluetooth? ( net-wireless/bluez )
+       gtk? (
+               x11-libs/gtk+:3
+               x11-libs/vte:2.90
+       )
+       iscsi? ( net-libs/libiscsi )
+       opengl? ( virtual/opengl )
+       pulseaudio? ( media-sound/pulseaudio )
+       python? ( ${PYTHON_DEPS} )
+       sdl? ( media-libs/libsdl[X] )
+       smartcard? ( dev-libs/nss !app-emulation/libcacard )
+       spice? ( >=app-emulation/spice-protocol-0.12.3 )
+       systemtap? ( dev-util/systemtap )
+       usbredir? ( >=sys-apps/usbredir-0.6 )
+       virtfs? ( sys-libs/libcap )
+       xen? ( app-emulation/xen-tools )"
+DEPEND="${CDEPEND}
+       dev-lang/perl
+       =dev-lang/python-2*
+       sys-apps/texinfo
+       virtual/pkgconfig
+       kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+       gtk? ( nls? ( sys-devel/gettext ) )
+       static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
+       static-user? ( ${USER_LIB_DEPEND} )
+       test? (
+               dev-libs/glib[utils]
+               sys-devel/bc
+       )"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+       usr/share/qemu/openbios-ppc
+       usr/share/qemu/openbios-sparc64
+       usr/share/qemu/openbios-sparc32
+       usr/share/qemu/palcode-clipper
+       usr/share/qemu/s390-ccw.img
+       usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+       usr/bin/qemu-x86_64
+       usr/bin/qemu-alpha
+       usr/bin/qemu-arm
+       usr/bin/qemu-cris
+       usr/bin/qemu-m68k
+       usr/bin/qemu-microblaze
+       usr/bin/qemu-microblazeel
+       usr/bin/qemu-mips
+       usr/bin/qemu-mipsel
+       usr/bin/qemu-or32
+       usr/bin/qemu-ppc
+       usr/bin/qemu-ppc64
+       usr/bin/qemu-ppc64abi32
+       usr/bin/qemu-sh4
+       usr/bin/qemu-sh4eb
+       usr/bin/qemu-sparc
+       usr/bin/qemu-sparc64
+       usr/bin/qemu-armeb
+       usr/bin/qemu-sparc32plus
+       usr/bin/qemu-s390x
+       usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+       if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+               use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+               use qemu_softmmu_targets_s390x; then
+               return 0
+       fi
+
+       return 1
+}
+
+pkg_pretend() {
+       if use kernel_linux && kernel_is lt 2 6 25; then
+               eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+       elif use kernel_linux; then
+               if ! linux_config_exists; then
+                       eerror "Unable to check your kernel for KVM support"
+               else
+                       CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+                       ERROR_KVM="You must enable KVM in your kernel to continue"
+                       ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+                       ERROR_KVM_AMD+=" your kernel configuration."
+                       ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+                       ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+                       ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+                       ERROR_TUN+=" into your kernel or loaded as a module to use the"
+                       ERROR_TUN+=" virtual network device if using -net tap."
+                       ERROR_BRIDGE="You will also need support for 802.1d"
+                       ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+                       use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+                       ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+                       ERROR_VHOST_NET+=" support"
+
+                       if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+                               CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+                       fi
+
+                       use python && CONFIG_CHECK+=" ~DEBUG_FS"
+                       ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+                       # Now do the actual checks setup above
+                       check_extra_config
+               fi
+       fi
+
+       if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+               eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+               eerror "instances are still pointing to it.  Please update your"
+               eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+               eerror "and the right system binary (e.g. qemu-system-x86_64)."
+               die "update your virt configs to not use qemu-kvm"
+       fi
+}
+
+pkg_setup() {
+       enewgroup kvm 78
+       python_setup
+}
+
+src_prepare() {
+       # Alter target makefiles to accept CFLAGS set via flag-o
+       sed -i -r \
+               -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+               Makefile Makefile.target || die
+
+       # Cheap hack to disable gettext .mo generation.
+       use nls || rm -f po/*.po
+
+       epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+       [[ -n ${BACKPORTS} ]] && \
+               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+                       epatch
+
+       # Fix ld and objcopy being called directly
+       tc-export AR LD OBJCOPY
+
+       # Verbose builds
+       MAKEOPTS+=" V=1"
+
+       epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+       debug-print-function ${FUNCNAME} "$@"
+
+       local buildtype=$1
+       local builddir=$2
+       local static_flag="static-${buildtype}"
+
+       # audio options
+       local audio_opts="oss"
+       use alsa && audio_opts="alsa,${audio_opts}"
+       use sdl && audio_opts="sdl,${audio_opts}"
+       use pulseaudio && audio_opts="pa,${audio_opts}"
+
+       local conf_opts=(
+               --prefix=/usr
+               --sysconfdir=/etc
+               --libdir=/usr/$(get_libdir)
+               --docdir=/usr/share/doc/${PF}/html
+               --disable-bsd-user
+               --disable-guest-agent
+               --disable-strip
+               --disable-werror
+               --python="${PYTHON}"
+               --cc="$(tc-getCC)"
+               --cxx="$(tc-getCXX)"
+               --host-cc="$(tc-getBUILD_CC)"
+               $(use_enable debug debug-info)
+               $(use_enable debug debug-tcg)
+               --enable-docs
+               $(use_enable tci tcg-interpreter)
+               $(use_enable xattr attr)
+       )
+
+       # Disable options not used by user targets as the default configure
+       # options will autoprobe and try to link in a bunch of unused junk.
+       conf_softmmu() {
+               if [[ ${buildtype} == "user" ]] ; then
+                       echo "--disable-${2:-$1}"
+               else
+                       use_enable "$@"
+               fi
+       }
+       conf_opts+=(
+               $(conf_softmmu accessibility brlapi)
+               $(conf_softmmu aio linux-aio)
+               $(conf_softmmu bluetooth bluez)
+               $(conf_softmmu caps cap-ng)
+               $(conf_softmmu curl)
+               $(conf_softmmu fdt)
+               $(conf_softmmu glusterfs)
+               $(conf_softmmu gtk)
+               $(conf_softmmu infiniband rdma)
+               $(conf_softmmu iscsi libiscsi)
+               $(conf_softmmu jpeg vnc-jpeg)
+               $(conf_softmmu kernel_linux kvm)
+               $(conf_softmmu lzo)
+               $(conf_softmmu ncurses curses)
+               $(conf_softmmu nfs libnfs)
+               $(conf_softmmu numa)
+               $(conf_softmmu opengl glx)
+               $(conf_softmmu png vnc-png)
+               $(conf_softmmu rbd)
+               $(conf_softmmu sasl vnc-sasl)
+               $(conf_softmmu sdl)
+               $(conf_softmmu seccomp)
+               $(conf_softmmu smartcard smartcard-nss)
+               $(conf_softmmu snappy)
+               $(conf_softmmu spice)
+               $(conf_softmmu ssh libssh2)
+               $(conf_softmmu tls quorum)
+               $(conf_softmmu tls vnc-tls)
+               $(conf_softmmu tls vnc-ws)
+               $(conf_softmmu usb libusb)
+               $(conf_softmmu usbredir usb-redir)
+               $(conf_softmmu uuid)
+               $(conf_softmmu vde)
+               $(conf_softmmu vhost-net)
+               $(conf_softmmu virtfs)
+               $(conf_softmmu vnc)
+               $(conf_softmmu xen)
+               $(conf_softmmu xen xen-pci-passthrough)
+               $(conf_softmmu xfs xfsctl)
+       )
+
+       case ${buildtype} in
+       user)
+               conf_opts+=(
+                       --enable-linux-user
+                       --disable-system
+                       --target-list="${user_targets}"
+                       --disable-blobs
+                       --disable-tools
+               )
+               ;;
+       softmmu)
+               conf_opts+=(
+                       --disable-linux-user
+                       --enable-system
+                       --target-list="${softmmu_targets}"
+                       --with-system-pixman
+                       --audio-drv-list="${audio_opts}"
+               )
+               use gtk && conf_opts+=( --with-gtkabi=3.0 )
+               ;;
+       esac
+
+       # Add support for SystemTAP
+       use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+       # We always want to attempt to build with PIE support as it results
+       # in a more secure binary. But it doesn't work with static or if
+       # the current GCC doesn't have PIE support.
+       if use ${static_flag}; then
+               conf_opts+=( --static --disable-pie )
+       else
+               gcc-specs-pie && conf_opts+=( --enable-pie )
+       fi
+
+       einfo "./configure ${conf_opts[*]}"
+       cd "${builddir}"
+       ../configure "${conf_opts[@]}" || die "configure failed"
+
+       # FreeBSD's kernel does not support QEMU assigning/grabbing
+       # host USB devices yet
+       use kernel_FreeBSD && \
+               sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+       local target
+
+       python_export_best
+
+       softmmu_targets= softmmu_bins=()
+       user_targets= user_bins=()
+
+       for target in ${IUSE_SOFTMMU_TARGETS} ; do
+               if use "qemu_softmmu_targets_${target}"; then
+                       softmmu_targets+=",${target}-softmmu"
+                       softmmu_bins+=( "qemu-system-${target}" )
+               fi
+       done
+
+       for target in ${IUSE_USER_TARGETS} ; do
+               if use "qemu_user_targets_${target}"; then
+                       user_targets+=",${target}-linux-user"
+                       user_bins+=( "qemu-${target}" )
+               fi
+       done
+
+       [[ -n ${softmmu_targets} ]] && \
+               einfo "Building the following softmmu targets: ${softmmu_targets}"
+
+       [[ -n ${user_targets} ]] && \
+               einfo "Building the following user targets: ${user_targets}"
+
+       if [[ -n ${softmmu_targets} ]]; then
+               mkdir "${S}/softmmu-build"
+               qemu_src_configure "softmmu" "${S}/softmmu-build"
+       fi
+
+       if [[ -n ${user_targets} ]]; then
+               mkdir "${S}/user-build"
+               qemu_src_configure "user" "${S}/user-build"
+       fi
+}
+
+src_compile() {
+       if [[ -n ${user_targets} ]]; then
+               cd "${S}/user-build"
+               default
+       fi
+
+       if [[ -n ${softmmu_targets} ]]; then
+               cd "${S}/softmmu-build"
+               default
+       fi
+}
+
+src_test() {
+       if [[ -n ${softmmu_targets} ]]; then
+               cd "${S}/softmmu-build"
+               pax-mark m */qemu-system-* #515550
+               emake -j1 check
+               emake -j1 check-report.html
+       fi
+}
+
+qemu_python_install() {
+       python_domodule "${S}/scripts/qmp/qmp.py"
+
+       python_doscript "${S}/scripts/kvm/kvm_stat"
+       python_doscript "${S}/scripts/kvm/vmxcap"
+       python_doscript "${S}/scripts/qmp/qmp-shell"
+       python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+       if [[ -n ${user_targets} ]]; then
+               cd "${S}/user-build"
+               emake DESTDIR="${ED}" install
+
+               # Install binfmt handler init script for user targets
+               newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+       fi
+
+       if [[ -n ${softmmu_targets} ]]; then
+               cd "${S}/softmmu-build"
+               emake DESTDIR="${ED}" install
+
+               # This might not exist if the test failed. #512010
+               [[ -e check-report.html ]] && dohtml check-report.html
+
+               if use kernel_linux; then
+                       udev_dorules "${FILESDIR}"/65-kvm.rules
+               fi
+
+               if use python; then
+                       python_foreach_impl qemu_python_install
+               fi
+       fi
+
+       # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+       pushd "${ED}"/usr/bin >/dev/null
+       pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+       popd >/dev/null
+
+       # Install config file example for qemu-bridge-helper
+       insinto "/etc/qemu"
+       doins "${FILESDIR}/bridge.conf"
+
+       # Remove the docdir placed qmp-commands.txt
+       mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+       cd "${S}"
+       dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+       newdoc pc-bios/README README.pc-bios
+       dodoc docs/qmp/*.txt
+
+       # Remove SeaBIOS since we're using the SeaBIOS packaged one
+       rm "${ED}/usr/share/qemu/bios.bin"
+       if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+               dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+       fi
+
+       # Remove vgabios since we're using the vgabios packaged one
+       if [[ -n ${softmmu_targets} ]]; then
+               rm "${ED}/usr/share/qemu/vgabios.bin"
+               rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+               rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+               rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+               rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+               if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+                       dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+                       dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+                       dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+                       dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+                       dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+               fi
+
+               # Remove sgabios since we're using the sgabios packaged one
+               rm "${ED}/usr/share/qemu/sgabios.bin"
+               if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+                       dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+               fi
+
+               # Remove iPXE since we're using the iPXE packaged one
+               rm "${ED}"/usr/share/qemu/pxe-*.rom
+               if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+                       dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+                       dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+                       dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+                       dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+                       dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+                       dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+               fi
+       fi
+
+       qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+       if qemu_support_kvm; then
+               readme.gentoo_print_elog
+               ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
+               ewarn "save states has been removed starting with the 1.6.2 release"
+               ewarn
+               ewarn "It is recommended that you migrate any VMs that may be running"
+               ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
+               ewarn "any saved states with a newer qemu."
+               ewarn
+               ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
+
+               if use x86 || use amd64; then
+                       ewarn
+                       ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
+                       ewarn "installed.  In order to use kvm acceleration, pass the flag"
+                       ewarn "-enable-kvm when running your system target."
+               fi
+       fi
+
+       if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+               udev_reload
+       fi
+
+       fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+       if use virtfs && [ -n "${softmmu_targets}" ]; then
+               local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+               fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+       fi
+}
+
+pkg_info() {
+       echo "Using:"
+       echo "  $(best_version app-emulation/spice-protocol)"
+       echo "  $(best_version sys-firmware/ipxe)"
+       echo "  $(best_version sys-firmware/seabios)"
+       if has_version sys-firmware/seabios[binary]; then
+               echo "    USE=binary"
+       else
+               echo "    USE=''"
+       fi
+       echo "  $(best_version sys-firmware/vgabios)"
+}
index fc34303186073d98f615df6c1cb574b2246ec9e2..b81ae13c141f577496e07277f873a61e9ba92bf7 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.92 2014/12/11 14:17:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.93 2015/03/11 18:46:46 vapier Exp $
 
 EAPI=5
 
@@ -245,6 +245,7 @@ pkg_pretend() {
 
 pkg_setup() {
        enewgroup kvm 78
+       python_setup
 }
 
 src_prepare() {