1 |
commit: b578d63574a9970585b203ff7436fa55e0eed381 |
2 |
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net> |
3 |
AuthorDate: Mon Mar 29 20:37:26 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 10 07:21:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b578d635 |
7 |
|
8 |
net-p2p/mldonkey: Add net-analyzer/openbsd-netcat as an alternative |
9 |
|
10 |
...to net-analyzer/netcat. |
11 |
|
12 |
Signed-off-by: Jesus P Rey <gentoo <AT> chuso.net> |
13 |
Closes: https://bugs.gentoo.org/775971 |
14 |
Closes: https://github.com/gentoo/gentoo/pull/20188 |
15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
16 |
|
17 |
net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild | 7 ++++--- |
18 |
1 file changed, 4 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild |
21 |
index 0eaeac9e746..8557ea1a285 100644 |
22 |
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild |
23 |
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild |
24 |
@@ -17,9 +17,8 @@ IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp" |
25 |
|
26 |
REQUIRED_USE="guionly? ( gtk )" |
27 |
|
28 |
-RDEPEND="dev-lang/perl |
29 |
+COMMON_DEPEND="dev-lang/perl |
30 |
dev-ml/camlp4:= |
31 |
- net-analyzer/netcat |
32 |
gd? ( media-libs/gd[truetype] ) |
33 |
gtk? ( |
34 |
gnome-base/librsvg |
35 |
@@ -36,10 +35,12 @@ RDEPEND="dev-lang/perl |
36 |
) |
37 |
!guionly? ( acct-user/p2p ) |
38 |
" |
39 |
+RDEPEND="${COMMON_DEPEND} |
40 |
+ || ( net-analyzer/netcat net-analyzer/openbsd-netcat )" |
41 |
# Can't yet use newer OCaml |
42 |
# -unsafe-string usage: |
43 |
# https://github.com/ygrek/mldonkey/issues/46 |
44 |
-DEPEND="${RDEPEND} |
45 |
+DEPEND="${COMMON_DEPEND} |
46 |
<dev-lang/ocaml-4.10:=[ocamlopt?] |
47 |
bittorrent? ( |
48 |
|| ( |