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, 29 Sep 2018 07:04:37
Message-Id: 1538204666.f6eb5c26c2c1c0630505043067c1a474a6bc9b04.patrick@gentoo
1 commit: f6eb5c26c2c1c0630505043067c1a474a6bc9b04
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 29 07:02:19 2018 +0000
4 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 29 07:04:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6eb5c26
7
8 dev-lang/nqp: Bump
9
10 Package-Manager: Portage-2.3.50, Repoman-2.3.11
11
12 dev-lang/nqp/Manifest | 1 +
13 dev-lang/nqp/nqp-2018.09.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 160 insertions(+)
15
16 diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
17 index ef925d02a9b..ec4f040eb68 100644
18 --- a/dev-lang/nqp/Manifest
19 +++ b/dev-lang/nqp/Manifest
20 @@ -6,3 +6,4 @@ DIST nqp-2018.04.tar.gz 3782652 BLAKE2B 0d36363956a3b150c5dbd7e9c094281680bfe2b8
21 DIST nqp-2018.05.tar.gz 3785860 BLAKE2B 058f29acf6a9a2f79677dcca7fd145a8bf4d780eb516a874bf128cca4c8916e7b13868a29189888a22b827656156039a2fadaca26865d8a609559ebab6cec5c7 SHA512 463e795a6893dc418d87a347672781f8424ae3484f2d5ab20fa75a4fb226c239175d10889783e3cbca83c4f8d317406afa858f725dbe7f9869277f9d1cbcd9f0
22 DIST nqp-2018.06.tar.gz 3792244 BLAKE2B 95cfa80c83951e91b71e14162c4c5cd78a8f546ba601002836d2b3fe79325aa26b963d0bb58df70935546f6960f3797a3a7762187defcb6b7c5124a7205bb257 SHA512 312f203c51f3d58bbc474cd7263a118f3438efe230a56a30f38a688b4a57aac88a94a0e6630736066255c122bb001d748a76272f7f634be8ddda91cc3340574b
23 DIST nqp-2018.08.tar.gz 3769932 BLAKE2B 892eec3dcbfcf57bddbbbb296aea2d126176a5b5db79493beccb7625360c42e26fc9025c8f594430c8cdac346b5af93d7a5167fbbd6e17776070bc3b4b754b63 SHA512 b3f1729060c88407eee07fb32841febb51b68e375ff797aa9ebc6019a4c1229ea7e713262fbe7dfbd9e0317594eb8526179b9d63cf034ac3aca3d82c4ff7d565
24 +DIST nqp-2018.09.tar.gz 3797808 BLAKE2B e5c7c79d7577338e89190ee11673e65093f2e08cd5950727ed8f33a35769db8d6f5e5c7450a93ceb73bf011cdd0a492ce70de6026948a20dd972dcb79a07fb9e SHA512 7412ef9c25f9540ae399c8d83b090eec1c7cea63f0cda970e21e3d760ed915895f8d69c092847feda002702e401e6eee8a6521c41e879c82619340d096948126
25
26 diff --git a/dev-lang/nqp/nqp-2018.09.ebuild b/dev-lang/nqp/nqp-2018.09.ebuild
27 new file mode 100644
28 index 00000000000..d4d6775bc3e
29 --- /dev/null
30 +++ b/dev-lang/nqp/nqp-2018.09.ebuild
31 @@ -0,0 +1,159 @@
32 +# Copyright 1999-2018 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
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="https://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 +}