commit: ffbe6ac5b5d4ccc29993e3d7ae68625afbf871df Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 20 15:21:41 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 20 15:21:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbe6ac5
dev-db/ocp: move common inherit out Bug: https://bugs.gentoo.org/831291 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/ocp/ocp-0.3.ebuild | 5 +++-- dev-db/ocp/ocp-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild index 47e7110d55b1..baeb53e6decb 100644 --- a/dev-db/ocp/ocp-0.3.ebuild +++ b/dev-db/ocp/ocp-0.3.ebuild @@ -6,14 +6,15 @@ EAPI=8 DESCRIPTION="Oracle copy tool" HOMEPAGE="https://github.com/maxsatula/ocp" +inherit toolchain-funcs + if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" EGIT_BRANCH="develop" - inherit git-r3 autotools toolchain-funcs + inherit autotools git-r3 else SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" - inherit toolchain-funcs fi LICENSE="GPL-2" diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild index 47e7110d55b1..baeb53e6decb 100644 --- a/dev-db/ocp/ocp-9999.ebuild +++ b/dev-db/ocp/ocp-9999.ebuild @@ -6,14 +6,15 @@ EAPI=8 DESCRIPTION="Oracle copy tool" HOMEPAGE="https://github.com/maxsatula/ocp" +inherit toolchain-funcs + if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" EGIT_BRANCH="develop" - inherit git-r3 autotools toolchain-funcs + inherit autotools git-r3 else SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" - inherit toolchain-funcs fi LICENSE="GPL-2"