commit: 673dc2eb7385a3583a72f665bbf26298fbdc0649 Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> AuthorDate: Sun May 2 01:14:55 2021 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Sun May 2 02:19:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=673dc2eb
sci-mathematics/*: inherit findlib eclass Closes: https://bugs.gentoo.org/784677 Closes: https://bugs.gentoo.org/784671 Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> sci-mathematics/frama-c/frama-c-22.0.ebuild | 7 +------ sci-mathematics/why3/why3-1.3.3.ebuild | 6 +++--- sci-mathematics/why3/why3-1.4.0.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sci-mathematics/frama-c/frama-c-22.0.ebuild b/sci-mathematics/frama-c/frama-c-22.0.ebuild index da4cb7ef4..cb0c8334c 100644 --- a/sci-mathematics/frama-c/frama-c-22.0.ebuild +++ b/sci-mathematics/frama-c/frama-c-22.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools +inherit autotools findlib DESCRIPTION="Framework for analysis of source codes written in C" HOMEPAGE="https://frama-c.com"; @@ -26,7 +26,6 @@ RDEPEND=" gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] ) wp? ( ~sci-mathematics/why3-1.3.3 )" DEPEND="${RDEPEND} - dev-ml/findlib media-gfx/graphviz" REQUIRED_USE=" @@ -97,7 +96,3 @@ src_configure() { $(use_enable wp) \ --disable-wp-coq } - -src_install() { - emake install DESTDIR="${ED}" -} diff --git a/sci-mathematics/why3/why3-1.3.3.ebuild b/sci-mathematics/why3/why3-1.3.3.ebuild index b710f8a1a..efe7c0d1a 100644 --- a/sci-mathematics/why3/why3-1.3.3.ebuild +++ b/sci-mathematics/why3/why3-1.3.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools +inherit autotools findlib DESCRIPTION="Platform for deductive program verification" HOMEPAGE="http://why3.lri.fr/"; @@ -16,7 +16,6 @@ IUSE="coq emacs gtk +ocamlopt re +zarith zip" DEPEND=">=dev-lang/ocaml-4.05.0[ocamlopt?] >=dev-ml/menhir-20151112 - dev-ml/findlib dev-ml/num coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) @@ -70,7 +69,8 @@ src_compile() { } src_install(){ - emake install install-lib DESTDIR="${ED}" + findlib_src_preinst + emake install install-lib DESTDIR="${ED}" || die "make failed" doman doc/why3.1 einstalldocs diff --git a/sci-mathematics/why3/why3-1.4.0.ebuild b/sci-mathematics/why3/why3-1.4.0.ebuild index 7a1ab9ca4..0c41a284e 100644 --- a/sci-mathematics/why3/why3-1.4.0.ebuild +++ b/sci-mathematics/why3/why3-1.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools +inherit autotools findlib DESCRIPTION="Platform for deductive program verification" HOMEPAGE="http://why3.lri.fr/"; @@ -16,7 +16,6 @@ IUSE="coq doc emacs gtk +ocamlopt re sexp +zarith zip" DEPEND=">=dev-lang/ocaml-4.05.0[ocamlopt?] >=dev-ml/menhir-20151112 - dev-ml/findlib dev-ml/num coq? ( >=sci-mathematics/coq-8.6 ) doc? ( @@ -74,7 +73,8 @@ src_compile() { } src_install(){ - emake install install-lib DESTDIR="${ED}" + findlib_src_preinst + emake install install-lib DESTDIR="${ED}" || die "make failed" einstalldocs docompress -x /usr/share/doc/${PF}/examples
