Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/ocp/
Date: Thu, 20 Jan 2022 12:36:09
Message-Id: 1642681873.7f7653c57cf5f7d60c9d5c97c7d36887e3600f25.sam@gentoo
1 commit: 7f7653c57cf5f7d60c9d5c97c7d36887e3600f25
2 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
3 AuthorDate: Thu Jan 20 06:42:16 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 12:31:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7653c5
7
8 dev-db/ocp: fix AR direct call
9
10 Closes: https://bugs.gentoo.org/831291
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/23879
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 dev-db/ocp/ocp-0.3.ebuild | 11 ++++++++---
17 dev-db/ocp/ocp-9999.ebuild | 11 ++++++++---
18 2 files changed, 16 insertions(+), 6 deletions(-)
19
20 diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild
21 index 5c6591bf5df3..47e7110d55b1 100644
22 --- a/dev-db/ocp/ocp-0.3.ebuild
23 +++ b/dev-db/ocp/ocp-0.3.ebuild
24 @@ -1,7 +1,7 @@
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2022 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=7
30 +EAPI=8
31
32 DESCRIPTION="Oracle copy tool"
33 HOMEPAGE="https://github.com/maxsatula/ocp"
34 @@ -9,10 +9,11 @@ HOMEPAGE="https://github.com/maxsatula/ocp"
35 if [[ ${PV} == *9999 ]]; then
36 EGIT_REPO_URI="https://github.com/maxsatula/ocp.git"
37 EGIT_BRANCH="develop"
38 - inherit git-r3 autotools
39 + inherit git-r3 autotools toolchain-funcs
40 else
41 SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz"
42 KEYWORDS="~amd64 ~x86"
43 + inherit toolchain-funcs
44 fi
45
46 LICENSE="GPL-2"
47 @@ -27,6 +28,10 @@ DEPEND="
48 dev-db/oracle-instantclient[sdk]
49 ${RDEPEND}"
50
51 +src_compile() {
52 + emake AR="$(tc-getAR)"
53 +}
54 +
55 src_prepare() {
56 default
57
58
59 diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild
60 index 5c6591bf5df3..47e7110d55b1 100644
61 --- a/dev-db/ocp/ocp-9999.ebuild
62 +++ b/dev-db/ocp/ocp-9999.ebuild
63 @@ -1,7 +1,7 @@
64 -# Copyright 1999-2017 Gentoo Foundation
65 +# Copyright 1999-2022 Gentoo Authors
66 # Distributed under the terms of the GNU General Public License v2
67
68 -EAPI=7
69 +EAPI=8
70
71 DESCRIPTION="Oracle copy tool"
72 HOMEPAGE="https://github.com/maxsatula/ocp"
73 @@ -9,10 +9,11 @@ HOMEPAGE="https://github.com/maxsatula/ocp"
74 if [[ ${PV} == *9999 ]]; then
75 EGIT_REPO_URI="https://github.com/maxsatula/ocp.git"
76 EGIT_BRANCH="develop"
77 - inherit git-r3 autotools
78 + inherit git-r3 autotools toolchain-funcs
79 else
80 SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz"
81 KEYWORDS="~amd64 ~x86"
82 + inherit toolchain-funcs
83 fi
84
85 LICENSE="GPL-2"
86 @@ -27,6 +28,10 @@ DEPEND="
87 dev-db/oracle-instantclient[sdk]
88 ${RDEPEND}"
89
90 +src_compile() {
91 + emake AR="$(tc-getAR)"
92 +}
93 +
94 src_prepare() {
95 default