Gentoo Archives: gentoo-commits

From: Patrick Lauer <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/
Date: Sat, 03 Jun 2017 07:06:55
Message-Id: 1496473564.5a200e78052cc89eebe49accc85a880906f6668d.patrick@gentoo
1 commit: 5a200e78052cc89eebe49accc85a880906f6668d
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 3 07:06:04 2017 +0000
4 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 3 07:06:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a200e78
7
8 dev-lang/nqp: Bump
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-lang/nqp/Manifest | 1 +
13 dev-lang/nqp/nqp-2017.05.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 160 insertions(+)
15
16 diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
17 index cdbe2743505..7b742e903a5 100644
18 --- a/dev-lang/nqp/Manifest
19 +++ b/dev-lang/nqp/Manifest
20 @@ -5,3 +5,4 @@ DIST nqp-2017.01.tar.gz 3654574 SHA256 6b407aa2a908cc66dc60b8a1b5a7a76990afcecd2
21 DIST nqp-2017.02.tar.gz 3657637 SHA256 cf2f094296fc7706b2c2f0037331dd624dcdcb2cb41239883c8297b3b1fd38ce SHA512 4781fccfbe0bbcbb4529c8ed540263fc620bfcff2923c39dabd437824353caba6d2627082312bb7841b40b01caaf39282d6af9fcaa18601f9647e769e220d369 WHIRLPOOL d97b5aa9e119bf85fbc8c8da5954466455ff5b26580e61f668ae539ccf6ec4284cdd5be3afa2da053df9459903a3fbe6f0bebc9a47213e9e1e46ecfec943c1ef
22 DIST nqp-2017.03.tar.gz 3674277 SHA256 2dce67d6a4388a177a0a3c46b95717a47f31c705b0d8f825f936f65358b655e0 SHA512 8ca0be68785d8f0923d1ef63eca7eb9d7075c475b836911117d62f5030398933e0711bfc5b0ec082e4b4720d6f0fd0f1a74b8c35510f0fffe1e36a972937cd67 WHIRLPOOL 3f2a7b0ea4a7ac5ba1eefd4d4a3453a6c02b10d7c0e93570bdb89e33eadba29f664660024b532ed9a41718db767414b0e1ab362263ecd88490b9a1045d370070
23 DIST nqp-2017.04.tar.gz 3693688 SHA256 7c270fc91bb869094fdc981236beefd4e8ecad8b8f4129e7c83abeec67880634 SHA512 f68e3f63a57bffbaa94267e8da59336cb0c59b1b2538996619fa96d964062e13536208432cb778a717c65438c006a490d8cb5355c899add7146b54664b696fd9 WHIRLPOOL 7e9a92a82f80f3fac672fac58d9bb7014b2ab39de585e2cb43326b1b9a7982d5af72cae17db7dd8e8803c59dac25e66e764846e72e3b6783534e98771ef5ebcb
24 +DIST nqp-2017.05.tar.gz 3698847 SHA256 e5326a0a4c791f70802cadfc1a71ba119f0da6697b5c57ac6afcc367e21ee1ca SHA512 2679c48160179e5ed96ceba218a54e0841d89ea9d4ec931e6bd9fabd4541f48da3c3c66b866bb1d11311e9a342fbd77a694f88cb4256f8009a51ec1fbcef849f WHIRLPOOL d213dd6986a7fd1d81fad26c0dfc4112f443836de5c47a88c80dddf301e0dcaadf87228070dc76871871af0d55759d27ecb8cc24c72921263ef6190ca680e18f
25
26 diff --git a/dev-lang/nqp/nqp-2017.05.ebuild b/dev-lang/nqp/nqp-2017.05.ebuild
27 new file mode 100644
28 index 00000000000..e2dfdc734d8
29 --- /dev/null
30 +++ b/dev-lang/nqp/nqp-2017.05.ebuild
31 @@ -0,0 +1,159 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=5
36 +
37 +inherit java-pkg-opt-2 multibuild
38 +
39 +if [[ ${PV} == "9999" ]]; then
40 + EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
41 + inherit git-r3
42 + KEYWORDS=""
43 +else
44 + SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
45 + inherit vcs-snapshot
46 + KEYWORDS="~amd64 ~x86"
47 +fi
48 +
49 +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
50 +HOMEPAGE="http://rakudo.org/"
51 +
52 +LICENSE="Artistic-2"
53 +SLOT="0"
54 +IUSE="doc clang java +moar test"
55 +REQUIRED_USE="|| ( java moar )"
56 +
57 +CDEPEND="java? (
58 + dev-java/asm:4
59 + dev-java/jline:0
60 + dev-java/jna:4
61 + )
62 + moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
63 +RDEPEND="${CDEPEND}
64 + java? ( >=virtual/jre-1.7 )"
65 +DEPEND="${CDEPEND}
66 + clang? ( sys-devel/clang )
67 + java? ( >=virtual/jdk-1.7 )
68 + dev-lang/perl"
69 +
70 +pkg_pretend() {
71 + if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
72 + ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
73 + ewarn "already being installed. So if it fails, try uninstalling both"
74 + ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
75 + ewarn "(see Bug #584394)"
76 + fi
77 +}
78 +
79 +java_prepare() {
80 + # Don't clean stage0 jars.
81 + einfo "Cleaning upstream jars"
82 + java-pkg_clean 3rdparty/
83 +
84 + # Don't use jars we just deleted.
85 + sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
86 + src/vm/jvm/runners/nqp-j || die
87 +}
88 +
89 +src_prepare() {
90 + MULTIBUILD_VARIANTS=()
91 + use moar && MULTIBUILD_VARIANTS+=( moar )
92 + use java && MULTIBUILD_VARIANTS+=( jvm )
93 +
94 + multibuild_copy_sources
95 +
96 + # This will pull in conditional java_prepare
97 + default
98 +}
99 +
100 +nqp_configure() {
101 + pushd "${BUILD_DIR}" > /dev/null || die
102 + local myconfargs=(
103 + "--backend=${MULTIBUILD_VARIANT}"
104 + "--prefix=/usr" )
105 +
106 + perl Configure.pl "${myconfargs[@]}" || die
107 + popd || die
108 +}
109 +
110 +nqp_compile() {
111 + if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
112 + emake -j1 \
113 + -C "${BUILD_DIR}" \
114 + THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
115 + JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
116 + elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
117 + emake -j1 \
118 + -C "${BUILD_DIR}"
119 + fi
120 +}
121 +
122 +nqp_test() {
123 + emake -j1 \
124 + -C "${BUILD_DIR}" \
125 + test
126 +}
127 +
128 +nqp_install() {
129 + # This is the actual reason we need multibuild.eclass.
130 + # We need to distinguish the install procedure for MoarVM and JVM backends.
131 + case "${MULTIBUILD_VARIANT}" in
132 + moar)
133 + emake \
134 + DESTDIR="${ED}" \
135 + -C "${BUILD_DIR}" \
136 + install
137 + ;;
138 + jvm)
139 + pushd "${BUILD_DIR}" > /dev/null || die
140 + # Set JAVA_PKG_JARDEST early.
141 + java-pkg_init_paths_
142 +
143 + # Upstream sets the classpath to this location. Perhaps it's
144 + # used to locate the additional libraries?
145 + java-pkg_addcp "${JAVA_PKG_JARDEST}"
146 +
147 + insinto "${JAVA_PKG_JARDEST}"
148 + local jar
149 +
150 + for jar in *.jar; do
151 + if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
152 + # jars for NQP itself.
153 + java-pkg_dojar ${jar}
154 + else
155 + # jars used by NQP.
156 + doins ${jar}
157 + fi
158 + done
159 +
160 + # Upstream uses -Xbootclasspath/a, which is faster due to lack
161 + # of verification, but gjl isn't flexible enough yet. :(
162 + java-pkg_dolauncher ${PN}-j --main ${PN}
163 + dosym ${PN}-j /usr/bin/${PN}
164 + dobin tools/jvm/eval-client.pl
165 + popd > /dev/null || die
166 + ;;
167 + *)
168 + die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
169 + ;;
170 + esac
171 +}
172 +
173 +src_configure() {
174 + multibuild_foreach_variant nqp_configure
175 +}
176 +
177 +src_compile() {
178 + multibuild_foreach_variant nqp_compile
179 +}
180 +
181 +src_test() {
182 + multibuild_foreach_variant nqp_test
183 +}
184 +
185 +src_install() {
186 + multibuild_foreach_variant nqp_install
187 +
188 + dodoc CREDITS README.pod
189 + use doc && dodoc -r docs/*
190 +}