1 |
commit: 99410ebd93dde16a172d239c01a95b141a74c394 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 15:52:20 2015 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 16:06:25 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99410ebd |
7 |
|
8 |
app-emulation/libvirt: Ebuild maintenance |
9 |
|
10 |
Unify DEPEND/RDEPEND statements and avoid a nested use conditional |
11 |
|
12 |
Package-Manager: portage-2.2.22 |
13 |
|
14 |
app-emulation/libvirt/libvirt-1.2.19-r1.ebuild | 12 +++++++++--- |
15 |
app-emulation/libvirt/libvirt-1.2.20.ebuild | 12 +++++++++--- |
16 |
app-emulation/libvirt/libvirt-9999.ebuild | 12 +++++++++--- |
17 |
3 files changed, 27 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild |
20 |
index f345b06..cb757f0 100644 |
21 |
--- a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild |
22 |
+++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild |
23 |
@@ -71,6 +71,7 @@ RDEPEND=" |
24 |
audit? ( sys-process/audit ) |
25 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
26 |
caps? ( sys-libs/libcap-ng ) |
27 |
+ firewalld? ( net-firewall/firewalld ) |
28 |
fuse? ( >=sys-fs/fuse-2.8.6 ) |
29 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
30 |
iscsi? ( sys-block/open-iscsi ) |
31 |
@@ -103,12 +104,17 @@ RDEPEND=" |
32 |
>=net-firewall/iptables-1.4.10[ipv6] |
33 |
net-misc/radvd |
34 |
sys-apps/iproute2[-minimal] |
35 |
- firewalld? ( net-firewall/firewalld ) |
36 |
) |
37 |
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
38 |
wireshark-plugins? ( net-analyzer/wireshark:= ) |
39 |
- xen? ( app-emulation/xen-tools app-emulation/xen ) |
40 |
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) |
41 |
+ xen? ( |
42 |
+ app-emulation/xen |
43 |
+ app-emulation/xen-tools |
44 |
+ ) |
45 |
+ udev? ( |
46 |
+ virtual/udev |
47 |
+ >=x11-libs/libpciaccess-0.10.9 |
48 |
+ ) |
49 |
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )" |
50 |
|
51 |
DEPEND="${RDEPEND} |
52 |
|
53 |
diff --git a/app-emulation/libvirt/libvirt-1.2.20.ebuild b/app-emulation/libvirt/libvirt-1.2.20.ebuild |
54 |
index f345b06..cb757f0 100644 |
55 |
--- a/app-emulation/libvirt/libvirt-1.2.20.ebuild |
56 |
+++ b/app-emulation/libvirt/libvirt-1.2.20.ebuild |
57 |
@@ -71,6 +71,7 @@ RDEPEND=" |
58 |
audit? ( sys-process/audit ) |
59 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
60 |
caps? ( sys-libs/libcap-ng ) |
61 |
+ firewalld? ( net-firewall/firewalld ) |
62 |
fuse? ( >=sys-fs/fuse-2.8.6 ) |
63 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
64 |
iscsi? ( sys-block/open-iscsi ) |
65 |
@@ -103,12 +104,17 @@ RDEPEND=" |
66 |
>=net-firewall/iptables-1.4.10[ipv6] |
67 |
net-misc/radvd |
68 |
sys-apps/iproute2[-minimal] |
69 |
- firewalld? ( net-firewall/firewalld ) |
70 |
) |
71 |
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
72 |
wireshark-plugins? ( net-analyzer/wireshark:= ) |
73 |
- xen? ( app-emulation/xen-tools app-emulation/xen ) |
74 |
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) |
75 |
+ xen? ( |
76 |
+ app-emulation/xen |
77 |
+ app-emulation/xen-tools |
78 |
+ ) |
79 |
+ udev? ( |
80 |
+ virtual/udev |
81 |
+ >=x11-libs/libpciaccess-0.10.9 |
82 |
+ ) |
83 |
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )" |
84 |
|
85 |
DEPEND="${RDEPEND} |
86 |
|
87 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
88 |
index f345b06..cb757f0 100644 |
89 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
90 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
91 |
@@ -71,6 +71,7 @@ RDEPEND=" |
92 |
audit? ( sys-process/audit ) |
93 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
94 |
caps? ( sys-libs/libcap-ng ) |
95 |
+ firewalld? ( net-firewall/firewalld ) |
96 |
fuse? ( >=sys-fs/fuse-2.8.6 ) |
97 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) |
98 |
iscsi? ( sys-block/open-iscsi ) |
99 |
@@ -103,12 +104,17 @@ RDEPEND=" |
100 |
>=net-firewall/iptables-1.4.10[ipv6] |
101 |
net-misc/radvd |
102 |
sys-apps/iproute2[-minimal] |
103 |
- firewalld? ( net-firewall/firewalld ) |
104 |
) |
105 |
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
106 |
wireshark-plugins? ( net-analyzer/wireshark:= ) |
107 |
- xen? ( app-emulation/xen-tools app-emulation/xen ) |
108 |
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) |
109 |
+ xen? ( |
110 |
+ app-emulation/xen |
111 |
+ app-emulation/xen-tools |
112 |
+ ) |
113 |
+ udev? ( |
114 |
+ virtual/udev |
115 |
+ >=x11-libs/libpciaccess-0.10.9 |
116 |
+ ) |
117 |
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )" |
118 |
|
119 |
DEPEND="${RDEPEND} |