commit: f32dd8f024fb67bf25b97e2c4b1e454929e717b8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 20:09:18 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 20:09:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32dd8f0
app-emulation/qemu: Move some DEPEND entries to BDEPEND
I'm not sure about PYTHON_DEPS but it usually needs to be in both and
this is safest anyhow.
Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../{qemu-9999.ebuild => qemu-3.1.0-r2.ebuild} | 32 +++++++++++++++-------
app-emulation/qemu/qemu-9999.ebuild | 21 ++++++++------
2 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-3.1.0-r2.ebuild
similarity index 98%
copy from app-emulation/qemu/qemu-9999.ebuild
copy to app-emulation/qemu/qemu-3.1.0-r2.ebuild
index 7561f0f611c..0eacff29941 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0-r2.ebuild
@@ -20,6 +20,9 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz";
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+ # Gentoo specific patchsets:
+ #SRC_URI+="
https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz";
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -170,6 +173,17 @@ PPC64_FIRMWARE_DEPEND="
)
"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
CDEPEND="
!static? (
${ALL_DEPEND//\[static-libs(+)]}
@@ -181,20 +195,12 @@ CDEPEND="
"
DEPEND="${CDEPEND}
${PYTHON_DEPS}
- dev-lang/perl
- sys-apps/texinfo
- virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- gtk? ( nls? ( sys-devel/gettext ) )
static? (
${ALL_DEPEND}
${SOFTMMU_TOOLS_DEPEND}
)
- static-user? ( ${ALL_DEPEND} )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )"
+ static-user? ( ${ALL_DEPEND} )"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )"
@@ -202,6 +208,9 @@ 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}-3.1.0-CVE-2018-20123.patch
+ "${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch
+ #"${WORKDIR}"/patches
)
QA_PREBUILT="
@@ -670,7 +679,10 @@ src_install() {
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dohtml check-report.html
+ if [[ -e check-report.html ]]; then
+ docinto html
+ dodoc check-report.html
+ fi
if use kernel_linux; then
udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index 7561f0f611c..41fd6e7737b 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -170,6 +170,17 @@ PPC64_FIRMWARE_DEPEND="
)
"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
CDEPEND="
!static? (
${ALL_DEPEND//\[static-libs(+)]}
@@ -181,20 +192,12 @@ CDEPEND="
"
DEPEND="${CDEPEND}
${PYTHON_DEPS}
- dev-lang/perl
- sys-apps/texinfo
- virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- gtk? ( nls? ( sys-devel/gettext ) )
static? (
${ALL_DEPEND}
${SOFTMMU_TOOLS_DEPEND}
)
- static-user? ( ${ALL_DEPEND} )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )"
+ static-user? ( ${ALL_DEPEND} )"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )"
