[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

[Sergei Trofimovich]

commit:     0325caceb287a5d56ef9f5c08751dec4518d9420
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 20:03:24 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 20:03:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0325cace

app-emulation/qemu: plugins are mutually exclusing to static*

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/qemu/qemu-4.2.0.ebuild | 7 +++++--
 app-emulation/qemu/qemu-9999.ebuild  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-emulation/qemu/qemu-4.2.0.ebuild 
b/app-emulation/qemu/qemu-4.2.0.ebuild
index 0c4b0cdd9a4..1e29f9d0d66 100644
--- a/app-emulation/qemu/qemu-4.2.0.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0.ebuild
@@ -64,9 +64,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
        qemu_softmmu_targets_ppc? ( fdt )
        qemu_softmmu_targets_riscv32? ( fdt )
        qemu_softmmu_targets_riscv64? ( fdt )
-       static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+       static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins )
+       static-user? ( !plugins )
        virtfs? ( xattr )
-       vte? ( gtk )"
+       vte? ( gtk )
+       plugins? ( !static !static-user )
+"
 
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # and user/softmmu targets (qemu-*, qemu-system-*).

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index bef3b263a0e..d73c7d8113c 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -64,9 +64,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
        qemu_softmmu_targets_ppc? ( fdt )
        qemu_softmmu_targets_riscv32? ( fdt )
        qemu_softmmu_targets_riscv64? ( fdt )
-       static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+       static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins )
+       static-user? ( !plugins )
        virtfs? ( xattr )
-       vte? ( gtk )"
+       vte? ( gtk )
+       plugins? ( !static !static-user )
+"
 
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # and user/softmmu targets (qemu-*, qemu-system-*).