commit: 4c93a7e4558fc28f319ae0dea2b28a4984e20172
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:19:52 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 18:22:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c93a7e4
app-emulation/qemu: avoid automagic dependency
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-emulation/qemu/metadata.xml | 1 +
.../qemu/{qemu-9999.ebuild => qemu-4.2.0-r2.ebuild} | 14 ++++++++++----
app-emulation/qemu/qemu-9999.ebuild | 9 ++++++---
profiles/arch/powerpc/package.use.mask | 4 ++++
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index a786f09baaa..07244b5deff 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -38,6 +38,7 @@
<flag name="pulseaudio">Enable pulseaudio output for sound
emulation</flag>
<flag name="rbd">Enable rados block device backend support, see
http://ceph.newdream.net/wiki/QEMU-RBD</flag>
<flag name="sdl">Enable the SDL-based console</flag>
+ <flag name="sdl-image">SDL Image support for icons</flag>
<flag name="spice">Enable Spice protocol support via
<pkg>app-emulation/spice</pkg></flag>
<flag name="ssh">Enable SSH based block device support via
<pkg>net-libs/libssh2</pkg></flag>
<flag name="static-user">Build the User targets as static
binaries</flag>
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-4.2.0-r2.ebuild
similarity index 98%
copy from app-emulation/qemu/qemu-9999.ebuild
copy to app-emulation/qemu/qemu-4.2.0-r2.ebuild
index 14242fb1227..08672cc11fb 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r2.ebuild
@@ -36,9 +36,10 @@ SLOT="0"
IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard
snappy
- spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
+ plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+ smartcard snappy spice ssh static static-user systemtap tci test usb
+ usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+ xfs +xkb"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -141,6 +142,7 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/libsdl2[X]
media-libs/libsdl2[static-libs(+)]
)
+ sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy:= )
@@ -212,9 +214,11 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )"
PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.0-cflags.patch
+ "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+ "${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
- "${FILESDIR}"/${PN}-4.2.0-cflags.patch
)
QA_PREBUILT="
@@ -434,6 +438,7 @@ qemu_src_configure() {
fi
}
conf_opts+=(
+ --disable-bluez
$(conf_notuser accessibility brlapi)
$(conf_notuser aio linux-aio)
$(conf_notuser bzip2)
@@ -459,6 +464,7 @@ qemu_src_configure() {
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
$(conf_notuser sdl)
+ $(conf_notuser sdl-image)
$(conf_notuser seccomp)
$(conf_notuser smartcard)
$(conf_notuser snappy)
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index 14242fb1227..4161073a355 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -36,9 +36,10 @@ SLOT="0"
IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard
snappy
- spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
+ plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+ smartcard snappy spice ssh static static-user systemtap tci test usb
+ usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+ xfs +xkb"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -141,6 +142,7 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/libsdl2[X]
media-libs/libsdl2[static-libs(+)]
)
+ sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy:= )
@@ -459,6 +461,7 @@ qemu_src_configure() {
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
$(conf_notuser sdl)
+ $(conf_notuser sdl-image)
$(conf_notuser seccomp)
$(conf_notuser smartcard)
$(conf_notuser snappy)
diff --git a/profiles/arch/powerpc/package.use.mask
b/profiles/arch/powerpc/package.use.mask
index c7f5980a8d4..9eee30cd0f2 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Matthias Maier <tam...@gentoo.org> (2020-03-13)
+# requires media-libs/sdl2-image, which is not yet keyworded
+app-emulation/qemu sdl-image
+
# Georgy Yakovlev <gyakov...@gentoo.org> (2020-01-25)
# requires fwupd, which is not yet keyworded
kde-plasma/discover firmware
