app-emulation/qemu: make USE=rbd and USE=static mutually exclusive

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

diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index e121f256e5651b03c1893b1eb9b96143b892f2f2..6227a2fa81c1021ee60d37b658e56ad600c3bdf6 100644 (file)
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -58,7 +58,7 @@ 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 !rbd !snappy )
        virtfs? ( xattr )
        vte? ( gtk )"
 
@@ -126,7 +126,7 @@ SOFTMMU_TOOLS_DEPEND="
        )
        png? ( media-libs/libpng:0=[static-libs(+)] )
        pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph[static-libs(+)] )
+       rbd? ( sys-cluster/ceph )
        sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
        sdl? (
                media-libs/libsdl2[X]

diff --git a/app-emulation/qemu/qemu-4.1.0-r1.ebuild b/app-emulation/qemu/qemu-4.1.0-r1.ebuild
index 1bf631e15c6c49f15499396372553e79dc716d47..c0af6bf7969266b1ec0da2c2bf4e12b7fd66f9dd 100644 (file)
--- a/app-emulation/qemu/qemu-4.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0-r1.ebuild
@@ -64,7 +64,7 @@ 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 !rbd !snappy )
        virtfs? ( xattr )
        vte? ( gtk )"
 
@@ -132,7 +132,7 @@ SOFTMMU_TOOLS_DEPEND="
        )
        png? ( media-libs/libpng:0=[static-libs(+)] )
        pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph[static-libs(+)] )
+       rbd? ( sys-cluster/ceph )
        sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
        sdl? (
                media-libs/libsdl2[X]

diff --git a/app-emulation/qemu/qemu-4.2.0-r1.ebuild b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
index 6f904b8d897a3dfa3288776085cd12e226d11d6d..21a8f4a01b6ef1fb33bb9f98a6ac2a5958b165a4 100644 (file)
--- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
@@ -64,7 +64,7 @@ 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 !plugins )
+       static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
        static-user? ( !plugins )
        virtfs? ( xattr )
        vte? ( gtk )
@@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND="
        )
        png? ( media-libs/libpng:0=[static-libs(+)] )
        pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph[static-libs(+)] )
+       rbd? ( sys-cluster/ceph )
        sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
        sdl? (
                media-libs/libsdl2[X]

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 987c96564697f0173e6e4fde940a889f1c71afb9..0d029214a5d6424d87066e1178440eed2f269440 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -64,7 +64,7 @@ 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 !plugins )
+       static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
        static-user? ( !plugins )
        virtfs? ( xattr )
        vte? ( gtk )
@@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND="
        )
        png? ( media-libs/libpng:0=[static-libs(+)] )
        pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph[static-libs(+)] )
+       rbd? ( sys-cluster/ceph )
        sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
        sdl? (
                media-libs/libsdl2[X]