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