commit: e952259cd04973d3c937effd1aeaa024d8ae0bab Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Fri May 31 07:12:15 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Fri May 31 07:13:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e952259c
dev-ml/camlidl: use cpp from make.conf Closes: https://bugs.gentoo.org/933215 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ml/camlidl/camlidl-1.09.ebuild | 6 +++--- dev-ml/camlidl/{camlidl-1.11.ebuild => camlidl-1.11-r1.ebuild} | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-ml/camlidl/camlidl-1.09.ebuild b/dev-ml/camlidl/camlidl-1.09.ebuild index 69fd815e015e..a31500fcbdb5 100644 --- a/dev-ml/camlidl/camlidl-1.09.ebuild +++ b/dev-ml/camlidl/camlidl-1.09.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,6 +9,8 @@ DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'C HOMEPAGE="http://caml.inria.fr/camlidl/"; SRC_URI="https://github.com/xavierleroy/${PN}/archive/${PN}$(ver_rs 0-1 '').tar.gz" +S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') + LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -16,8 +18,6 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]" RDEPEND="${DEPEND}" -S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') - PATCHES=( "${FILESDIR}/nowarn.patch" "${FILESDIR}"/${P}.parallelMake.patch diff --git a/dev-ml/camlidl/camlidl-1.11.ebuild b/dev-ml/camlidl/camlidl-1.11-r1.ebuild similarity index 92% rename from dev-ml/camlidl/camlidl-1.11.ebuild rename to dev-ml/camlidl/camlidl-1.11-r1.ebuild index cf719ff1b91a..046fe9242f7b 100644 --- a/dev-ml/camlidl/camlidl-1.11.ebuild +++ b/dev-ml/camlidl/camlidl-1.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,6 +9,8 @@ DESCRIPTION="Stub code generator for OCaml" HOMEPAGE="https://github.com/xavierleroy/camlidl"; SRC_URI="https://github.com/xavierleroy/${PN}/archive/${PN}$(ver_rs 0-1 '').tar.gz" +S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') + LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" @@ -16,8 +18,6 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]" RDEPEND="${DEPEND}" -S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '') - PATCHES=( "${FILESDIR}/nowarn.patch" ) @@ -39,8 +39,8 @@ src_compile() { ln -s Makefile.unix config/Makefile || die # Make - emake depend - emake -j1 RANLIB="$(tc-getRANLIB)" CPP="$(tc-getPROG CPP cpp)" + emake depend CPP="$(tc-getPROG CPP cpp)" + emake -j1 RANLIB="$(tc-getRANLIB)" } src_test() {
