Archives
Archives
| 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 15:22:01 |
| Message-Id: | 1642692101.ffbe6ac5b5d4ccc29993e3d7ae68625afbf871df.sam@gentoo |
| 1 | commit: ffbe6ac5b5d4ccc29993e3d7ae68625afbf871df |
| 2 | Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 | AuthorDate: Thu Jan 20 15:21:41 2022 +0000 |
| 4 | Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 | CommitDate: Thu Jan 20 15:21:41 2022 +0000 |
| 6 | URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbe6ac5 |
| 7 | |
| 8 | dev-db/ocp: move common inherit out |
| 9 | |
| 10 | Bug: https://bugs.gentoo.org/831291 |
| 11 | Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 | |
| 13 | dev-db/ocp/ocp-0.3.ebuild | 5 +++-- |
| 14 | dev-db/ocp/ocp-9999.ebuild | 5 +++-- |
| 15 | 2 files changed, 6 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild |
| 18 | index 47e7110d55b1..baeb53e6decb 100644 |
| 19 | --- a/dev-db/ocp/ocp-0.3.ebuild |
| 20 | +++ b/dev-db/ocp/ocp-0.3.ebuild |
| 21 | @@ -6,14 +6,15 @@ EAPI=8 |
| 22 | DESCRIPTION="Oracle copy tool" |
| 23 | HOMEPAGE="https://github.com/maxsatula/ocp" |
| 24 | |
| 25 | +inherit toolchain-funcs |
| 26 | + |
| 27 | if [[ ${PV} == *9999 ]]; then |
| 28 | EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" |
| 29 | EGIT_BRANCH="develop" |
| 30 | - inherit git-r3 autotools toolchain-funcs |
| 31 | + inherit autotools git-r3 |
| 32 | else |
| 33 | SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" |
| 34 | KEYWORDS="~amd64 ~x86" |
| 35 | - inherit toolchain-funcs |
| 36 | fi |
| 37 | |
| 38 | LICENSE="GPL-2" |
| 39 | |
| 40 | diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild |
| 41 | index 47e7110d55b1..baeb53e6decb 100644 |
| 42 | --- a/dev-db/ocp/ocp-9999.ebuild |
| 43 | +++ b/dev-db/ocp/ocp-9999.ebuild |
| 44 | @@ -6,14 +6,15 @@ EAPI=8 |
| 45 | DESCRIPTION="Oracle copy tool" |
| 46 | HOMEPAGE="https://github.com/maxsatula/ocp" |
| 47 | |
| 48 | +inherit toolchain-funcs |
| 49 | + |
| 50 | if [[ ${PV} == *9999 ]]; then |
| 51 | EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" |
| 52 | EGIT_BRANCH="develop" |
| 53 | - inherit git-r3 autotools toolchain-funcs |
| 54 | + inherit autotools git-r3 |
| 55 | else |
| 56 | SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" |
| 57 | KEYWORDS="~amd64 ~x86" |
| 58 | - inherit toolchain-funcs |
| 59 | fi |
| 60 | |
| 61 | LICENSE="GPL-2" |