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: Sun, 29 Apr 2018 18:40:19
Message-Id: 1525027209.7e405f012665e7b4aa1a40f5de8778035eac84d9.patrick@gentoo
1 commit: 7e405f012665e7b4aa1a40f5de8778035eac84d9
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 18:38:57 2018 +0000
4 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 18:40:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e405f01
7
8 dev-lang/nqp: Bump
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 dev-lang/nqp/Manifest | 1 +
13 dev-lang/nqp/nqp-2018.04.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 160 insertions(+)
15
16 diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
17 index 352a136ff1d..ddf7b90b23a 100644
18 --- a/dev-lang/nqp/Manifest
19 +++ b/dev-lang/nqp/Manifest
20 @@ -1,3 +1,4 @@
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 +DIST nqp-2018.04.tar.gz 3782652 BLAKE2B 0d36363956a3b150c5dbd7e9c094281680bfe2b87fa509e5a27ffc8be1df8ab82cd89276d9392c11b0912cf4d00d5a668dd6f497f4cfdf4914c40de2b0443c5c SHA512 5cb749577c5e985174c0721b92a00af7a93a5a7b3833718718b825d71d135ba14150b8a6bb065cf21356a37ea082431eacbff8ca63bce6f0ddeaf200494fe646
25
26 diff --git a/dev-lang/nqp/nqp-2018.04.ebuild b/dev-lang/nqp/nqp-2018.04.ebuild
27 new file mode 100644
28 index 00000000000..558b645a275
29 --- /dev/null
30 +++ b/dev-lang/nqp/nqp-2018.04.ebuild
31 @@ -0,0 +1,159 @@
32 +# Copyright 1999-2018 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 +}