diff options
Diffstat (limited to 'dev-lang/nqp')
-rw-r--r-- | dev-lang/nqp/Manifest | 24 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2018.06-r1.ebuild (renamed from dev-lang/nqp/nqp-2019.03.ebuild) | 9 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2018.06.ebuild | 159 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2018.08-r1.ebuild (renamed from dev-lang/nqp/nqp-2018.12.ebuild) | 9 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2018.09-r1.ebuild (renamed from dev-lang/nqp/nqp-2018.08.ebuild) | 11 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2018.12-r1.ebuild (renamed from dev-lang/nqp/nqp-2018.09.ebuild) | 11 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2019.03-r1.ebuild | 158 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-2019.07.1.ebuild | 159 | ||||
-rw-r--r-- | dev-lang/nqp/nqp-9999.ebuild | 16 |
9 files changed, 356 insertions, 200 deletions
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index 543119c546a2..01b42a7c9494 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1,12 +1,14 @@ -DIST nqp-2018.06.tar.gz 3792244 BLAKE2B 95cfa80c83951e91b71e14162c4c5cd78a8f546ba601002836d2b3fe79325aa26b963d0bb58df70935546f6960f3797a3a7762187defcb6b7c5124a7205bb257 SHA512 312f203c51f3d58bbc474cd7263a118f3438efe230a56a30f38a688b4a57aac88a94a0e6630736066255c122bb001d748a76272f7f634be8ddda91cc3340574b -DIST nqp-2018.08.tar.gz 3769932 BLAKE2B 892eec3dcbfcf57bddbbbb296aea2d126176a5b5db79493beccb7625360c42e26fc9025c8f594430c8cdac346b5af93d7a5167fbbd6e17776070bc3b4b754b63 SHA512 b3f1729060c88407eee07fb32841febb51b68e375ff797aa9ebc6019a4c1229ea7e713262fbe7dfbd9e0317594eb8526179b9d63cf034ac3aca3d82c4ff7d565 -DIST nqp-2018.09.tar.gz 3797808 BLAKE2B e5c7c79d7577338e89190ee11673e65093f2e08cd5950727ed8f33a35769db8d6f5e5c7450a93ceb73bf011cdd0a492ce70de6026948a20dd972dcb79a07fb9e SHA512 7412ef9c25f9540ae399c8d83b090eec1c7cea63f0cda970e21e3d760ed915895f8d69c092847feda002702e401e6eee8a6521c41e879c82619340d096948126 -DIST nqp-2018.12.tar.gz 3928586 BLAKE2B a11480ae4f09810d349b3adeafb7a6317db41ca28937d99c936f3d8be39be0039fe88db03c9b3b248193a377260a3e21500eb3e11ad282e5ed02635724f05678 SHA512 6c075410490e4c3cab20fffdb986ef179a26c2f11e50e91b50e38e43f8d7909eb8e645ee9280f506da115866f73ef9013cd229e12b100ff43e8610ead69628da -DIST nqp-2019.03.tar.gz 3949224 BLAKE2B 350bccdbcea8ed598292e6f2e312ad276db0ffe15ec8716eb7cafed35df9ab523f9cee3c0385fce41f5f680b4f4c6eb9e470857e2970c0bd4462579c577a122b SHA512 c3bcd02196b5628d7269aed581b54389e362dd7f0f04a1a5068b5d986fa182857b55e2b769fe2eb080ff2fe4e6fdf7d7adc9e184868c047c0c874ee9568b53cd -EBUILD nqp-2018.06.ebuild 3607 BLAKE2B 187da0f139d742686c2e36efb8d219c865e116c976ef2eb3c399277fb2bd76b9e16116ecdbcd60854858197e584fc1f98463349395c66d629c23d1115572d62f SHA512 214d69640ce932f49c4b0c22871d96fda5eaf2ba2ef47247e142cf5958ad193058d3fd59761f2d51a3ac5f76d60e53df20cf7ae2f615d59d587d9727b77f7315 -EBUILD nqp-2018.08.ebuild 3607 BLAKE2B 187da0f139d742686c2e36efb8d219c865e116c976ef2eb3c399277fb2bd76b9e16116ecdbcd60854858197e584fc1f98463349395c66d629c23d1115572d62f SHA512 214d69640ce932f49c4b0c22871d96fda5eaf2ba2ef47247e142cf5958ad193058d3fd59761f2d51a3ac5f76d60e53df20cf7ae2f615d59d587d9727b77f7315 -EBUILD nqp-2018.09.ebuild 3604 BLAKE2B 494b431edfaed5a6d29419774b69a7eee6a2d97ca8cf54c0f6a0f3405690febfca1cde45514eddc9edd50caefcac436bd0381f1eff3e59df28f2f58ad9b98b7e SHA512 2cf0149ee6f11931c8882aac35e42b1ba7d93ed8c246b0599d196f60ab025c0eacea04a82556d78da2ddcea580ec3b7f8cbed7663a1fb755de70ac3a5d0a61d1 -EBUILD nqp-2018.12.ebuild 3604 BLAKE2B 55db92192366034c073e50071e14d9d0fad082224ae5eba5812600c57aabb005e39d7b9d6cc3398e94d30b8767486748fffc68ec626bc3e77e119ea4f3a5701f SHA512 f024785ac72407e4d2a8e88614e99705d20c0eb8b51903be85f60113b751fac9657eb75bda3e1866c95418f3ad394e51322c28d8c7923fc6ae75c0c2009f91cf -EBUILD nqp-2019.03.ebuild 3604 BLAKE2B 55db92192366034c073e50071e14d9d0fad082224ae5eba5812600c57aabb005e39d7b9d6cc3398e94d30b8767486748fffc68ec626bc3e77e119ea4f3a5701f SHA512 f024785ac72407e4d2a8e88614e99705d20c0eb8b51903be85f60113b751fac9657eb75bda3e1866c95418f3ad394e51322c28d8c7923fc6ae75c0c2009f91cf -EBUILD nqp-9999.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4 +DIST nqp-2018.06.official.tar.gz 3795050 BLAKE2B 9c5be1a93f5bba632778125fe3c13431606ef01b654775f890aef27c8bfd220930079cb820e933fdae2d151a7c3bacd57bd4f139547cd938e5c1eb0c54b16f19 SHA512 6b4a74098a3d55931a3c8934029f0e97e388b90c1babef023023e1bf3203dbe53b928155d24ecb6a3a54a3228e72a18a2a2747cd8389497569e24e22d489c68c +DIST nqp-2018.08.official.tar.gz 3770932 BLAKE2B 2425c28a8192fe0d992650fe3d9c79e198c69abfece17276d62225cfa2029916af1ec7568f626a1a67eadc886a1544154af3c015370a67eb1e13e5da35e08bd8 SHA512 663b52677c49eb4b6c5f4ed68de821d9adbe4e3fbcabf2174227b1d3dfafffa357f720557b18a5fbd121c46704dda117395c996a78af70eb367f1b23d8b2564f +DIST nqp-2018.09.official.tar.gz 3798897 BLAKE2B d9ac40be8f864a7c9a35cd21dde188396b15465568d7642dbd5dddc3468edc09b6e2f7997fb08a189e160cd5ec004cb4efdcee9262e23b6bb32650eb17d93c14 SHA512 5a673430c2dce5d51f90fd8da18636d1abfd5e841f8530a51020beaffd83635a77090e52968bcbcdee361681a436834490bd2f5c383b21972cf40a9d88b28020 +DIST nqp-2018.12.official.tar.gz 3930041 BLAKE2B 35876f63461aadc634e8ad3fd1a46aff4ead788ebf0d741eb1ff6a82e9227fd5edbcd1f733c184083f73073f2ac1a8dab094f2f8fe177183663697dc13da3065 SHA512 56b7821fc0164c8e8fcf58a16aa96c75347aa078cb3bf7f8f6c41df26338e51e2ddb6984049908de83126861c7406c4504e073e7203409c3f37b129661b8c2f8 +DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533 +DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5 +EBUILD nqp-2018.06-r1.ebuild 3625 BLAKE2B f56fffad42847d72dee47f47db2fa34b176017a4aa81fa4ae09e4ae62f1753048fa3128a7882f1d003b4a24342784dcb82853cb34c299a9807671b127ebdcbc3 SHA512 d4a1d2617a1fa857c4a92ffb61a3c507329ef226c2c01d776dc5e3681c5163ff1b1e3dd78cc20dcad2e3a815ff3a4c023f2dd614037591df65251d1eb04a7a02 +EBUILD nqp-2018.08-r1.ebuild 3625 BLAKE2B f56fffad42847d72dee47f47db2fa34b176017a4aa81fa4ae09e4ae62f1753048fa3128a7882f1d003b4a24342784dcb82853cb34c299a9807671b127ebdcbc3 SHA512 d4a1d2617a1fa857c4a92ffb61a3c507329ef226c2c01d776dc5e3681c5163ff1b1e3dd78cc20dcad2e3a815ff3a4c023f2dd614037591df65251d1eb04a7a02 +EBUILD nqp-2018.09-r1.ebuild 3625 BLAKE2B f56fffad42847d72dee47f47db2fa34b176017a4aa81fa4ae09e4ae62f1753048fa3128a7882f1d003b4a24342784dcb82853cb34c299a9807671b127ebdcbc3 SHA512 d4a1d2617a1fa857c4a92ffb61a3c507329ef226c2c01d776dc5e3681c5163ff1b1e3dd78cc20dcad2e3a815ff3a4c023f2dd614037591df65251d1eb04a7a02 +EBUILD nqp-2018.12-r1.ebuild 3625 BLAKE2B f56fffad42847d72dee47f47db2fa34b176017a4aa81fa4ae09e4ae62f1753048fa3128a7882f1d003b4a24342784dcb82853cb34c299a9807671b127ebdcbc3 SHA512 d4a1d2617a1fa857c4a92ffb61a3c507329ef226c2c01d776dc5e3681c5163ff1b1e3dd78cc20dcad2e3a815ff3a4c023f2dd614037591df65251d1eb04a7a02 +EBUILD nqp-2019.03-r1.ebuild 3625 BLAKE2B f56fffad42847d72dee47f47db2fa34b176017a4aa81fa4ae09e4ae62f1753048fa3128a7882f1d003b4a24342784dcb82853cb34c299a9807671b127ebdcbc3 SHA512 d4a1d2617a1fa857c4a92ffb61a3c507329ef226c2c01d776dc5e3681c5163ff1b1e3dd78cc20dcad2e3a815ff3a4c023f2dd614037591df65251d1eb04a7a02 +EBUILD nqp-2019.07.1.ebuild 3622 BLAKE2B aa2285743a9784d9ed667fc8a9643fcff3e94482cd0b0f5b76c88563198d6f954b51dbc005dc7edb9892948de9c3aaa2ef200a7c219b21740a4abc487037c68a SHA512 13ac8605ff1ca90b1571aac2282e9565aa712644b074e52da1386bdef650924eec821615b3b0ec3aef0c6b523d9ab68e43128db49200353e090c46c678083fc8 +EBUILD nqp-9999.ebuild 3622 BLAKE2B aa2285743a9784d9ed667fc8a9643fcff3e94482cd0b0f5b76c88563198d6f954b51dbc005dc7edb9892948de9c3aaa2ef200a7c219b21740a4abc487037c68a SHA512 13ac8605ff1ca90b1571aac2282e9565aa712644b074e52da1386bdef650924eec821615b3b0ec3aef0c6b523d9ab68e43128db49200353e090c46c678083fc8 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0 diff --git a/dev-lang/nqp/nqp-2019.03.ebuild b/dev-lang/nqp/nqp-2018.06-r1.ebuild index f014c8b7f45f..12c384f52897 100644 --- a/dev-lang/nqp/nqp-2019.03.ebuild +++ b/dev-lang/nqp/nqp-2018.06-r1.ebuild @@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -30,10 +29,10 @@ CDEPEND="java? ( ) moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" + java? ( >=virtual/jre-1.8 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) + java? ( >=virtual/jdk-1.8 ) dev-lang/perl" pkg_pretend() { @@ -70,7 +69,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) + "--prefix=${EPREFIX%/}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die diff --git a/dev-lang/nqp/nqp-2018.06.ebuild b/dev-lang/nqp/nqp-2018.06.ebuild deleted file mode 100644 index 2600c72c270a..000000000000 --- a/dev-lang/nqp/nqp-2018.06.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="https://rakudo.org" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2018.12.ebuild b/dev-lang/nqp/nqp-2018.08-r1.ebuild index f014c8b7f45f..12c384f52897 100644 --- a/dev-lang/nqp/nqp-2018.12.ebuild +++ b/dev-lang/nqp/nqp-2018.08-r1.ebuild @@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -30,10 +29,10 @@ CDEPEND="java? ( ) moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" + java? ( >=virtual/jre-1.8 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) + java? ( >=virtual/jdk-1.8 ) dev-lang/perl" pkg_pretend() { @@ -70,7 +69,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) + "--prefix=${EPREFIX%/}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die diff --git a/dev-lang/nqp/nqp-2018.08.ebuild b/dev-lang/nqp/nqp-2018.09-r1.ebuild index 2600c72c270a..12c384f52897 100644 --- a/dev-lang/nqp/nqp-2018.08.ebuild +++ b/dev-lang/nqp/nqp-2018.09-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -30,10 +29,10 @@ CDEPEND="java? ( ) moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" + java? ( >=virtual/jre-1.8 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) + java? ( >=virtual/jdk-1.8 ) dev-lang/perl" pkg_pretend() { @@ -70,7 +69,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) + "--prefix=${EPREFIX%/}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die diff --git a/dev-lang/nqp/nqp-2018.09.ebuild b/dev-lang/nqp/nqp-2018.12-r1.ebuild index d4d6775bc3e0..12c384f52897 100644 --- a/dev-lang/nqp/nqp-2018.09.ebuild +++ b/dev-lang/nqp/nqp-2018.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -30,10 +29,10 @@ CDEPEND="java? ( ) moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" + java? ( >=virtual/jre-1.8 )" DEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) + java? ( >=virtual/jdk-1.8 ) dev-lang/perl" pkg_pretend() { @@ -70,7 +69,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) + "--prefix=${EPREFIX%/}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild new file mode 100644 index 000000000000..12c384f52897 --- /dev/null +++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-opt-2 multibuild + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/perl6/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="https://rakudo.org" + +LICENSE="Artistic-2" +SLOT="0" +IUSE="doc clang java +moar test" +REQUIRED_USE="|| ( java moar )" + +CDEPEND="java? ( + dev-java/asm:4 + dev-java/jline:0 + dev-java/jna:4 + ) + moar? ( ~dev-lang/moarvm-${PV}[clang=] )" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8 )" +DEPEND="${CDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.8 ) + dev-lang/perl" + +pkg_pretend() { + if has_version dev-lang/rakudo || has_version dev-lang/nqp; then + ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" + ewarn "already being installed. So if it fails, try uninstalling both" + ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." + ewarn "(see Bug #584394)" + fi +} + +java_prepare() { + # Don't clean stage0 jars. + einfo "Cleaning upstream jars" + java-pkg_clean 3rdparty/ + + # Don't use jars we just deleted. + sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ + src/vm/jvm/runners/nqp-j || die +} + +src_prepare() { + MULTIBUILD_VARIANTS=() + use moar && MULTIBUILD_VARIANTS+=( moar ) + use java && MULTIBUILD_VARIANTS+=( jvm ) + + multibuild_copy_sources + + # This will pull in conditional java_prepare + default +} + +nqp_configure() { + pushd "${BUILD_DIR}" > /dev/null || die + local myconfargs=( + "--backend=${MULTIBUILD_VARIANT}" + "--prefix=${EPREFIX%/}/usr" ) + + perl Configure.pl "${myconfargs[@]}" || die + popd || die +} + +nqp_compile() { + if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then + emake -j1 \ + -C "${BUILD_DIR}" \ + THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ + JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then + emake -j1 \ + -C "${BUILD_DIR}" + fi +} + +nqp_test() { + emake -j1 \ + -C "${BUILD_DIR}" \ + test +} + +nqp_install() { + # This is the actual reason we need multibuild.eclass. + # We need to distinguish the install procedure for MoarVM and JVM backends. + case "${MULTIBUILD_VARIANT}" in + moar) + emake \ + DESTDIR="${ED}" \ + -C "${BUILD_DIR}" \ + install + ;; + jvm) + pushd "${BUILD_DIR}" > /dev/null || die + # Set JAVA_PKG_JARDEST early. + java-pkg_init_paths_ + + # Upstream sets the classpath to this location. Perhaps it's + # used to locate the additional libraries? + java-pkg_addcp "${JAVA_PKG_JARDEST}" + + insinto "${JAVA_PKG_JARDEST}" + local jar + + for jar in *.jar; do + if has ${jar} ${PN}.jar ${PN}-runtime.jar; then + # jars for NQP itself. + java-pkg_dojar ${jar} + else + # jars used by NQP. + doins ${jar} + fi + done + + # Upstream uses -Xbootclasspath/a, which is faster due to lack + # of verification, but gjl isn't flexible enough yet. :( + java-pkg_dolauncher ${PN}-j --main ${PN} + dosym ${PN}-j /usr/bin/${PN} + dobin tools/jvm/eval-client.pl + popd > /dev/null || die + ;; + *) + die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." + ;; + esac +} + +src_configure() { + multibuild_foreach_variant nqp_configure +} + +src_compile() { + multibuild_foreach_variant nqp_compile +} + +src_test() { + multibuild_foreach_variant nqp_test +} + +src_install() { + multibuild_foreach_variant nqp_install + + dodoc CREDITS README.pod + use doc && dodoc -r docs/* +} diff --git a/dev-lang/nqp/nqp-2019.07.1.ebuild b/dev-lang/nqp/nqp-2019.07.1.ebuild new file mode 100644 index 000000000000..120648d125d4 --- /dev/null +++ b/dev-lang/nqp/nqp-2019.07.1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-opt-2 multibuild + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/perl6/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="https://rakudo.org" + +LICENSE="Artistic-2" +SLOT="0" +IUSE="doc clang java +moar test" +REQUIRED_USE="|| ( java moar )" + +CDEPEND="java? ( + dev-java/asm:4 + dev-java/jline:0 + dev-java/jna:4 + ) + moar? ( ~dev-lang/moarvm-${PV}[clang=] )" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8 )" +DEPEND="${CDEPEND}" +BDEPEND="${CDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.8 ) + dev-lang/perl" + +pkg_pretend() { + if has_version dev-lang/rakudo || has_version dev-lang/nqp; then + ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" + ewarn "already being installed. So if it fails, try uninstalling both" + ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." + ewarn "(see Bug #584394)" + fi +} + +java_prepare() { + # Don't clean stage0 jars. + einfo "Cleaning upstream jars" + java-pkg_clean 3rdparty/ + + # Don't use jars we just deleted. + sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ + src/vm/jvm/runners/nqp-j || die +} + +src_prepare() { + MULTIBUILD_VARIANTS=() + use moar && MULTIBUILD_VARIANTS+=( moar ) + use java && MULTIBUILD_VARIANTS+=( jvm ) + + multibuild_copy_sources + + # This will pull in conditional java_prepare + default +} + +nqp_configure() { + pushd "${BUILD_DIR}" > /dev/null || die + local myconfargs=( + "--backend=${MULTIBUILD_VARIANT}" + "--prefix=${EPREFIX%/}/usr" ) + + perl Configure.pl "${myconfargs[@]}" || die + popd || die +} + +nqp_compile() { + if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then + emake -j1 \ + -C "${BUILD_DIR}" \ + THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ + JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then + emake -j1 \ + -C "${BUILD_DIR}" + fi +} + +nqp_test() { + emake -j1 \ + -C "${BUILD_DIR}" \ + test +} + +nqp_install() { + # This is the actual reason we need multibuild.eclass. + # We need to distinguish the install procedure for MoarVM and JVM backends. + case "${MULTIBUILD_VARIANT}" in + moar) + emake \ + DESTDIR="${ED}" \ + -C "${BUILD_DIR}" \ + install + ;; + jvm) + pushd "${BUILD_DIR}" > /dev/null || die + # Set JAVA_PKG_JARDEST early. + java-pkg_init_paths_ + + # Upstream sets the classpath to this location. Perhaps it's + # used to locate the additional libraries? + java-pkg_addcp "${JAVA_PKG_JARDEST}" + + insinto "${JAVA_PKG_JARDEST}" + local jar + + for jar in *.jar; do + if has ${jar} ${PN}.jar ${PN}-runtime.jar; then + # jars for NQP itself. + java-pkg_dojar ${jar} + else + # jars used by NQP. + doins ${jar} + fi + done + + # Upstream uses -Xbootclasspath/a, which is faster due to lack + # of verification, but gjl isn't flexible enough yet. :( + java-pkg_dolauncher ${PN}-j --main ${PN} + dosym ${PN}-j /usr/bin/${PN} + dobin tools/jvm/eval-client.pl + popd > /dev/null || die + ;; + *) + die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." + ;; + esac +} + +src_configure() { + multibuild_foreach_variant nqp_configure +} + +src_compile() { + multibuild_foreach_variant nqp_compile +} + +src_test() { + multibuild_foreach_variant nqp_test +} + +src_install() { + multibuild_foreach_variant nqp_install + + dodoc CREDITS README.pod + use doc && dodoc -r docs/* +} diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild index 6adbdc268327..120648d125d4 100644 --- a/dev-lang/nqp/nqp-9999.ebuild +++ b/dev-lang/nqp/nqp-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit java-pkg-opt-2 multibuild @@ -10,8 +10,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" - inherit vcs-snapshot + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -30,10 +29,11 @@ CDEPEND="java? ( ) moar? ( ~dev-lang/moarvm-${PV}[clang=] )" RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8 )" +DEPEND="${CDEPEND}" +BDEPEND="${CDEPEND} clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) + java? ( >=virtual/jdk-1.8 ) dev-lang/perl" pkg_pretend() { @@ -70,7 +70,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) + "--prefix=${EPREFIX%/}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die |