| 1 |
commit: 631dad30b64e7089a741c704cebe921f20ca0a8d |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 20 22:35:09 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 20 22:35:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631dad30 |
| 7 |
|
| 8 |
app-emulation/qemu: make USE=rbd and USE=static mutually exclusive |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/qemu/qemu-4.0.0-r50.ebuild | 4 ++-- |
| 14 |
app-emulation/qemu/qemu-4.1.0-r1.ebuild | 4 ++-- |
| 15 |
app-emulation/qemu/qemu-4.2.0-r1.ebuild | 4 ++-- |
| 16 |
app-emulation/qemu/qemu-9999.ebuild | 4 ++-- |
| 17 |
4 files changed, 8 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild |
| 20 |
index e121f256e56..6227a2fa81c 100644 |
| 21 |
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild |
| 22 |
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild |
| 23 |
@@ -58,7 +58,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 24 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 25 |
qemu_softmmu_targets_riscv32? ( fdt ) |
| 26 |
qemu_softmmu_targets_riscv64? ( fdt ) |
| 27 |
- static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) |
| 28 |
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !rbd !snappy ) |
| 29 |
virtfs? ( xattr ) |
| 30 |
vte? ( gtk )" |
| 31 |
|
| 32 |
@@ -126,7 +126,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 33 |
) |
| 34 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
| 35 |
pulseaudio? ( media-sound/pulseaudio ) |
| 36 |
- rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 37 |
+ rbd? ( sys-cluster/ceph ) |
| 38 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 39 |
sdl? ( |
| 40 |
media-libs/libsdl2[X] |
| 41 |
|
| 42 |
diff --git a/app-emulation/qemu/qemu-4.1.0-r1.ebuild b/app-emulation/qemu/qemu-4.1.0-r1.ebuild |
| 43 |
index 1bf631e15c6..c0af6bf7969 100644 |
| 44 |
--- a/app-emulation/qemu/qemu-4.1.0-r1.ebuild |
| 45 |
+++ b/app-emulation/qemu/qemu-4.1.0-r1.ebuild |
| 46 |
@@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 47 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 48 |
qemu_softmmu_targets_riscv32? ( fdt ) |
| 49 |
qemu_softmmu_targets_riscv64? ( fdt ) |
| 50 |
- static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) |
| 51 |
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !rbd !snappy ) |
| 52 |
virtfs? ( xattr ) |
| 53 |
vte? ( gtk )" |
| 54 |
|
| 55 |
@@ -132,7 +132,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 56 |
) |
| 57 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
| 58 |
pulseaudio? ( media-sound/pulseaudio ) |
| 59 |
- rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 60 |
+ rbd? ( sys-cluster/ceph ) |
| 61 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 62 |
sdl? ( |
| 63 |
media-libs/libsdl2[X] |
| 64 |
|
| 65 |
diff --git a/app-emulation/qemu/qemu-4.2.0-r1.ebuild b/app-emulation/qemu/qemu-4.2.0-r1.ebuild |
| 66 |
index 6f904b8d897..21a8f4a01b6 100644 |
| 67 |
--- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild |
| 68 |
+++ b/app-emulation/qemu/qemu-4.2.0-r1.ebuild |
| 69 |
@@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 70 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 71 |
qemu_softmmu_targets_riscv32? ( fdt ) |
| 72 |
qemu_softmmu_targets_riscv64? ( fdt ) |
| 73 |
- static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins ) |
| 74 |
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) |
| 75 |
static-user? ( !plugins ) |
| 76 |
virtfs? ( xattr ) |
| 77 |
vte? ( gtk ) |
| 78 |
@@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 79 |
) |
| 80 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
| 81 |
pulseaudio? ( media-sound/pulseaudio ) |
| 82 |
- rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 83 |
+ rbd? ( sys-cluster/ceph ) |
| 84 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 85 |
sdl? ( |
| 86 |
media-libs/libsdl2[X] |
| 87 |
|
| 88 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 89 |
index 987c9656469..0d029214a5d 100644 |
| 90 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 91 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 92 |
@@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 93 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 94 |
qemu_softmmu_targets_riscv32? ( fdt ) |
| 95 |
qemu_softmmu_targets_riscv64? ( fdt ) |
| 96 |
- static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins ) |
| 97 |
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) |
| 98 |
static-user? ( !plugins ) |
| 99 |
virtfs? ( xattr ) |
| 100 |
vte? ( gtk ) |
| 101 |
@@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 102 |
) |
| 103 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
| 104 |
pulseaudio? ( media-sound/pulseaudio ) |
| 105 |
- rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 106 |
+ rbd? ( sys-cluster/ceph ) |
| 107 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 108 |
sdl? ( |
| 109 |
media-libs/libsdl2[X] |
Archives