commit: fd805dafac9ea98ce4a3e146570d3d451c7aebf5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 1 21:07:02 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 1 21:07:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd805daf
dev-ml/uchar: EAPI 8 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{uchar-0.0.2.ebuild => uchar-0.0.2-r1.ebuild} | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-ml/uchar/uchar-0.0.2.ebuild b/dev-ml/uchar/uchar-0.0.2-r1.ebuild similarity index 73% rename from dev-ml/uchar/uchar-0.0.2.ebuild rename to dev-ml/uchar/uchar-0.0.2-r1.ebuild index b877cb8b70f8..e01cf3ceb62b 100644 --- a/dev-ml/uchar/uchar-0.0.2.ebuild +++ b/dev-ml/uchar/uchar-0.0.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit findlib +inherit edo findlib DESCRIPTION="Uchar compatibility library" HOMEPAGE="https://github.com/ocaml/uchar" @@ -14,8 +14,9 @@ SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" IUSE="+ocamlopt" -RDEPEND=">=dev-lang/ocaml-4.03:=" -DEPEND="${RDEPEND} dev-ml/ocamlbuild" +RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/ocamlbuild" # This is mostly a compat wrapper for older ocaml versions we don't support. No # need to test it, plus it fails when installing for the first time: @@ -23,19 +24,21 @@ DEPEND="${RDEPEND} dev-ml/ocamlbuild" RESTRICT="test" src_compile() { - ocaml pkg/build.ml \ + edo ocaml pkg/build.ml \ "native=$(usex ocamlopt true false)" \ - "native-dynlink=$(usex ocamlopt true false)" || die + "native-dynlink=$(usex ocamlopt true false)" } src_test() { - ocamlbuild -X src -use-ocamlfind -pkg uchar test/testpkg.native || die + edo ocamlbuild -X src -use-ocamlfind -pkg uchar test/testpkg.native } src_install() { # Can't use opam-installer here as it is an opam dep... findlib_src_preinst + mv _build/pkg/META{.empty,} || die ocamlfind install ${PN} _build/pkg/META || die + dodoc README.md CHANGES.md }