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