1 |
commit: e62dec0234246f110ba6a74660ff4c76df38be48 |
2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
3 |
AuthorDate: Sat May 28 12:00:40 2016 +0000 |
4 |
Commit: M. B. <tomboy64 <AT> sina <DOT> cn> |
5 |
CommitDate: Sat May 28 12:04:35 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=e62dec02 |
7 |
|
8 |
update warning messages for perl6 ebuilds |
9 |
|
10 |
dev-lang/nqp/nqp-2016.04-r3.ebuild | 4 ++-- |
11 |
dev-lang/nqp/nqp-2016.05.ebuild | 4 ++-- |
12 |
dev-lang/nqp/nqp-9999.ebuild | 4 ++-- |
13 |
dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 8 ++++++++ |
14 |
dev-lang/rakudo/rakudo-2016.05.ebuild | 4 ++-- |
15 |
dev-lang/rakudo/rakudo-9999.ebuild | 4 ++-- |
16 |
6 files changed, 18 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild |
19 |
index 3d3e1b3..2be69d0 100644 |
20 |
--- a/dev-lang/nqp/nqp-2016.04-r3.ebuild |
21 |
+++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild |
22 |
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) |
23 |
pkg_pretend() { |
24 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
25 |
ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
26 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
27 |
- ewarn "reporting a bug." |
28 |
+ ewarn "already being installed. So if it fails, try uninstalling both Rakudo" |
29 |
+ ewarn "and NQP. (see Bug 584394)" |
30 |
fi |
31 |
} |
32 |
|
33 |
|
34 |
diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild |
35 |
index c142ddf..83f1013 100644 |
36 |
--- a/dev-lang/nqp/nqp-2016.05.ebuild |
37 |
+++ b/dev-lang/nqp/nqp-2016.05.ebuild |
38 |
@@ -40,8 +40,8 @@ DEPEND="${CDEPEND} |
39 |
pkg_pretend() { |
40 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
41 |
ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
42 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
43 |
- ewarn "reporting a bug." |
44 |
+ ewarn "already being installed. So if it fails, try uninstalling both Rakudo" |
45 |
+ ewarn "and NQP. (see Bug 584394)" |
46 |
fi |
47 |
} |
48 |
|
49 |
|
50 |
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild |
51 |
index c142ddf..83f1013 100644 |
52 |
--- a/dev-lang/nqp/nqp-9999.ebuild |
53 |
+++ b/dev-lang/nqp/nqp-9999.ebuild |
54 |
@@ -40,8 +40,8 @@ DEPEND="${CDEPEND} |
55 |
pkg_pretend() { |
56 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
57 |
ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
58 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
59 |
- ewarn "reporting a bug." |
60 |
+ ewarn "already being installed. So if it fails, try uninstalling both Rakudo" |
61 |
+ ewarn "and NQP. (see Bug 584394)" |
62 |
fi |
63 |
} |
64 |
|
65 |
|
66 |
diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
67 |
index 478cb08..4b5618b 100644 |
68 |
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
69 |
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
70 |
@@ -38,6 +38,14 @@ PATCHES=( |
71 |
"${FILESDIR}/${P}-jna-lib.patch" |
72 |
) |
73 |
|
74 |
+pkg_pretend() { |
75 |
+ if has_version dev-lang/rakudo; then |
76 |
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
77 |
+ ewarn "already being installed. So if it fails, try uninstalling Rakudo." |
78 |
+ ewarn "(see Bug 584394)" |
79 |
+ fi |
80 |
+} |
81 |
+ |
82 |
src_prepare() { |
83 |
epatch "${PATCHES[@]}" |
84 |
epatch_user |
85 |
|
86 |
diff --git a/dev-lang/rakudo/rakudo-2016.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild |
87 |
index 4f24e11..52b2ddc 100644 |
88 |
--- a/dev-lang/rakudo/rakudo-2016.05.ebuild |
89 |
+++ b/dev-lang/rakudo/rakudo-2016.05.ebuild |
90 |
@@ -37,8 +37,8 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) |
91 |
pkg_pretend() { |
92 |
if has_version dev-lang/rakudo; then |
93 |
ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
94 |
- ewarn "already being installed. So if it fails, try uninstalling it before" |
95 |
- ewarn "reporting a bug." |
96 |
+ ewarn "already being installed. So if it fails, try uninstalling Rakudo." |
97 |
+ ewarn "(see Bug 584394)" |
98 |
fi |
99 |
} |
100 |
|
101 |
|
102 |
diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild |
103 |
index 4f24e11..52b2ddc 100644 |
104 |
--- a/dev-lang/rakudo/rakudo-9999.ebuild |
105 |
+++ b/dev-lang/rakudo/rakudo-9999.ebuild |
106 |
@@ -37,8 +37,8 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) |
107 |
pkg_pretend() { |
108 |
if has_version dev-lang/rakudo; then |
109 |
ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
110 |
- ewarn "already being installed. So if it fails, try uninstalling it before" |
111 |
- ewarn "reporting a bug." |
112 |
+ ewarn "already being installed. So if it fails, try uninstalling Rakudo." |
113 |
+ ewarn "(see Bug 584394)" |
114 |
fi |
115 |
} |