[gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/

[M. B.]

commit:     c2787295670f188f5a37d9ea3adee985efefbe33
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sat May 28 11:30:13 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Sat May 28 11:30:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=c2787295

update warning messages for perl6 ebuilds

 dev-lang/nqp/nqp-2016.04-r3.ebuild                           |  4 ++--
 dev-lang/nqp/nqp-2016.05.ebuild                              |  4 ++--
 dev-lang/nqp/nqp-9999.ebuild                                 |  4 ++--
 .../rakudo/{rakudo-9999.ebuild => rakudo-2016.04-r2.ebuild}  | 12 ++++++++----
 dev-lang/rakudo/rakudo-2016.05.ebuild                        |  4 ++--
 dev-lang/rakudo/rakudo-9999.ebuild                           |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild
index 3d3e1b3..2be69d0 100644
--- a/dev-lang/nqp/nqp-2016.04-r3.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}/enable-external-jars.patch" )
 pkg_pretend() {
 	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
 		ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling them before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling both Rakudo"
+		ewarn "and NQP. (see Bug 584394)"
 	fi
 }
 

diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild
index c142ddf..83f1013 100644
--- a/dev-lang/nqp/nqp-2016.05.ebuild
+++ b/dev-lang/nqp/nqp-2016.05.ebuild
@@ -40,8 +40,8 @@ DEPEND="${CDEPEND}
 pkg_pretend() {
 	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
 		ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling them before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling both Rakudo"
+		ewarn "and NQP. (see Bug 584394)"
 	fi
 }
 

diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index c142ddf..83f1013 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -40,8 +40,8 @@ DEPEND="${CDEPEND}
 pkg_pretend() {
 	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
 		ewarn "NQP is known to fail compilation/installation with rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling them before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling both Rakudo"
+		ewarn "and NQP. (see Bug 584394)"
 	fi
 }
 

diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
similarity index 87%
copy from dev-lang/rakudo/rakudo-9999.ebuild
copy to dev-lang/rakudo/rakudo-2016.04-r2.ebuild
index 4f24e11..4b5618b 100644
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
@@ -24,7 +24,8 @@ SLOT="0"
 IUSE="clang java +moar test"
 REQUIRED_USE="|| ( java moar )"
 
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]
+	>=dev-lang/nqp-2016.04-r3"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
@@ -32,13 +33,16 @@ DEPEND="${CDEPEND}
 	java? ( >=virtual/jdk-1.7 )
 	>=dev-lang/perl-5.10"
 
-PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.04-Makefile.in.patch"
+	"${FILESDIR}/${P}-jna-lib.patch"
+)
 
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try uninstalling it before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling Rakudo."
+		ewarn "(see Bug 584394)"
 	fi
 }
 

diff --git a/dev-lang/rakudo/rakudo-2016.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild
index 4f24e11..52b2ddc 100644
--- a/dev-lang/rakudo/rakudo-2016.05.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.05.ebuild
@@ -37,8 +37,8 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" )
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try uninstalling it before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling Rakudo."
+		ewarn "(see Bug 584394)"
 	fi
 }
 

diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild
index 4f24e11..52b2ddc 100644
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-9999.ebuild
@@ -37,8 +37,8 @@ PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" )
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try uninstalling it before"
-		ewarn "reporting a bug."
+		ewarn "already being installed. So if it fails, try uninstalling Rakudo."
+		ewarn "(see Bug 584394)"
 	fi
 }