diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
| commit | 70b82ae359a5538711e103b0e8dfb92654296644 (patch) | |
| tree | 8412b84ff9ce02a22be5251052b00feefe1d5b70 /app-emulation/qemu | |
| parent | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff) | |
gentoo resync : 27.10.2018
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 31 |
2 files changed, 9 insertions, 24 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index c6fd9877fdfd..4d4adc04d304 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -13,5 +13,5 @@ DIST qemu-3.0.0.tar.bz2 41491935 BLAKE2B 715ccca4fced730425eb5c24a78d89d2ab59f64 EBUILD qemu-2.12.0-r3.ebuild 24051 BLAKE2B 8bacbd42b4abc2015d2a250bc1954867e329a7d4513bf8dc7c82c508563419e91e4a12d3ca74f3735073ea5cc0c9d15870feb40d497ef991df990426f4a65a3a SHA512 9a6efb5b677b8c0f0586b39e9abc6ddd69ff9bca8ee390269f9bf493c466791009def6caf1d9477cda251626ed1f8518cc7a8851d0c066586527d711269c1bfb EBUILD qemu-2.12.1.ebuild 24051 BLAKE2B 7587b86e783ba772c5895696398e8b808864f0b98159f2d55715d71bf3b6fb30ebf6b9abbe6f02c0d29546f39a40208aae181f8a9bc44e94d3ffb025d2fcb30a SHA512 e6e231ab225b62bdb1da182291a8d47fc57975d0b4a7732eb71809db4903fabd33f4d645fbf421502454438da48734b03b90484655e47f034fb91415ba05358c EBUILD qemu-3.0.0.ebuild 24055 BLAKE2B d4d86c9df7aad7efa6118db37143e215a380b41457cfae23d1bb4e6f46dfb40c503a740192870f2c483a8ae7d715698ba26c0e2c8768e1b75fd38f381a7c880f SHA512 750b05b4870c334d96abe8be1f9a309eed48862ffa1da1c8e4f046395c0c9c42d7830287d82a7432c8ee9d8446704cc37a130c72ca5d462f46779f854cdfd942 -EBUILD qemu-9999.ebuild 23916 BLAKE2B 6c7d76d45f3d3c639e675063e6440adae1dc3dcc61c01d69f426791520b31881303ad453568fd5c0fb23ef9f328df379620dab7f36fe814c7f5ef654dcbb8284 SHA512 39a0dd61ed61346f8cec5485a1fbfc9904e8fadce27cd33b87698820f1473660f5e1ae9fbb664c69d0db1fe8486bb6153d0315da79a6a5e9c7d9599b118235d0 +EBUILD qemu-9999.ebuild 23612 BLAKE2B 6adb72fd53be0572b4abe73aec0a61edd4342d9caa70e10af5a75351a4a9594fa072c3dd6f0877b5c4e0641a9b69e19c0d4d6a647ad486acc4b98be9bcdc117c SHA512 d6425a17d8d2eb22993b7168a4f6c01d75468c32da00c951fd600efe1be2c85afd39582500a55571710e6f25e28a07e5f19e3834b595de87ef5c2ae4f2f93be0 MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 833c2349a4c9..b33e04e51528 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -28,9 +28,9 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug - +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux + +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy + pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" @@ -50,14 +50,12 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) + static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -100,14 +98,8 @@ SOFTMMU_TOOLS_DEPEND=" >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] @@ -134,14 +126,8 @@ SOFTMMU_TOOLS_DEPEND=" rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) + media-libs/libsdl2[X] + media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) @@ -495,8 +481,7 @@ qemu_src_configure() { conf_opts+=( --audio-drv-list="${audio_opts}" ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) + use sdl && conf_opts+=( --with-sdlabi=2.0 ) fi case ${buildtype} in |