1 |
commit: d12496d57eed74c6413db5b449407d1301b78c5c |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 12 05:10:01 2017 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 12 05:10:01 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12496d5 |
7 |
|
8 |
app-emulation/qemu: maintenance: update 9999, small cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
app-emulation/qemu/qemu-2.8.0-r10.ebuild | 7 ++----- |
13 |
app-emulation/qemu/qemu-2.8.0-r9.ebuild | 1 - |
14 |
app-emulation/qemu/qemu-2.8.1.ebuild | 7 ++----- |
15 |
app-emulation/qemu/qemu-9999.ebuild | 32 ++++++++++++++++++++++---------- |
16 |
4 files changed, 26 insertions(+), 21 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r10.ebuild b/app-emulation/qemu/qemu-2.8.0-r10.ebuild |
19 |
index 4e6a2220fba..6faddfc06b4 100644 |
20 |
--- a/app-emulation/qemu/qemu-2.8.0-r10.ebuild |
21 |
+++ b/app-emulation/qemu/qemu-2.8.0-r10.ebuild |
22 |
@@ -75,8 +75,7 @@ ALL_DEPEND=" |
23 |
sys-libs/zlib[static-libs(+)] |
24 |
python? ( ${PYTHON_DEPS} ) |
25 |
systemtap? ( dev-util/systemtap ) |
26 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
27 |
- " |
28 |
+ xattr? ( sys-apps/attr[static-libs(+)] )" |
29 |
|
30 |
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
31 |
# softmmu targets (qemu-system-*). |
32 |
@@ -151,8 +150,7 @@ SOFTMMU_TOOLS_DEPEND=" |
33 |
virgl? ( media-libs/virglrenderer[static-libs(+)] ) |
34 |
virtfs? ( sys-libs/libcap ) |
35 |
xen? ( app-emulation/xen-tools:= ) |
36 |
- xfs? ( sys-fs/xfsprogs[static-libs(+)] ) |
37 |
-" |
38 |
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
39 |
|
40 |
X86_FIRMWARE_DEPEND=" |
41 |
>=sys-firmware/ipxe-1.0.0_p20130624 |
42 |
@@ -752,7 +750,6 @@ src_install() { |
43 |
|
44 |
pkg_postinst() { |
45 |
DISABLE_AUTOFORMATTING=true |
46 |
- FORCE_PRINT_ELOG=1 # remove for next version bump |
47 |
readme.gentoo_print_elog |
48 |
|
49 |
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then |
50 |
|
51 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r9.ebuild b/app-emulation/qemu/qemu-2.8.0-r9.ebuild |
52 |
index 1cff5b77296..89dc516716b 100644 |
53 |
--- a/app-emulation/qemu/qemu-2.8.0-r9.ebuild |
54 |
+++ b/app-emulation/qemu/qemu-2.8.0-r9.ebuild |
55 |
@@ -747,7 +747,6 @@ src_install() { |
56 |
|
57 |
pkg_postinst() { |
58 |
DISABLE_AUTOFORMATTING=true |
59 |
- FORCE_PRINT_ELOG=1 # remove for next version bump |
60 |
readme.gentoo_print_elog |
61 |
|
62 |
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then |
63 |
|
64 |
diff --git a/app-emulation/qemu/qemu-2.8.1.ebuild b/app-emulation/qemu/qemu-2.8.1.ebuild |
65 |
index 60572f21d30..3e859615eed 100644 |
66 |
--- a/app-emulation/qemu/qemu-2.8.1.ebuild |
67 |
+++ b/app-emulation/qemu/qemu-2.8.1.ebuild |
68 |
@@ -71,8 +71,7 @@ ALL_DEPEND=" |
69 |
sys-libs/zlib[static-libs(+)] |
70 |
python? ( ${PYTHON_DEPS} ) |
71 |
systemtap? ( dev-util/systemtap ) |
72 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
73 |
- " |
74 |
+ xattr? ( sys-apps/attr[static-libs(+)] )" |
75 |
|
76 |
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
77 |
# softmmu targets (qemu-system-*). |
78 |
@@ -147,8 +146,7 @@ SOFTMMU_TOOLS_DEPEND=" |
79 |
virgl? ( media-libs/virglrenderer[static-libs(+)] ) |
80 |
virtfs? ( sys-libs/libcap ) |
81 |
xen? ( app-emulation/xen-tools:= ) |
82 |
- xfs? ( sys-fs/xfsprogs[static-libs(+)] ) |
83 |
-" |
84 |
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
85 |
|
86 |
X86_FIRMWARE_DEPEND=" |
87 |
>=sys-firmware/ipxe-1.0.0_p20130624 |
88 |
@@ -741,7 +739,6 @@ src_install() { |
89 |
|
90 |
pkg_postinst() { |
91 |
DISABLE_AUTOFORMATTING=true |
92 |
- FORCE_PRINT_ELOG=1 # remove for next version bump |
93 |
readme.gentoo_print_elog |
94 |
|
95 |
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then |
96 |
|
97 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
98 |
index c208a1d924b..2279c396cfa 100644 |
99 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
100 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
101 |
@@ -73,11 +73,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
102 |
# pulseaudio? ( media-sound/pulseaudio ) |
103 |
# seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) |
104 |
# but these are so few it is not worth the effort to separate this list. |
105 |
-TARGETS_DEPEND=" |
106 |
+ALL_DEPEND=" |
107 |
>=dev-libs/glib-2.0[static-libs(+)] |
108 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
109 |
sys-libs/zlib[static-libs(+)] |
110 |
- accessibility? ( app-accessibility/brltty[static-libs(+)] ) |
111 |
+ python? ( ${PYTHON_DEPS} ) |
112 |
+ systemtap? ( dev-util/systemtap ) |
113 |
+ xattr? ( sys-apps/attr[static-libs(+)] )" |
114 |
+ |
115 |
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
116 |
+# softmmu targets (qemu-system-*). |
117 |
+SOFTMMU_TOOLS_DEPEND=" |
118 |
+ accessibility? ( |
119 |
+ app-accessibility/brltty[api] |
120 |
+ app-accessibility/brltty[static-libs(+)] |
121 |
+ ) |
122 |
aio? ( dev-libs/libaio[static-libs(+)] ) |
123 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
124 |
bluetooth? ( net-wireless/bluez ) |
125 |
@@ -118,7 +128,6 @@ TARGETS_DEPEND=" |
126 |
) |
127 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
128 |
pulseaudio? ( media-sound/pulseaudio ) |
129 |
- python? ( ${PYTHON_DEPS} ) |
130 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
131 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
132 |
sdl? ( |
133 |
@@ -139,13 +148,11 @@ TARGETS_DEPEND=" |
134 |
>=app-emulation/spice-0.12.0[static-libs(+)] |
135 |
) |
136 |
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) |
137 |
- systemtap? ( dev-util/systemtap ) |
138 |
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) |
139 |
usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) |
140 |
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) |
141 |
vde? ( net-misc/vde[static-libs(+)] ) |
142 |
virgl? ( media-libs/virglrenderer[static-libs(+)] ) |
143 |
virtfs? ( sys-libs/libcap ) |
144 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
145 |
xen? ( app-emulation/xen-tools:= ) |
146 |
xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
147 |
|
148 |
@@ -163,7 +170,10 @@ X86_FIRMWARE_DEPEND=" |
149 |
)" |
150 |
|
151 |
CDEPEND=" |
152 |
- !static? ( ${TARGETS_DEPEND//\[static-libs(+)]} ) |
153 |
+ !static? ( |
154 |
+ ${ALL_DEPEND//\[static-libs(+)]} |
155 |
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} |
156 |
+ ) |
157 |
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) |
158 |
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )" |
159 |
DEPEND="${CDEPEND} |
160 |
@@ -173,8 +183,11 @@ DEPEND="${CDEPEND} |
161 |
virtual/pkgconfig |
162 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
163 |
gtk? ( nls? ( sys-devel/gettext ) ) |
164 |
- static? ( ${TARGETS_DEPEND} ) |
165 |
- static-user? ( ${TARGETS_DEPEND} ) |
166 |
+ static? ( |
167 |
+ ${ALL_DEPEND} |
168 |
+ ${SOFTMMU_TOOLS_DEPEND} |
169 |
+ ) |
170 |
+ static-user? ( ${ALL_DEPEND} ) |
171 |
test? ( |
172 |
dev-libs/glib[utils] |
173 |
sys-devel/bc |
174 |
@@ -714,7 +727,6 @@ src_install() { |
175 |
|
176 |
pkg_postinst() { |
177 |
DISABLE_AUTOFORMATTING=true |
178 |
- FORCE_PRINT_ELOG=1 # remove for next version bump |
179 |
readme.gentoo_print_elog |
180 |
|
181 |
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then |