1 |
commit: 2b5ad3fed30af0773ac7ecdd43f7325f68d8cede |
2 |
Author: Marshall Brewer <tomboy64 <AT> sina <DOT> cn> |
3 |
AuthorDate: Wed Jun 1 16:28:56 2016 +0000 |
4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 2 12:52:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5ad3fe |
7 |
|
8 |
dev-lang/rakudo: update 9999 to reflect 2016.05 |
9 |
|
10 |
dev-lang/rakudo/rakudo-9999.ebuild | 67 ++++++++++++++++++-------------------- |
11 |
1 file changed, 32 insertions(+), 35 deletions(-) |
12 |
|
13 |
diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild |
14 |
index c6696c6..821e32f 100644 |
15 |
--- a/dev-lang/rakudo/rakudo-9999.ebuild |
16 |
+++ b/dev-lang/rakudo/rakudo-9999.ebuild |
17 |
@@ -2,9 +2,9 @@ |
18 |
# Distributed under the terms of the GNU General Public License v2 |
19 |
# $Id$ |
20 |
|
21 |
-EAPI=6 |
22 |
+EAPI=5 |
23 |
|
24 |
-inherit java-pkg-2 |
25 |
+inherit java-pkg-opt-2 |
26 |
|
27 |
DESCRIPTION="A compiler for the Perl 6 programming language" |
28 |
HOMEPAGE="http://rakudo.org" |
29 |
@@ -21,63 +21,60 @@ fi |
30 |
LICENSE="Artistic-2" |
31 |
SLOT="0" |
32 |
# TODO: add USE="javascript" once that's usable in nqp |
33 |
-IUSE="clang java moar test" |
34 |
+IUSE="clang java +moar test" |
35 |
+REQUIRED_USE="|| ( java moar )" |
36 |
|
37 |
-RDEPEND="~dev-lang/nqp-${PV}:=[java=,moar=,clang=]" |
38 |
-DEPEND="${RDEPEND} |
39 |
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" |
40 |
+RDEPEND="${CDEPEND} |
41 |
+ java? ( >=virtual/jre-1.7 )" |
42 |
+DEPEND="${CDEPEND} |
43 |
clang? ( sys-devel/clang ) |
44 |
+ java? ( >=virtual/jdk-1.7 ) |
45 |
>=dev-lang/perl-5.10" |
46 |
|
47 |
-REQUIRED_USE="|| ( java moar )" |
48 |
-PATCHES=( "${FILESDIR}/${PN}-2016.04-Makefile.in.patch" ) |
49 |
+PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" ) |
50 |
|
51 |
pkg_pretend() { |
52 |
- if has_version dev-lang/rakudo && use java; then |
53 |
- die "Rakudo is known to fail compilation with the jvm backend if it's already installed." |
54 |
+ if has_version dev-lang/rakudo; then |
55 |
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo" |
56 |
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," |
57 |
+ ewarn "then do a new installation." |
58 |
+ ewarn "(see Bug #584394)" |
59 |
fi |
60 |
} |
61 |
|
62 |
-pkg_setup() { |
63 |
- use java && java-pkg-2_pkg_setup |
64 |
-} |
65 |
- |
66 |
src_prepare() { |
67 |
- eapply "${PATCHES[@]}" |
68 |
- |
69 |
- # yup, this is ugly. but emake doesn't respect DESTDIR. |
70 |
- for i in Moar JVM; do |
71 |
- echo "DESTDIR = ${D}" > "${T}/Makefile-${i}.in" || die |
72 |
- cat "${S}/tools/build/Makefile-${i}.in" >> "${T}/Makefile-${i}.in" || die |
73 |
- mv "${T}/Makefile-${i}.in" "${S}/tools/build/Makefile-${i}.in" || die |
74 |
- done |
75 |
- |
76 |
- eapply_user |
77 |
- use java && java-pkg-2_src_prepare |
78 |
+ epatch "${PATCHES[@]}" |
79 |
+ epatch_user |
80 |
} |
81 |
|
82 |
src_configure() { |
83 |
local backends |
84 |
- use java && backends+="jvm," |
85 |
use moar && backends+="moar," |
86 |
- local myargs=( "--prefix=/usr" |
87 |
+ use java && backends+="jvm" |
88 |
+ |
89 |
+ local myargs=( |
90 |
+ "--prefix=/usr" |
91 |
"--sysroot=/" |
92 |
"--sdkroot=/" |
93 |
- "--make-install" |
94 |
- "--sdkroot=/" |
95 |
"--backends=${backends}" |
96 |
) |
97 |
- perl Configure.pl "${myargs[@]}" |
98 |
+ |
99 |
+ perl Configure.pl "${myargs[@]}" || die |
100 |
+ |
101 |
+ if use java; then |
102 |
+ NQP=$(java-pkg_getjars --with-dependencies nqp) |
103 |
+ fi |
104 |
} |
105 |
|
106 |
src_compile() { |
107 |
- emake DESTDIR="${D}" |
108 |
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" |
109 |
} |
110 |
|
111 |
-src_test() { |
112 |
- export RAKUDO_PRECOMP_PREFIX=$(mktemp -d) |
113 |
- default |
114 |
+src_install() { |
115 |
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install |
116 |
} |
117 |
|
118 |
-src_install() { |
119 |
- emake DESTDIR="${D}" install |
120 |
+src_test() { |
121 |
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default |
122 |
} |