commit: 825b832d57c7267faef61b7c4daeda8563a632fc
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 13:16:16 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 13:18:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=825b832d
dev-lang/moarvm: cleanup ebuild
- use edo for printing the configure call line
- add app-arch/zstd:= RDEPEND
- fix variables order
- fix passing "no" strings for all the disabled $(usex) calls
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/moarvm/moarvm-2023.02-r1.ebuild | 42 ++++++++++++------------
dev-lang/moarvm/moarvm-9999.ebuild | 56 +++++++++++++-------------------
2 files changed, 44 insertions(+), 54 deletions(-)
diff --git a/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
b/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
index be97199807ca..c9ff509ceca5 100644
--- a/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
@@ -3,11 +3,12 @@
EAPI=8
+inherit edo
+
MY_PN="MoarVM"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git";
inherit git-r3
- S="${WORKDIR}/${P}"
else
SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz";
KEYWORDS="~amd64 ~x86"
@@ -16,23 +17,26 @@ fi
DESCRIPTION="A 6model-based VM for NQP and Raku"
HOMEPAGE="http://moarvm.org";
+
LICENSE="Artistic-2"
SLOT="0"
-
IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+# Tests are conducted via nqp
+RESTRICT=test
-RDEPEND="dev-libs/libatomic_ops
- >=dev-libs/libuv-1.26:=
- dev-libs/libffi:="
+RDEPEND="
+ app-arch/zstd:=
+ dev-libs/libatomic_ops
+ >=dev-libs/libuv-1.26:=
+ dev-libs/libffi:=
+"
DEPEND="${RDEPEND}
+ dev-lang/perl
clang? ( >=sys-devel/clang-3.1 )
- dev-lang/perl"
+"
DOCS=( CREDITS README.markdown )
-# Tests are conducted via nqp
-RESTRICT=test
-
PATCHES=(
"${FILESDIR}"/${PN}-2023.02-fix-build-clang16.patch
)
@@ -40,23 +44,19 @@ PATCHES=(
src_configure() {
MAKEOPTS+=" NOISY=1"
use doc && DOCS+=( docs/* )
- local prefix="${EPREFIX}/usr"
- local libdir="${EPREFIX}/usr/$(get_libdir)"
- einfo "--prefix '${prefix}'"
- einfo "--libdir '${libdir}'"
local myconfigargs=(
- "--prefix" "${prefix}"
+ "--prefix" "${EPREFIX}/usr"
"--has-libuv"
"--has-libatomic_ops"
"--has-libffi"
- "--libdir" "${libdir}"
+ "--libdir" "${EPREFIX}/usr/$(get_libdir)"
"--compiler" "$(usex clang clang gcc)"
- "$(usex asan --asan)"
- "$(usex debug --debug --no-debug)"
- "$(usex optimize --optimize= --no-optimize)"
- "$(usex static-libs --static)"
- "$(usex ubsan --ubsan)"
+ "$(usex asan --asan "")"
+ "$(usex debug --debug --no-debug)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static "")"
+ "$(usex ubsan --ubsan "")"
)
- perl Configure.pl "${myconfigargs[@]}" moarshared || die
+ edo perl Configure.pl "${myconfigargs[@]}" moarshared
}
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild
b/dev-lang/moarvm/moarvm-9999.ebuild
index 71cb25f7c82f..2ee7ef322dd1 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=8
+inherit edo
+
MY_PN="MoarVM"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git";
- EGIT_SUBMODULES=( '*' '-3rdparty/libatomicops' '-3rdparty/libuv' )
inherit git-r3
- S="${WORKDIR}/${P}"
else
SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz";
KEYWORDS="~amd64 ~x86"
@@ -17,52 +17,42 @@ fi
DESCRIPTION="A 6model-based VM for NQP and Raku"
HOMEPAGE="http://moarvm.org";
+
LICENSE="Artistic-2"
SLOT="0"
-IUSE="asan clang debug doc static-libs optimize ubsan"
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+# Tests are conducted via nqp
+RESTRICT=test
-RDEPEND="dev-libs/libatomic_ops
- >=dev-libs/libuv-1.26:=
- dev-libs/libffi:="
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+RDEPEND="
+ app-arch/zstd:=
+ dev-libs/libatomic_ops
+ >=dev-libs/libuv-1.26:=
+ dev-libs/libffi:=
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
clang? ( >=sys-devel/clang-3.1 )
- dev-lang/perl"
+"
DOCS=( CREDITS README.markdown )
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_prepare() {
- if [[ "${PV}" == "9999" ]]; then
- # Stupid upstream try to auto-fetch this themselves
- git rm -f 3rdparty/{libatomicops,libuv} ||
- die "Can't strip unused submodules"
- fi
- default
-}
-
src_configure() {
MAKEOPTS+=" NOISY=1"
use doc && DOCS+=( docs/* )
- local prefix="${EPREFIX}/usr"
- local libdir="${EPREFIX}/usr/$(get_libdir)"
- einfo "--prefix '${prefix}'"
- einfo "--libdir '${libdir}'"
local myconfigargs=(
- "--prefix" "${prefix}"
+ "--prefix" "${EPREFIX}/usr"
"--has-libuv"
"--has-libatomic_ops"
"--has-libffi"
- "--libdir" "${libdir}"
+ "--libdir" "${EPREFIX}/usr/$(get_libdir)"
"--compiler" "$(usex clang clang gcc)"
- "$(usex asan --asan)"
- "$(usex debug --debug --no-debug)"
- "$(usex optimize --optimize= --no-optimize)"
- "$(usex static-libs --static)"
- "$(usex ubsan --ubsan)"
+ "$(usex asan --asan "")"
+ "$(usex debug --debug --no-debug)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static "")"
+ "$(usex ubsan --ubsan "")"
)
- perl Configure.pl "${myconfigargs[@]}" moarshared || die
+ edo perl Configure.pl "${myconfigargs[@]}" moarshared
}
