1 |
commit: 01e6609cc66e8259d1b39f455f8c696aac3feda8 |
2 |
Author: Anselm Busse <anselm.busse <AT> outlook <DOT> com> |
3 |
AuthorDate: Thu Apr 4 08:06:01 2019 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 4 14:55:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e6609c |
7 |
|
8 |
app-emulation/libvirt: fixes dependency on incompatible net-analyzer/gnu-netcat and net-analyzer/netcat |
9 |
|
10 |
Closes: https://bugs.gentoo.org/682494 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/11583 |
12 |
Signed-off-by: Anselm Busse <anselm.busse <AT> outlook.com> |
13 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
14 |
|
15 |
app-emulation/libvirt/libvirt-4.9.0.ebuild | 6 +----- |
16 |
app-emulation/libvirt/libvirt-5.0.0-r1.ebuild | 6 +----- |
17 |
app-emulation/libvirt/libvirt-5.1.0.ebuild | 6 +----- |
18 |
app-emulation/libvirt/libvirt-9999.ebuild | 6 +----- |
19 |
4 files changed, 4 insertions(+), 20 deletions(-) |
20 |
|
21 |
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild |
22 |
index 5d4906ba113..95b5a3438d7 100644 |
23 |
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild |
24 |
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild |
25 |
@@ -57,11 +57,7 @@ RDEPEND=" |
26 |
dev-libs/libgcrypt:0 |
27 |
dev-libs/libnl:3 |
28 |
>=dev-libs/libxml2-2.7.6 |
29 |
- || ( |
30 |
- >=net-analyzer/gnu-netcat-0.7.1-r3 |
31 |
- >=net-analyzer/netcat-110-r9 |
32 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
33 |
- ) |
34 |
+ >=net-analyzer/openbsd-netcat-1.105-r1 |
35 |
>=net-libs/gnutls-1.0.25:0= |
36 |
net-libs/libssh2 |
37 |
net-libs/libtirpc |
38 |
|
39 |
diff --git a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild |
40 |
index f5e5d7d5dde..dd115c7a957 100644 |
41 |
--- a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild |
42 |
+++ b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild |
43 |
@@ -56,11 +56,7 @@ RDEPEND=" |
44 |
dev-libs/libgcrypt:0 |
45 |
dev-libs/libnl:3 |
46 |
>=dev-libs/libxml2-2.7.6 |
47 |
- || ( |
48 |
- >=net-analyzer/gnu-netcat-0.7.1-r3 |
49 |
- >=net-analyzer/netcat-110-r9 |
50 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
51 |
- ) |
52 |
+ >=net-analyzer/openbsd-netcat-1.105-r1 |
53 |
>=net-libs/gnutls-1.0.25:0= |
54 |
net-libs/libssh2 |
55 |
net-libs/libtirpc |
56 |
|
57 |
diff --git a/app-emulation/libvirt/libvirt-5.1.0.ebuild b/app-emulation/libvirt/libvirt-5.1.0.ebuild |
58 |
index 1f96bf5f51a..d0b9652fb37 100644 |
59 |
--- a/app-emulation/libvirt/libvirt-5.1.0.ebuild |
60 |
+++ b/app-emulation/libvirt/libvirt-5.1.0.ebuild |
61 |
@@ -56,11 +56,7 @@ RDEPEND=" |
62 |
dev-libs/libgcrypt:0 |
63 |
dev-libs/libnl:3 |
64 |
>=dev-libs/libxml2-2.7.6 |
65 |
- || ( |
66 |
- >=net-analyzer/gnu-netcat-0.7.1-r3 |
67 |
- >=net-analyzer/netcat-110-r9 |
68 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
69 |
- ) |
70 |
+ >=net-analyzer/openbsd-netcat-1.105-r1 |
71 |
>=net-libs/gnutls-1.0.25:0= |
72 |
net-libs/libssh2 |
73 |
net-libs/libtirpc |
74 |
|
75 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
76 |
index 7d5151b6d96..39626cb3fae 100644 |
77 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
78 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
79 |
@@ -56,11 +56,7 @@ RDEPEND=" |
80 |
dev-libs/libgcrypt:0 |
81 |
dev-libs/libnl:3 |
82 |
>=dev-libs/libxml2-2.7.6 |
83 |
- || ( |
84 |
- >=net-analyzer/gnu-netcat-0.7.1-r3 |
85 |
- >=net-analyzer/netcat-110-r9 |
86 |
- >=net-analyzer/openbsd-netcat-1.105-r1 |
87 |
- ) |
88 |
+ >=net-analyzer/openbsd-netcat-1.105-r1 |
89 |
>=net-libs/gnutls-1.0.25:0= |
90 |
net-libs/libssh2 |
91 |
net-libs/libtirpc |