Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
Date: Fri, 05 Jul 2019 20:17:53
Message-Id: 1562357822.e8a99e83d3320a44b8ba8949d84e6459776b143a.mgorny@gentoo
1 commit: e8a99e83d3320a44b8ba8949d84e6459776b143a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 14 08:15:47 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 5 20:17:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a99e83
7
8 net-p2p/mldonkey: Replace STRIP_MASK with RESTRICT=strip
9
10 Closes: https://bugs.gentoo.org/651456
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 5 +++--
14 net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 5 +++--
15 net-p2p/mldonkey/mldonkey-3.1.6.ebuild | 5 +++--
16 3 files changed, 9 insertions(+), 6 deletions(-)
17
18 diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
19 index 118e1cfae15..2f99a446acc 100644
20 --- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
21 +++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI="6"
28 @@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
29 DEPEND="${RDEPEND}
30 >=dev-lang/ocaml-3.10.2[ocamlopt?]"
31
32 +RESTRICT="!ocamlopt? ( strip )"
33 +
34 MLUSER="p2p"
35
36 pkg_setup() {
37 @@ -111,7 +113,6 @@ src_compile() {
38 src_install() {
39 local myext=""
40 use ocamlopt || myext=".byte"
41 - use ocamlopt || export STRIP_MASK="*/bin/*"
42 if ! use guionly; then
43 for i in mlnet mld_hash get_range copysources subconv; do
44 newbin $i$myext $i
45
46 diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
47 index 242b4131422..a92fc8ae472 100644
48 --- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
49 +++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2018 Gentoo Authors
52 +# Copyright 1999-2019 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI="6"
56 @@ -29,6 +29,8 @@ RDEPEND="dev-lang/perl
57 DEPEND="${RDEPEND}
58 >=dev-lang/ocaml-3.10.2[ocamlopt?]"
59
60 +RESTRICT="!ocamlopt? ( strip )"
61 +
62 MLUSER="p2p"
63
64 pkg_setup() {
65 @@ -113,7 +115,6 @@ src_compile() {
66 src_install() {
67 local myext=""
68 use ocamlopt || myext=".byte"
69 - use ocamlopt || export STRIP_MASK="*/bin/*"
70 if ! use guionly; then
71 for i in mlnet mld_hash get_range copysources subconv; do
72 newbin $i$myext $i
73
74 diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
75 index 861c8017b3e..06defbcd139 100644
76 --- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
77 +++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
78 @@ -1,4 +1,4 @@
79 -# Copyright 1999-2018 Gentoo Foundation
80 +# Copyright 1999-2019 Gentoo Authors
81 # Distributed under the terms of the GNU General Public License v2
82
83 EAPI="6"
84 @@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
85 DEPEND="${RDEPEND}
86 >=dev-lang/ocaml-3.10.2[ocamlopt?]"
87
88 +RESTRICT="!ocamlopt? ( strip )"
89 +
90 MLUSER="p2p"
91
92 pkg_setup() {
93 @@ -109,7 +111,6 @@ src_compile() {
94 src_install() {
95 local myext=""
96 use ocamlopt || myext=".byte"
97 - use ocamlopt || export STRIP_MASK="*/bin/*"
98 if ! use guionly; then
99 for i in mlnet mld_hash get_range copysources subconv; do
100 newbin $i$myext $i