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: Wed, 28 Dec 2016 17:24:12
Message-Id: 1482945820.a6dacb1bc6636477201926ec76716612d3f5ebc6.patrick@gentoo
1 commit: a6dacb1bc6636477201926ec76716612d3f5ebc6
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 28 17:19:55 2016 +0000
4 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 17:23:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6dacb1b
7
8 dev-lang/nqp: Bump
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-lang/nqp/Manifest | 1 +
13 dev-lang/nqp/nqp-2016.12.ebuild | 160 ++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 161 insertions(+)
15
16 diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
17 index 208ea73..ffee948 100644
18 --- a/dev-lang/nqp/Manifest
19 +++ b/dev-lang/nqp/Manifest
20 @@ -7,3 +7,4 @@ DIST nqp-2016.08.1.tar.gz 3931460 SHA256 2eb9c0ea2864a232f50db6f898370caea1e844d
21 DIST nqp-2016.09.tar.gz 3935097 SHA256 24f10be9d1072d9dc3314bc729c1fbbe0df09accd2e4f9b2cb0f403a1c251d57 SHA512 0d6af33cfd856a191027a2ca3001b4142e775f919f4f5bf8ef0c92dae1e6c84b3c19bef17d6ec11202429c03f3a1d21fa719201aea935cabeeb8efc656451680 WHIRLPOOL 2175ec6fb8f7b730fdeb35bd014b619af662621ab89491fb3fb870bc6724f03b8af40d07080154af7ec3f246d1e717f662be1feb6e5d4ee39c3143784576b370
22 DIST nqp-2016.10.tar.gz 3943840 SHA256 d66905006e74b6d55f7abd3fba051fdf9a2583879bbf3cecaab076c07d39d476 SHA512 8a42fd4062237838d71870718e8cb9c166fb022fa05d624543479d9476890aa4eaaba0f4ba0d9c5ca1684559f34d999acdfbb5173d15a462ae94a9aaabbd1dbd WHIRLPOOL 62868016c516888df327601be2f4bb30b156bd0d3a14a3a1e9f7d162c5dfe089f3bf2946b69237eff559e44870a07e702480947bc47e13c6b4b7ca81a947ad31
23 DIST nqp-2016.11.tar.gz 3946759 SHA256 08d3eb664ad049e72bd9821755564ee7cbbf0da4833f1bcc9441e970c5f73ccd SHA512 bd99e286dc09fa5096429cc35847e43893d30a9ce9efdfb55346c04eeeda0c44307fd39217107a2210040b7a4dcc900f69279e19d1cc54a469ab286377e28f6a WHIRLPOOL 373fe379cf8fe965d9c1097042a55472d69322c08e613a9d55749bbb4da084b84adee5c5dfe93c4f9bf81298e28308d697f66482b80a16ada3ea9ea81754f54b
24 +DIST nqp-2016.12.tar.gz 3643470 SHA256 3dfd71f7f51b78a8266d159a41a4b9d0a3fff1b93b7366054c2daf14ec5df981 SHA512 5967029227b6f527f25cfdc0f27e5466cbff4286e2ef7252b3767fe5f752210d5637d634c4e946f32797e4e380f2f937523a325497214767fae3fa39764eecb2 WHIRLPOOL 67e7138d8d7bd428f77d37721f206a613498cabb07ea0cdfa9afa730505e303709f86373dc36d0ac149f35e08193e85621e41131832e5bafbd5765d1b0d8ed51
25
26 diff --git a/dev-lang/nqp/nqp-2016.12.ebuild b/dev-lang/nqp/nqp-2016.12.ebuild
27 new file mode 100644
28 index 00000000..fe2ace6
29 --- /dev/null
30 +++ b/dev-lang/nqp/nqp-2016.12.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-${PV}[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 +}