aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/rakudo')
-rw-r--r--dev-lang/rakudo/Manifest2
-rw-r--r--dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch (renamed from dev-lang/rakudo/files/rakudo-jna-lib.patch)0
-rw-r--r--dev-lang/rakudo/rakudo-2016.04-r2.ebuild70
-rw-r--r--dev-lang/rakudo/rakudo-2016.05.ebuild (renamed from dev-lang/rakudo/rakudo-2016.04-r3.ebuild)26
-rw-r--r--dev-lang/rakudo/rakudo-9999.ebuild79
5 files changed, 126 insertions, 51 deletions
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 34951ea..eb9ab2e 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1 +1 @@
-DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6
+DIST rakudo-2016.05.tar.gz 2786506 SHA256 f3b3236c22ff75427c87dea1fab1dc9a0b4ca3a97296e64a14c3f2695be7a28a SHA512 524a71fa72fc04ed8a04eebe319d68c051d45082ae4ce0894a34b2c08d5dd1f270fd380ffb9a486c1cbad7df20dd96180a11642dc20f2ef343a386ce9df42ac8 WHIRLPOOL 000c74d0c0c26517b2324a20e91d304fafbf4953e028683b84599cc0508e4d79c8324dd78c95fb456e46163b52bb5615e30ec034813df10c8762a3362ae77fae
diff --git a/dev-lang/rakudo/files/rakudo-jna-lib.patch b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
index 3f4532f..3f4532f 100644
--- a/dev-lang/rakudo/files/rakudo-jna-lib.patch
+++ b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
index e60d437..478cb08 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=6
+EAPI=5
-inherit java-pkg-2
+inherit java-pkg-opt-2
DESCRIPTION="A compiler for the Perl 6 programming language"
HOMEPAGE="http://rakudo.org"
@@ -15,69 +15,61 @@ if [[ ${PV} == "9999" ]]; then
KEYWORDS=""
else
SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
- KEYWORDS=""
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="Artistic-2"
SLOT="0"
# TODO: add USE="javascript" once that's usable in nqp
IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
-RDEPEND="~dev-lang/nqp-${PV}:=[java?,moar?,clang=]"
-DEPEND="${RDEPEND}
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]
+ >=dev-lang/nqp-2016.04-r3"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
>=dev-lang/perl-5.10"
-REQUIRED_USE="|| ( java moar )"
-PATCHES=( "${FILESDIR}/${PN}-2016.04-Makefile.in.patch" )
-
-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
-}
-
-pkg_setup() {
- use java && java-pkg-2_pkg_setup
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-2016.04-Makefile.in.patch"
+ "${FILESDIR}/${P}-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
- use java && java-pkg-2_src_prepare
+ epatch "${PATCHES[@]}"
+ epatch_user
}
src_configure() {
local backends
- use java && backends+="jvm,"
use moar && backends+="moar,"
- local myargs=( "--prefix=/usr"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
"--sysroot=/"
"--sdkroot=/"
- "--make-install"
- "--sdkroot=/"
"--backends=${backends}"
)
- perl Configure.pl "${myargs[@]}"
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ 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
}
diff --git a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild
index cd55aa5..4f24e11 100644
--- a/dev-lang/rakudo/rakudo-2016.04-r3.ebuild
+++ b/dev-lang/rakudo/rakudo-2016.05.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=6
+EAPI=5
inherit java-pkg-opt-2
@@ -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"
@@ -32,21 +32,25 @@ DEPEND="${CDEPEND}
java? ( >=virtual/jdk-1.7 )
>=dev-lang/perl-5.10"
-PATCHES=(
- "${FILESDIR}/${PN}-2016.04-Makefile.in.patch"
- "${FILESDIR}/${PN}-jna-lib.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" )
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."
+ 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."
fi
}
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ epatch_user
+}
+
src_configure() {
local backends
- use java && backends+="jvm,"
- use moar && backends+="moar"
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
local myargs=(
"--prefix=/usr"
@@ -55,7 +59,7 @@ src_configure() {
"--backends=${backends}"
)
- perl Configure.pl "${myargs[@]}"
+ perl Configure.pl "${myargs[@]}" || die
if use java; then
NQP=$(java-pkg_getjars --with-dependencies nqp)
diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild
new file mode 100644
index 0000000..4f24e11
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ >=dev-lang/perl-5.10"
+
+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."
+ fi
+}
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ epatch_user
+}
+
+src_configure() {
+ local backends
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
+ "--sysroot=/"
+ "--sdkroot=/"
+ "--backends=${backends}"
+ )
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ if use java; then
+ NQP=$(java-pkg_getjars --with-dependencies nqp)
+ fi
+}
+
+src_compile() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}