* [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/nqp/
@ 2023-02-03 21:09 Andrew Ammerlaan
2023-02-03 21:15 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-02-03 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 28ee52d82363e63b77ecd4412004532b4b24d3c5
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 21:09:18 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 21:09:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28ee52d8
dev-lang/nqp: drop duplicate
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-lang/nqp/Manifest | 1 -
dev-lang/nqp/metadata.xml | 15 ----
dev-lang/nqp/nqp-2022.12.ebuild | 148 ----------------------------------------
3 files changed, 164 deletions(-)
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
deleted file mode 100644
index fc51da90f..000000000
--- a/dev-lang/nqp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nqp-2022.12.tar.gz 5893490 BLAKE2B 0b465fbe6b740f511f40db4df4a67e61e3d205b6652ac557c1338be9cf15dfd52fbc14fe4d0524ab2d20f5d9eb0b555f6db7d6da59e3e45806c93e8a619bfb27 SHA512 5813d51f4a8aa719ea471e026c752b6492adc96a4325c546f87d5b190aec75b69727cf7ad421390398535eec0cfc7691420a51f8f1a2d2c25a92215b2a0becc8
diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml
deleted file mode 100644
index d8098a08f..000000000
--- a/dev-lang/nqp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
- <use>
- <flag name="clang">Toggle usage of the clang compiler in conjunction with MoarVM</flag>
- <flag name="moar">Build the MoarVM backend (experimental/broken)</flag>
- </use>
- <upstream>
- <remote-id type="github">perl6/nqp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-lang/nqp/nqp-2022.12.ebuild b/dev-lang/nqp/nqp-2022.12.ebuild
deleted file mode 100644
index 20a62cc8a..000000000
--- a/dev-lang/nqp/nqp-2022.12.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 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
-else
- SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )
- primaryuri"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
- dev-java/asm:4
- dev-java/jna:4
- )
- moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.9 )
- 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
-}
-
-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}" \
- 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/*
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-lang/nqp/
2023-02-03 21:09 [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/nqp/ Andrew Ammerlaan
@ 2023-02-03 21:15 ` Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-02-03 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 28ee52d82363e63b77ecd4412004532b4b24d3c5
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 21:09:18 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 21:09:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28ee52d8
dev-lang/nqp: drop duplicate
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-lang/nqp/Manifest | 1 -
dev-lang/nqp/metadata.xml | 15 ----
dev-lang/nqp/nqp-2022.12.ebuild | 148 ----------------------------------------
3 files changed, 164 deletions(-)
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
deleted file mode 100644
index fc51da90f..000000000
--- a/dev-lang/nqp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nqp-2022.12.tar.gz 5893490 BLAKE2B 0b465fbe6b740f511f40db4df4a67e61e3d205b6652ac557c1338be9cf15dfd52fbc14fe4d0524ab2d20f5d9eb0b555f6db7d6da59e3e45806c93e8a619bfb27 SHA512 5813d51f4a8aa719ea471e026c752b6492adc96a4325c546f87d5b190aec75b69727cf7ad421390398535eec0cfc7691420a51f8f1a2d2c25a92215b2a0becc8
diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml
deleted file mode 100644
index d8098a08f..000000000
--- a/dev-lang/nqp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
- <use>
- <flag name="clang">Toggle usage of the clang compiler in conjunction with MoarVM</flag>
- <flag name="moar">Build the MoarVM backend (experimental/broken)</flag>
- </use>
- <upstream>
- <remote-id type="github">perl6/nqp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-lang/nqp/nqp-2022.12.ebuild b/dev-lang/nqp/nqp-2022.12.ebuild
deleted file mode 100644
index 20a62cc8a..000000000
--- a/dev-lang/nqp/nqp-2022.12.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 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
-else
- SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )
- primaryuri"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
- dev-java/asm:4
- dev-java/jna:4
- )
- moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
- clang? ( sys-devel/clang )
- java? ( >=virtual/jdk-1.9 )
- 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
-}
-
-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}" \
- 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/*
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-03 21:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-03 21:09 [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/nqp/ Andrew Ammerlaan
2023-02-03 21:15 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox