1 |
commit: 17a03dc319817453d58ea7f2e909e8b522c6659d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 17 22:04:14 2023 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 17 22:04:14 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a03dc3 |
7 |
|
8 |
findlib.eclass: remove EAPI 6 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
eclass/findlib.eclass | 16 ++++++++-------- |
13 |
1 file changed, 8 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass |
16 |
index 52e3655b3e84..fdcaa0c1b77c 100644 |
17 |
--- a/eclass/findlib.eclass |
18 |
+++ b/eclass/findlib.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2022 Gentoo Authors |
21 |
+# Copyright 1999-2023 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: findlib.eclass |
25 |
@@ -6,13 +6,13 @@ |
26 |
# ML <ml@g.o> |
27 |
# @AUTHOR: |
28 |
# Original author: Matthieu Sozeau <mattam@g.o> (retired) |
29 |
-# @SUPPORTED_EAPIS: 6 7 8 |
30 |
+# @SUPPORTED_EAPIS: 7 8 |
31 |
# @BLURB: ocamlfind (a.k.a. findlib) eclass |
32 |
# @DESCRIPTION: |
33 |
# ocamlfind (a.k.a. findlib) eclass |
34 |
|
35 |
-case ${EAPI:-0} in |
36 |
- [678]) ;; |
37 |
+case ${EAPI} in |
38 |
+ 7|8) ;; |
39 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
40 |
esac |
41 |
|
42 |
@@ -35,7 +35,7 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]" |
43 |
# @DESCRIPTION: |
44 |
# Die if ocamlfind is not found |
45 |
check_ocamlfind() { |
46 |
- if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then |
47 |
+ if [[ ! -x ${EPREFIX}/usr/bin/ocamlfind ]] ; then |
48 |
eerror "In ${ECLASS}: could not find the ocamlfind executable" |
49 |
eerror "Please report this bug on Gentoo's Bugzilla, assigning to ml@g.o" |
50 |
die "ocamlfind executable not found" |
51 |
@@ -51,16 +51,16 @@ findlib_src_preinst() { |
52 |
check_ocamlfind |
53 |
|
54 |
# destdir is the ocaml sitelib |
55 |
- local destdir=`ocamlfind printconf destdir` |
56 |
+ local destdir=$(ocamlfind printconf destdir) |
57 |
|
58 |
# strip off prefix |
59 |
destdir=${destdir#${EPREFIX}} |
60 |
|
61 |
- dodir ${destdir} || die "dodir failed" |
62 |
+ dodir "${destdir}" |
63 |
export OCAMLFIND_DESTDIR=${ED}${destdir} |
64 |
|
65 |
# stublibs style |
66 |
- dodir ${destdir}/stublibs || die "dodir failed" |
67 |
+ dodir "${destdir}"/stublibs |
68 |
export OCAMLFIND_LDCONF=ignore |
69 |
} |