Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/camldbm/
Date: Sat, 22 Jan 2022 13:43:34
Message-Id: 1642858992.2b4dbdea0d25239a573a329efeeaaff8a88794f5.tupone@gentoo
1 commit: 2b4dbdea0d25239a573a329efeeaaff8a88794f5
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 22 13:43:12 2022 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 22 13:43:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4dbdea
7
8 dev-ml/camldbm: do not call ranlib directly
9
10 Closes: https://bugs.gentoo.org/723142
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 dev-ml/camldbm/camldbm-1.0.ebuild | 12 +++++++++++-
15 dev-ml/camldbm/camldbm-1.2.ebuild | 12 +++++++++++-
16 2 files changed, 22 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild
19 index 8f8d8b94854c..c025afbf93f0 100644
20 --- a/dev-ml/camldbm/camldbm-1.0.ebuild
21 +++ b/dev-ml/camldbm/camldbm-1.0.ebuild
22 @@ -1,8 +1,10 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28
29 +inherit toolchain-funcs
30 +
31 DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
32 HOMEPAGE="http://forge.ocamlcore.org/projects/camldbm/"
33 SRC_URI="http://forge.ocamlcore.org/frs/download.php/728/${P}.tgz"
34 @@ -20,6 +22,14 @@ PATCHES=(
35 "${FILESDIR}/include_fix.patch"
36 )
37
38 +src_prepare() {
39 + sed -i \
40 + -e "s|ranlib|$(tc-getRANLIB)|g" \
41 + Makefile \
42 + || die
43 + default
44 +}
45 +
46 src_install() {
47 dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
48 emake LIBDIR="${D}/$(ocamlc -where)" install
49
50 diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
51 index e8ed8d0f97ef..7fb74cd7c4c2 100644
52 --- a/dev-ml/camldbm/camldbm-1.2.ebuild
53 +++ b/dev-ml/camldbm/camldbm-1.2.ebuild
54 @@ -1,8 +1,10 @@
55 -# Copyright 1999-2021 Gentoo Authors
56 +# Copyright 1999-2022 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=7
60
61 +inherit toolchain-funcs
62 +
63 DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
64 HOMEPAGE="https://github.com/ocaml/dbm"
65 SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz"
66 @@ -21,6 +23,14 @@ QA_FLAGS_IGNORED=(
67 /usr/'lib.*'/ocaml/stublibs/dllcamldbm.so
68 )
69
70 +src_prepare() {
71 + sed -i \
72 + -e "s|ranlib|$(tc-getRANLIB)|g" \
73 + Makefile \
74 + || die
75 + default
76 +}
77 +
78 src_install() {
79 dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
80 emake LIBDIR="${D}/$(ocamlc -where)" install