commit: 631dad30b64e7089a741c704cebe921f20ca0a8d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 22:35:09 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 22:35:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631dad30
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 <AT> gentoo.org>
app-emulation/qemu/qemu-4.0.0-r50.ebuild | 4 ++--
app-emulation/qemu/qemu-4.1.0-r1.ebuild | 4 ++--
app-emulation/qemu/qemu-4.2.0-r1.ebuild | 4 ++--
app-emulation/qemu/qemu-9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index e121f256e56..6227a2fa81c 100644
--- 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 1bf631e15c6..c0af6bf7969 100644
--- 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 6f904b8d897..21a8f4a01b6 100644
--- 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 987c9656469..0d029214a5d 100644
--- 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]
