public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-25 16:17 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-25 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9510f103db692ccc77f5988bbdd4d0d0f33b0b87
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed May 25 12:16:40 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Wed May 25 16:16:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=9510f103

new experimental perl6 ebuilds

 dev-lang/nqp/nqp-2016.04-r4.ebuild                 | 114 +++++++++++++++++++++
 ...rakudo-9999.ebuild => rakudo-2016.04-r3.ebuild} |  56 +++++-----
 2 files changed, 143 insertions(+), 27 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild
new file mode 100644
index 0000000..6d3e38e
--- /dev/null
+++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )
+	dev-libs/libffi"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7:* )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7:* )
+	dev-lang/perl"
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_configure() {
+	local backends
+	use java && backends+="jvm,"
+	use moar && backends+="moar"
+
+	local myconfargs=(
+		"--backend=${backends}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+
+	if use java; then
+		# Export this for the script we sed'd above.
+		export THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4)
+	fi
+}
+
+src_compile() {
+	if use java; then
+		emake -j1 \
+			  THIRDPARTY_JARS="${THIRDPARTY_JARS}" \
+			  JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	else
+		emake -j1
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	if use java; then
+		# Set JAVA_PKG_JARDEST early.
+		java-pkg_init_paths_
+
+		# Upstream sets the classpath to this location. Perhaps it's
+		# used to locate the additional libraries?
+		java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+		insinto "${JAVA_PKG_JARDEST}"
+		local jar
+
+		for jar in *.jar; do
+			if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+				# jars for NQP itself.
+				java-pkg_dojar ${jar}
+			else
+				# jars used by NQP.
+				doins ${jar}
+			fi
+		done
+
+		# Upstream uses -Xbootclasspath/a, which is faster due to lack
+		# of verification, but gjl isn't flexible enough yet. :(
+		java-pkg_dolauncher ${PN}-j --main ${PN}
+		dosym ${PN}-j /usr/bin/${PN}
+		dobin tools/jvm/eval-client.pl
+	else
+		emake DESTDIR="${ED}" install
+	fi
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}

diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
similarity index 64%
rename from dev-lang/rakudo/rakudo-9999.ebuild
rename to dev-lang/rakudo/rakudo-2016.04-r3.ebuild
index c6696c6..5b8088c 100644
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit java-pkg-2
+inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
 HOMEPAGE="http://rakudo.org"
@@ -15,31 +15,29 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 fi
 
 LICENSE="Artistic-2"
 SLOT="0"
 # TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java moar test"
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
 
-RDEPEND="~dev-lang/nqp-${PV}:=[java=,moar=,clang=]"
-DEPEND="${RDEPEND}
-	clang? ( sys-devel/clang )
-	>=dev-lang/perl-5.10"
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java=,moar=,clang=]"
 
-REQUIRED_USE="|| ( java moar )"
-PATCHES=( "${FILESDIR}/${PN}-2016.04-Makefile.in.patch" )
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7:* )"
 
-pkg_pretend() {
-	if has_version dev-lang/rakudo && use java; then
-		die "Rakudo is known to fail compilation with the jvm backend if it's already installed."
-	fi
-}
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7:* )
+	>=dev-lang/perl-5.10"
 
-pkg_setup() {
-	use java && java-pkg-2_pkg_setup
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.04-Makefile.in.patch"
+	"${FILESDIR}/${PN}-jna-lib.patch"
+)
 
 src_prepare() {
 	eapply "${PATCHES[@]}"
@@ -52,32 +50,36 @@ src_prepare() {
 	done
 
 	eapply_user
-	use java && java-pkg-2_src_prepare
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
 	local backends
 	use java && backends+="jvm,"
 	use moar && backends+="moar,"
-	local myargs=( "--prefix=/usr"
+
+	local myargs=(
+		"--prefix=/usr"
 		"--sysroot=/"
 		"--sdkroot=/"
-		"--make-install"
-		"--sdkroot=/"
 		"--backends=${backends}"
 	)
+
 	perl Configure.pl "${myargs[@]}"
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
 }
 
 src_compile() {
-	emake DESTDIR="${D}"
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 
-src_test() {
-	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
-	default
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-25 20:45 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-25 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b8c56dd73e1bf494ac469491b07c525e00bc4d3c
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed May 25 20:44:00 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Wed May 25 20:44:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=b8c56dd7

rework java support within nqp and moarvm (thanks chewi!)

 dev-lang/nqp/Manifest                    |  1 +
 dev-lang/nqp/nqp-2016.04-r4.ebuild       | 29 ++++++++++++++++++++++++-----
 dev-lang/rakudo/Manifest                 |  1 +
 dev-lang/rakudo/rakudo-2016.04-r3.ebuild |  2 +-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
new file mode 100644
index 0000000..19088f1
--- /dev/null
+++ b/dev-lang/nqp/Manifest
@@ -0,0 +1 @@
+DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162

diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild
index 6d3e38e..9495089 100644
--- a/dev-lang/nqp/nqp-2016.04-r4.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
 	inherit vcs-snapshot
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
@@ -32,14 +32,16 @@ CDEPEND="java? (
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )
 	dev-libs/libffi"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7:* )"
+	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7:* )
+	java? ( >=virtual/jdk-1.7 )
 	dev-lang/perl"
+PATCHES=( "${FILESDIR}/enable-external-jars.patch" )
 
 java_prepare() {
 	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
 	java-pkg_clean 3rdparty/
 
 	# Don't use jars we just deleted.
@@ -47,6 +49,15 @@ java_prepare() {
 		src/vm/jvm/runners/nqp-j || die
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		mv "${WORKDIR}/perl6-nqp-"* "${WORKDIR}/${P}" || die
+	fi
+}
+
 src_configure() {
 	local backends
 	use java && backends+="jvm,"
@@ -79,6 +90,16 @@ src_test() {
 }
 
 src_install() {
+	if use moar; then
+		if use java; then
+			# We need to re-run Configure.pl with only the MoarVM backend,
+			# so we don't overwrite our custom java install.
+			# This has to happen before the installation of nqp's MoarVM bits.
+			# Also, those bits have to get installed before the JVM bits.
+			perl Configure.pl --backend=moar --prefix=/usr || die
+		fi
+		emake DESTDIR="${ED}" install
+	fi
 	if use java; then
 		# Set JAVA_PKG_JARDEST early.
 		java-pkg_init_paths_
@@ -105,8 +126,6 @@ src_install() {
 		java-pkg_dolauncher ${PN}-j --main ${PN}
 		dosym ${PN}-j /usr/bin/${PN}
 		dobin tools/jvm/eval-client.pl
-	else
-		emake DESTDIR="${ED}" install
 	fi
 
 	dodoc CREDITS README.pod

diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
new file mode 100644
index 0000000..34951ea
--- /dev/null
+++ b/dev-lang/rakudo/Manifest
@@ -0,0 +1 @@
+DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6

diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
index 5b8088c..7421cad 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Artistic-2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-26 15:44 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-26 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cab694e6ed0f4ea0f443e25e20adaca75ad7a9ed
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed May 25 20:44:00 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Thu May 26 11:23:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=cab694e6

rework java support within nqp and rakudo (thanks chewi!)

 dev-lang/nqp/Manifest                    |  1 +
 dev-lang/nqp/nqp-2016.04-r4.ebuild       | 20 +++++++++++++++-----
 dev-lang/rakudo/Manifest                 |  1 +
 dev-lang/rakudo/rakudo-2016.04-r3.ebuild |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
new file mode 100644
index 0000000..19088f1
--- /dev/null
+++ b/dev-lang/nqp/Manifest
@@ -0,0 +1 @@
+DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162

diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild
index 6d3e38e..54d68a5 100644
--- a/dev-lang/nqp/nqp-2016.04-r4.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
 	inherit vcs-snapshot
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
@@ -32,14 +32,16 @@ CDEPEND="java? (
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )
 	dev-libs/libffi"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7:* )"
+	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7:* )
+	java? ( >=virtual/jdk-1.7 )
 	dev-lang/perl"
+PATCHES=( "${FILESDIR}/enable-external-jars.patch" )
 
 java_prepare() {
 	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
 	java-pkg_clean 3rdparty/
 
 	# Don't use jars we just deleted.
@@ -79,6 +81,16 @@ src_test() {
 }
 
 src_install() {
+	if use moar; then
+		if use java; then
+			# We need to re-run Configure.pl with only the MoarVM backend,
+			# so we don't overwrite our custom java install.
+			# This has to happen before the installation of nqp's MoarVM bits.
+			# Also, those bits have to get installed before the JVM bits.
+			perl Configure.pl --backend=moar --prefix=/usr || die
+		fi
+		emake DESTDIR="${ED}" install
+	fi
 	if use java; then
 		# Set JAVA_PKG_JARDEST early.
 		java-pkg_init_paths_
@@ -105,8 +117,6 @@ src_install() {
 		java-pkg_dolauncher ${PN}-j --main ${PN}
 		dosym ${PN}-j /usr/bin/${PN}
 		dobin tools/jvm/eval-client.pl
-	else
-		emake DESTDIR="${ED}" install
 	fi
 
 	dodoc CREDITS README.pod

diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
new file mode 100644
index 0000000..34951ea
--- /dev/null
+++ b/dev-lang/rakudo/Manifest
@@ -0,0 +1 @@
+DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6

diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
index 5b8088c..7421cad 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Artistic-2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-26 15:44 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-26 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     92b5d006f7ab058c76be9a4846ba04da4e2ba857
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Thu May 26 15:44:19 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Thu May 26 15:44:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=92b5d006

updated new versions of 2016.04; using multibuild with nqp

 dev-lang/nqp/nqp-2016.04-r5.ebuild       | 144 +++++++++++++++++++++++++++++++
 dev-lang/rakudo/rakudo-2016.04-r3.ebuild |  26 ++----
 2 files changed, 152 insertions(+), 18 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r5.ebuild b/dev-lang/nqp/nqp-2016.04-r5.ebuild
new file mode 100644
index 0000000..82d2b2b
--- /dev/null
+++ b/dev-lang/nqp/nqp-2016.04-r5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )
+	dev-libs/libffi"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+PATCHES=( "${FILESDIR}/enable-external-jars.patch" )
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4)
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1
+	fi
+	popd || die
+}
+
+nqp_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	emake -j1 test
+	popd || die
+}
+
+nqp_install() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	if [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake DESTDIR="${ED}" install
+	elif [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		# Set JAVA_PKG_JARDEST early.
+		java-pkg_init_paths_
+
+		# Upstream sets the classpath to this location. Perhaps it's
+		# used to locate the additional libraries?
+		java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+		insinto "${JAVA_PKG_JARDEST}"
+		local jar
+
+		for jar in *.jar; do
+			if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+				# jars for NQP itself.
+				java-pkg_dojar ${jar}
+			else
+				# jars used by NQP.
+				doins ${jar}
+			fi
+		done
+
+		# Upstream uses -Xbootclasspath/a, which is faster due to lack
+		# of verification, but gjl isn't flexible enough yet. :(
+		java-pkg_dolauncher ${PN}-j --main ${PN}
+		dosym ${PN}-j /usr/bin/${PN}
+		dobin tools/jvm/eval-client.pl
+	fi
+	popd || die
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}

diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
index 7421cad..0255978 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
@@ -24,14 +24,12 @@ 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=]"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
+	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7:* )
+	java? ( >=virtual/jdk-1.7 )
 	>=dev-lang/perl-5.10"
 
 PATCHES=(
@@ -39,24 +37,16 @@ PATCHES=(
 	"${FILESDIR}/${PN}-jna-lib.patch"
 )
 
-src_prepare() {
-	eapply "${PATCHES[@]}"
-
-	# yup, this is ugly. but emake doesn't respect DESTDIR.
-	for i in Moar JVM; do
-		echo "DESTDIR   = ${D}" > "${T}/Makefile-${i}.in" || die
-		cat "${S}/tools/build/Makefile-${i}.in" >> "${T}/Makefile-${i}.in" || die
-		mv "${T}/Makefile-${i}.in" "${S}/tools/build/Makefile-${i}.in" || die
-	done
-
-	eapply_user
-	java-pkg-opt-2_src_prepare
+pkg_pretend() {
+	if has_version dev-lang/rakudo && use java; then
+		die "Rakudo is known to fail compilation with the jvm backend if it's already installed."
+	fi
 }
 
 src_configure() {
 	local backends
 	use java && backends+="jvm,"
-	use moar && backends+="moar,"
+	use moar && backends+="moar"
 
 	local myargs=(
 		"--prefix=/usr"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-27  4:11 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-27  4:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b821d4a0d73cd415d5b0d607d5aa9135a62d15d8
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri May 27 04:10:15 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Fri May 27 04:10:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=b821d4a0

remove keywords from perl ebuilds since the stuff is about to get pushed
to the tree

 dev-lang/nqp/nqp-2016.04-r3.ebuild       | 2 +-
 dev-lang/nqp/nqp-2016.04-r4.ebuild       | 2 +-
 dev-lang/nqp/nqp-2016.04-r5.ebuild       | 2 +-
 dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 2 +-
 dev-lang/rakudo/rakudo-2016.04-r3.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild
index 102d9e0..47c7906 100644
--- a/dev-lang/nqp/nqp-2016.04-r3.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"

diff --git a/dev-lang/nqp/nqp-2016.04-r4.ebuild b/dev-lang/nqp/nqp-2016.04-r4.ebuild
index 54d68a5..02c414d 100644
--- a/dev-lang/nqp/nqp-2016.04-r4.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
 	inherit vcs-snapshot
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"

diff --git a/dev-lang/nqp/nqp-2016.04-r5.ebuild b/dev-lang/nqp/nqp-2016.04-r5.ebuild
index 82d2b2b..4f0bf1f 100644
--- a/dev-lang/nqp/nqp-2016.04-r5.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
 	inherit vcs-snapshot
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"

diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
index b9c781f..e60d437 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 fi
 
 LICENSE="Artistic-2"

diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
index 0255978..cd55aa5 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 fi
 
 LICENSE="Artistic-2"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-28 11:30 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-28 11:30 UTC (permalink / raw
  To: gentoo-commits

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
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-28 12:04 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-28 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e62dec0234246f110ba6a74660ff4c76df38be48
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sat May 28 12:00:40 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Sat May 28 12:04:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=e62dec02

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 ++--
 dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 8 ++++++++
 dev-lang/rakudo/rakudo-2016.05.ebuild    | 4 ++--
 dev-lang/rakudo/rakudo-9999.ebuild       | 4 ++--
 6 files changed, 18 insertions(+), 10 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-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
index 478cb08..4b5618b 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
@@ -38,6 +38,14 @@ PATCHES=(
 	"${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 Rakudo."
+		ewarn "(see Bug 584394)"
+	fi
+}
+
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	epatch_user

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
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/
@ 2016-05-28 12:29 M. B.
  0 siblings, 0 replies; 8+ messages in thread
From: M. B. @ 2016-05-28 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1f5adc9940ed096ec9db9f398d2f5311cf52edb5
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sat May 28 12:00:40 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Sat May 28 12:29:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=1f5adc99

update warning messages for perl6 ebuilds

 dev-lang/nqp/nqp-2016.04-r3.ebuild       | 7 ++++---
 dev-lang/nqp/nqp-2016.05.ebuild          | 7 ++++---
 dev-lang/nqp/nqp-9999.ebuild             | 7 ++++---
 dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 9 +++++++++
 dev-lang/rakudo/rakudo-2016.05.ebuild    | 5 +++--
 dev-lang/rakudo/rakudo-9999.ebuild       | 5 +++--
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild
index 3d3e1b3..35e745f 100644
--- a/dev-lang/nqp/nqp-2016.04-r3.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r3.ebuild
@@ -40,9 +40,10 @@ 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 "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
 	fi
 }
 

diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild
index c142ddf..fe2ace6 100644
--- a/dev-lang/nqp/nqp-2016.05.ebuild
+++ b/dev-lang/nqp/nqp-2016.05.ebuild
@@ -39,9 +39,10 @@ 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 "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
 	fi
 }
 

diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index c142ddf..fe2ace6 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -39,9 +39,10 @@ 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 "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
 	fi
 }
 

diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
index 478cb08..18eb631 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
@@ -38,6 +38,15 @@ PATCHES=(
 	"${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 unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	epatch_user

diff --git a/dev-lang/rakudo/rakudo-2016.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild
index 4f24e11..821e32f 100644
--- a/dev-lang/rakudo/rakudo-2016.05.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.05.ebuild
@@ -37,8 +37,9 @@ 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 unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
 	fi
 }
 

diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild
index 4f24e11..821e32f 100644
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-9999.ebuild
@@ -37,8 +37,9 @@ 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 unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-05-28 12:29 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-26 15:44 [gentoo-commits] repo/user/tbc:master commit in: dev-lang/nqp/, dev-lang/rakudo/ M. B.
  -- strict thread matches above, loose matches on Subject: below --
2016-05-28 12:29 M. B.
2016-05-28 12:04 M. B.
2016-05-28 11:30 M. B.
2016-05-27  4:11 M. B.
2016-05-26 15:44 M. B.
2016-05-25 20:45 M. B.
2016-05-25 16:17 M. B.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox