From 49db8fda121c048515f6801689438f4ba94cd83f Mon Sep 17 00:00:00 2001 From: Maciej Barć Date: Thu, 2 Nov 2023 16:59:08 +0100 Subject: sci-mathematics/proverif: require ocamlopt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/916717 Signed-off-by: Maciej Barć --- sci-mathematics/proverif/proverif-2.04-r1.ebuild | 66 ++++++++++++++++++++++++ sci-mathematics/proverif/proverif-2.04.ebuild | 63 ---------------------- sci-mathematics/proverif/proverif-9999.ebuild | 9 ++-- 3 files changed, 72 insertions(+), 66 deletions(-) create mode 100644 sci-mathematics/proverif/proverif-2.04-r1.ebuild delete mode 100644 sci-mathematics/proverif/proverif-2.04.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/proverif/proverif-2.04-r1.ebuild b/sci-mathematics/proverif/proverif-2.04-r1.ebuild new file mode 100644 index 000000000000..a70d69a747de --- /dev/null +++ b/sci-mathematics/proverif/proverif-2.04-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo elisp-common findlib + +DESCRIPTION="Cryptographic protocol verifier in the formal model" +HOMEPAGE="https://bblanche.gitlabpages.inria.fr/proverif/ + https://gitlab.inria.fr/bblanche/proverif/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://gitlab.inria.fr/bblanche/${PN}.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://gitlab.inria.fr/bblanche/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + S="${WORKDIR}/${PN}-v${PV}/${PN}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="emacs" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt] + emacs? ( >=app-editors/emacs-25:* ) +" +DEPEND=" + ${RDEPEND} +" + +DOCS=( CHANGES README docs/dev docs/manual ) +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + edob sh ./build -nointeract + + if use emacs ; then + cd "${S}/emacs" || die + + elisp-compile *.el + fi +} + +src_test() { + edob sh ./test +} + +src_install() { + findlib_src_preinst + + exeinto /usr/bin + doexe proverif + doexe proveriftotex + + if use emacs ; then + elisp-install "${PN}" "${S}/emacs"/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + einstalldocs +} diff --git a/sci-mathematics/proverif/proverif-2.04.ebuild b/sci-mathematics/proverif/proverif-2.04.ebuild deleted file mode 100644 index 248a70edb9d2..000000000000 --- a/sci-mathematics/proverif/proverif-2.04.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo elisp-common findlib - -DESCRIPTION="Cryptographic protocol verifier in the formal model" -HOMEPAGE="https://bblanche.gitlabpages.inria.fr/proverif/ - https://gitlab.inria.fr/bblanche/proverif/" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.inria.fr/bblanche/${PN}.git" - S="${WORKDIR}/${P}/${PN}" -else - SRC_URI="https://gitlab.inria.fr/bblanche/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-v${PV}/${PN}" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="emacs" - -RDEPEND=" - emacs? ( >=app-editors/emacs-25:* ) -" -BDEPEND=" - ${RDEPEND} -" - -DOCS=( CHANGES README docs/dev docs/manual ) -SITEFILE="50${PN}-gentoo.el" - -src_compile() { - edob sh ./build -nointeract - - if use emacs ; then - cd "${S}/emacs" || die - - elisp-compile *.el - fi -} - -src_test() { - edob sh ./test -} - -src_install() { - findlib_src_preinst - - exeinto /usr/bin - doexe proverif - doexe proveriftotex - - if use emacs ; then - elisp-install "${PN}" "${S}/emacs"/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - einstalldocs -} diff --git a/sci-mathematics/proverif/proverif-9999.ebuild b/sci-mathematics/proverif/proverif-9999.ebuild index 248a70edb9d2..a70d69a747de 100644 --- a/sci-mathematics/proverif/proverif-9999.ebuild +++ b/sci-mathematics/proverif/proverif-9999.ebuild @@ -9,14 +9,16 @@ DESCRIPTION="Cryptographic protocol verifier in the formal model" HOMEPAGE="https://bblanche.gitlabpages.inria.fr/proverif/ https://gitlab.inria.fr/bblanche/proverif/" -if [[ ${PV} == *9999* ]] ; then +if [[ "${PV}" == *9999* ]] ; then inherit git-r3 + EGIT_REPO_URI="https://gitlab.inria.fr/bblanche/${PN}.git" S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://gitlab.inria.fr/bblanche/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${PN}-v${PV}/${PN}" + + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2+" @@ -24,9 +26,10 @@ SLOT="0" IUSE="emacs" RDEPEND=" + dev-lang/ocaml:=[ocamlopt] emacs? ( >=app-editors/emacs-25:* ) " -BDEPEND=" +DEPEND=" ${RDEPEND} " -- cgit v1.2.3-65-gdbad