| 1 |
commit: 1f5adc9940ed096ec9db9f398d2f5311cf52edb5 |
| 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:29:11 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=1f5adc99 |
| 7 |
|
| 8 |
update warning messages for perl6 ebuilds |
| 9 |
|
| 10 |
dev-lang/nqp/nqp-2016.04-r3.ebuild | 7 ++++--- |
| 11 |
dev-lang/nqp/nqp-2016.05.ebuild | 7 ++++--- |
| 12 |
dev-lang/nqp/nqp-9999.ebuild | 7 ++++--- |
| 13 |
dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 9 +++++++++ |
| 14 |
dev-lang/rakudo/rakudo-2016.05.ebuild | 5 +++-- |
| 15 |
dev-lang/rakudo/rakudo-9999.ebuild | 5 +++-- |
| 16 |
6 files changed, 27 insertions(+), 13 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..35e745f 100644 |
| 20 |
--- a/dev-lang/nqp/nqp-2016.04-r3.ebuild |
| 21 |
+++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild |
| 22 |
@@ -40,9 +40,10 @@ PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) |
| 23 |
|
| 24 |
pkg_pretend() { |
| 25 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
| 26 |
- ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
| 27 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
| 28 |
- ewarn "reporting a bug." |
| 29 |
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" |
| 30 |
+ ewarn "already being installed. So if it fails, try uninstalling both" |
| 31 |
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." |
| 32 |
+ ewarn "(see Bug #584394)" |
| 33 |
fi |
| 34 |
} |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild |
| 38 |
index c142ddf..fe2ace6 100644 |
| 39 |
--- a/dev-lang/nqp/nqp-2016.05.ebuild |
| 40 |
+++ b/dev-lang/nqp/nqp-2016.05.ebuild |
| 41 |
@@ -39,9 +39,10 @@ DEPEND="${CDEPEND} |
| 42 |
|
| 43 |
pkg_pretend() { |
| 44 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
| 45 |
- ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
| 46 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
| 47 |
- ewarn "reporting a bug." |
| 48 |
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" |
| 49 |
+ ewarn "already being installed. So if it fails, try uninstalling both" |
| 50 |
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." |
| 51 |
+ ewarn "(see Bug #584394)" |
| 52 |
fi |
| 53 |
} |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild |
| 57 |
index c142ddf..fe2ace6 100644 |
| 58 |
--- a/dev-lang/nqp/nqp-9999.ebuild |
| 59 |
+++ b/dev-lang/nqp/nqp-9999.ebuild |
| 60 |
@@ -39,9 +39,10 @@ DEPEND="${CDEPEND} |
| 61 |
|
| 62 |
pkg_pretend() { |
| 63 |
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then |
| 64 |
- ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP" |
| 65 |
- ewarn "already being installed. So if it fails, try uninstalling them before" |
| 66 |
- ewarn "reporting a bug." |
| 67 |
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" |
| 68 |
+ ewarn "already being installed. So if it fails, try uninstalling both" |
| 69 |
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." |
| 70 |
+ ewarn "(see Bug #584394)" |
| 71 |
fi |
| 72 |
} |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
| 76 |
index 478cb08..18eb631 100644 |
| 77 |
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
| 78 |
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild |
| 79 |
@@ -38,6 +38,15 @@ PATCHES=( |
| 80 |
"${FILESDIR}/${P}-jna-lib.patch" |
| 81 |
) |
| 82 |
|
| 83 |
+pkg_pretend() { |
| 84 |
+ if has_version dev-lang/rakudo; then |
| 85 |
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
| 86 |
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," |
| 87 |
+ ewarn "then do a new installation." |
| 88 |
+ ewarn "(see Bug #584394)" |
| 89 |
+ fi |
| 90 |
+} |
| 91 |
+ |
| 92 |
src_prepare() { |
| 93 |
epatch "${PATCHES[@]}" |
| 94 |
epatch_user |
| 95 |
|
| 96 |
diff --git a/dev-lang/rakudo/rakudo-2016.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild |
| 97 |
index 4f24e11..821e32f 100644 |
| 98 |
--- a/dev-lang/rakudo/rakudo-2016.05.ebuild |
| 99 |
+++ b/dev-lang/rakudo/rakudo-2016.05.ebuild |
| 100 |
@@ -37,8 +37,9 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) |
| 101 |
pkg_pretend() { |
| 102 |
if has_version dev-lang/rakudo; then |
| 103 |
ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
| 104 |
- ewarn "already being installed. So if it fails, try uninstalling it before" |
| 105 |
- ewarn "reporting a bug." |
| 106 |
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," |
| 107 |
+ ewarn "then do a new installation." |
| 108 |
+ ewarn "(see Bug #584394)" |
| 109 |
fi |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild |
| 114 |
index 4f24e11..821e32f 100644 |
| 115 |
--- a/dev-lang/rakudo/rakudo-9999.ebuild |
| 116 |
+++ b/dev-lang/rakudo/rakudo-9999.ebuild |
| 117 |
@@ -37,8 +37,9 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) |
| 118 |
pkg_pretend() { |
| 119 |
if has_version dev-lang/rakudo; then |
| 120 |
ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
| 121 |
- ewarn "already being installed. So if it fails, try uninstalling it before" |
| 122 |
- ewarn "reporting a bug." |
| 123 |
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," |
| 124 |
+ ewarn "then do a new installation." |
| 125 |
+ ewarn "(see Bug #584394)" |
| 126 |
fi |
| 127 |
} |
Archives