1 |
commit: f32dd8f024fb67bf25b97e2c4b1e454929e717b8 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 19 20:09:18 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 19 20:09:18 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32dd8f0 |
7 |
|
8 |
app-emulation/qemu: Move some DEPEND entries to BDEPEND |
9 |
|
10 |
I'm not sure about PYTHON_DEPS but it usually needs to be in both and |
11 |
this is safest anyhow. |
12 |
|
13 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
15 |
|
16 |
.../{qemu-9999.ebuild => qemu-3.1.0-r2.ebuild} | 32 +++++++++++++++------- |
17 |
app-emulation/qemu/qemu-9999.ebuild | 21 ++++++++------ |
18 |
2 files changed, 34 insertions(+), 19 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-3.1.0-r2.ebuild |
21 |
similarity index 98% |
22 |
copy from app-emulation/qemu/qemu-9999.ebuild |
23 |
copy to app-emulation/qemu/qemu-3.1.0-r2.ebuild |
24 |
index 7561f0f611c..0eacff29941 100644 |
25 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
26 |
+++ b/app-emulation/qemu/qemu-3.1.0-r2.ebuild |
27 |
@@ -20,6 +20,9 @@ if [[ ${PV} = *9999* ]]; then |
28 |
else |
29 |
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz" |
30 |
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
31 |
+ |
32 |
+ # Gentoo specific patchsets: |
33 |
+ #SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" |
34 |
fi |
35 |
|
36 |
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |
37 |
@@ -170,6 +173,17 @@ PPC64_FIRMWARE_DEPEND=" |
38 |
) |
39 |
" |
40 |
|
41 |
+BDEPEND=" |
42 |
+ ${PYTHON_DEPS} |
43 |
+ dev-lang/perl |
44 |
+ sys-apps/texinfo |
45 |
+ virtual/pkgconfig |
46 |
+ gtk? ( nls? ( sys-devel/gettext ) ) |
47 |
+ test? ( |
48 |
+ dev-libs/glib[utils] |
49 |
+ sys-devel/bc |
50 |
+ ) |
51 |
+" |
52 |
CDEPEND=" |
53 |
!static? ( |
54 |
${ALL_DEPEND//\[static-libs(+)]} |
55 |
@@ -181,20 +195,12 @@ CDEPEND=" |
56 |
" |
57 |
DEPEND="${CDEPEND} |
58 |
${PYTHON_DEPS} |
59 |
- dev-lang/perl |
60 |
- sys-apps/texinfo |
61 |
- virtual/pkgconfig |
62 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
63 |
- gtk? ( nls? ( sys-devel/gettext ) ) |
64 |
static? ( |
65 |
${ALL_DEPEND} |
66 |
${SOFTMMU_TOOLS_DEPEND} |
67 |
) |
68 |
- static-user? ( ${ALL_DEPEND} ) |
69 |
- test? ( |
70 |
- dev-libs/glib[utils] |
71 |
- sys-devel/bc |
72 |
- )" |
73 |
+ static-user? ( ${ALL_DEPEND} )" |
74 |
RDEPEND="${CDEPEND} |
75 |
selinux? ( sec-policy/selinux-qemu )" |
76 |
|
77 |
@@ -202,6 +208,9 @@ PATCHES=( |
78 |
"${FILESDIR}"/${PN}-2.5.0-cflags.patch |
79 |
"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch |
80 |
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch |
81 |
+ "${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch |
82 |
+ "${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch |
83 |
+ #"${WORKDIR}"/patches |
84 |
) |
85 |
|
86 |
QA_PREBUILT=" |
87 |
@@ -670,7 +679,10 @@ src_install() { |
88 |
emake DESTDIR="${ED}" install |
89 |
|
90 |
# This might not exist if the test failed. #512010 |
91 |
- [[ -e check-report.html ]] && dohtml check-report.html |
92 |
+ if [[ -e check-report.html ]]; then |
93 |
+ docinto html |
94 |
+ dodoc check-report.html |
95 |
+ fi |
96 |
|
97 |
if use kernel_linux; then |
98 |
udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules |
99 |
|
100 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
101 |
index 7561f0f611c..41fd6e7737b 100644 |
102 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
103 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
104 |
@@ -170,6 +170,17 @@ PPC64_FIRMWARE_DEPEND=" |
105 |
) |
106 |
" |
107 |
|
108 |
+BDEPEND=" |
109 |
+ ${PYTHON_DEPS} |
110 |
+ dev-lang/perl |
111 |
+ sys-apps/texinfo |
112 |
+ virtual/pkgconfig |
113 |
+ gtk? ( nls? ( sys-devel/gettext ) ) |
114 |
+ test? ( |
115 |
+ dev-libs/glib[utils] |
116 |
+ sys-devel/bc |
117 |
+ ) |
118 |
+" |
119 |
CDEPEND=" |
120 |
!static? ( |
121 |
${ALL_DEPEND//\[static-libs(+)]} |
122 |
@@ -181,20 +192,12 @@ CDEPEND=" |
123 |
" |
124 |
DEPEND="${CDEPEND} |
125 |
${PYTHON_DEPS} |
126 |
- dev-lang/perl |
127 |
- sys-apps/texinfo |
128 |
- virtual/pkgconfig |
129 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
130 |
- gtk? ( nls? ( sys-devel/gettext ) ) |
131 |
static? ( |
132 |
${ALL_DEPEND} |
133 |
${SOFTMMU_TOOLS_DEPEND} |
134 |
) |
135 |
- static-user? ( ${ALL_DEPEND} ) |
136 |
- test? ( |
137 |
- dev-libs/glib[utils] |
138 |
- sys-devel/bc |
139 |
- )" |
140 |
+ static-user? ( ${ALL_DEPEND} )" |
141 |
RDEPEND="${CDEPEND} |
142 |
selinux? ( sec-policy/selinux-qemu )" |