1 |
commit: 673dc2eb7385a3583a72f665bbf26298fbdc0649 |
2 |
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> |
3 |
AuthorDate: Sun May 2 01:14:55 2021 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Sun May 2 02:19:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=673dc2eb |
7 |
|
8 |
sci-mathematics/*: inherit findlib eclass |
9 |
|
10 |
Closes: https://bugs.gentoo.org/784677 |
11 |
Closes: https://bugs.gentoo.org/784671 |
12 |
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> |
13 |
|
14 |
sci-mathematics/frama-c/frama-c-22.0.ebuild | 7 +------ |
15 |
sci-mathematics/why3/why3-1.3.3.ebuild | 6 +++--- |
16 |
sci-mathematics/why3/why3-1.4.0.ebuild | 6 +++--- |
17 |
3 files changed, 7 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/sci-mathematics/frama-c/frama-c-22.0.ebuild b/sci-mathematics/frama-c/frama-c-22.0.ebuild |
20 |
index da4cb7ef4..cb0c8334c 100644 |
21 |
--- a/sci-mathematics/frama-c/frama-c-22.0.ebuild |
22 |
+++ b/sci-mathematics/frama-c/frama-c-22.0.ebuild |
23 |
@@ -3,7 +3,7 @@ |
24 |
|
25 |
EAPI=7 |
26 |
|
27 |
-inherit autotools |
28 |
+inherit autotools findlib |
29 |
|
30 |
DESCRIPTION="Framework for analysis of source codes written in C" |
31 |
HOMEPAGE="https://frama-c.com" |
32 |
@@ -26,7 +26,6 @@ RDEPEND=" |
33 |
gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] ) |
34 |
wp? ( ~sci-mathematics/why3-1.3.3 )" |
35 |
DEPEND="${RDEPEND} |
36 |
- dev-ml/findlib |
37 |
media-gfx/graphviz" |
38 |
|
39 |
REQUIRED_USE=" |
40 |
@@ -97,7 +96,3 @@ src_configure() { |
41 |
$(use_enable wp) \ |
42 |
--disable-wp-coq |
43 |
} |
44 |
- |
45 |
-src_install() { |
46 |
- emake install DESTDIR="${ED}" |
47 |
-} |
48 |
|
49 |
diff --git a/sci-mathematics/why3/why3-1.3.3.ebuild b/sci-mathematics/why3/why3-1.3.3.ebuild |
50 |
index b710f8a1a..efe7c0d1a 100644 |
51 |
--- a/sci-mathematics/why3/why3-1.3.3.ebuild |
52 |
+++ b/sci-mathematics/why3/why3-1.3.3.ebuild |
53 |
@@ -3,7 +3,7 @@ |
54 |
|
55 |
EAPI=7 |
56 |
|
57 |
-inherit autotools |
58 |
+inherit autotools findlib |
59 |
|
60 |
DESCRIPTION="Platform for deductive program verification" |
61 |
HOMEPAGE="http://why3.lri.fr/" |
62 |
@@ -16,7 +16,6 @@ IUSE="coq emacs gtk +ocamlopt re +zarith zip" |
63 |
|
64 |
DEPEND=">=dev-lang/ocaml-4.05.0[ocamlopt?] |
65 |
>=dev-ml/menhir-20151112 |
66 |
- dev-ml/findlib |
67 |
dev-ml/num |
68 |
coq? ( >=sci-mathematics/coq-8.6 ) |
69 |
emacs? ( app-editors/emacs:* ) |
70 |
@@ -70,7 +69,8 @@ src_compile() { |
71 |
} |
72 |
|
73 |
src_install(){ |
74 |
- emake install install-lib DESTDIR="${ED}" |
75 |
+ findlib_src_preinst |
76 |
+ emake install install-lib DESTDIR="${ED}" || die "make failed" |
77 |
|
78 |
doman doc/why3.1 |
79 |
einstalldocs |
80 |
|
81 |
diff --git a/sci-mathematics/why3/why3-1.4.0.ebuild b/sci-mathematics/why3/why3-1.4.0.ebuild |
82 |
index 7a1ab9ca4..0c41a284e 100644 |
83 |
--- a/sci-mathematics/why3/why3-1.4.0.ebuild |
84 |
+++ b/sci-mathematics/why3/why3-1.4.0.ebuild |
85 |
@@ -3,7 +3,7 @@ |
86 |
|
87 |
EAPI=7 |
88 |
|
89 |
-inherit autotools |
90 |
+inherit autotools findlib |
91 |
|
92 |
DESCRIPTION="Platform for deductive program verification" |
93 |
HOMEPAGE="http://why3.lri.fr/" |
94 |
@@ -16,7 +16,6 @@ IUSE="coq doc emacs gtk +ocamlopt re sexp +zarith zip" |
95 |
|
96 |
DEPEND=">=dev-lang/ocaml-4.05.0[ocamlopt?] |
97 |
>=dev-ml/menhir-20151112 |
98 |
- dev-ml/findlib |
99 |
dev-ml/num |
100 |
coq? ( >=sci-mathematics/coq-8.6 ) |
101 |
doc? ( |
102 |
@@ -74,7 +73,8 @@ src_compile() { |
103 |
} |
104 |
|
105 |
src_install(){ |
106 |
- emake install install-lib DESTDIR="${ED}" |
107 |
+ findlib_src_preinst |
108 |
+ emake install install-lib DESTDIR="${ED}" || die "make failed" |
109 |
|
110 |
einstalldocs |
111 |
docompress -x /usr/share/doc/${PF}/examples |