commit: 9b3dedde6a4bf9a486382573134d8754422384e6 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Sun Mar 28 10:39:56 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Sun Mar 28 10:39:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b3dedde
sci-electronics/bsc: fix DuplicateEclassInherit Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-electronics/bsc/bsc-0_pre20210124.ebuild | 10 +++++----- sci-electronics/bsc/bsc-9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sci-electronics/bsc/bsc-0_pre20210124.ebuild b/sci-electronics/bsc/bsc-0_pre20210124.ebuild index 5769c1fbc..4581c8485 100644 --- a/sci-electronics/bsc/bsc-0_pre20210124.ebuild +++ b/sci-electronics/bsc/bsc-0_pre20210124.ebuild @@ -6,9 +6,11 @@ EAPI=7 DESCRIPTION="Bluespec high level hardware design language compiler" HOMEPAGE="https://github.com/B-Lang-org/bsc"; +# This inherit git-r3 will removed after upstream finished. +inherit git-r3 + if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"; - inherit git-r3 else EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a" # Using SRC_URI here will failed because this repo uses git submodules. @@ -16,8 +18,6 @@ else # S="${WORKDIR}/${PN}-${EGIT_COMMIT}" # Waiting for https://github.com/B-Lang-org/bsc/issues/85 EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"; - # This inherit git-r3 will removed after upstream finished. - inherit git-r3 KEYWORDS="~amd64 ~x86" fi @@ -64,7 +64,7 @@ DOCS=( "README.md" "COPYING" ) src_compile() { :; } src_install() { - emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install - emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra + emake PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install + emake -C src/comp PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install-extra einstalldocs } diff --git a/sci-electronics/bsc/bsc-9999.ebuild b/sci-electronics/bsc/bsc-9999.ebuild index 5769c1fbc..4581c8485 100644 --- a/sci-electronics/bsc/bsc-9999.ebuild +++ b/sci-electronics/bsc/bsc-9999.ebuild @@ -6,9 +6,11 @@ EAPI=7 DESCRIPTION="Bluespec high level hardware design language compiler" HOMEPAGE="https://github.com/B-Lang-org/bsc"; +# This inherit git-r3 will removed after upstream finished. +inherit git-r3 + if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"; - inherit git-r3 else EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a" # Using SRC_URI here will failed because this repo uses git submodules. @@ -16,8 +18,6 @@ else # S="${WORKDIR}/${PN}-${EGIT_COMMIT}" # Waiting for https://github.com/B-Lang-org/bsc/issues/85 EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"; - # This inherit git-r3 will removed after upstream finished. - inherit git-r3 KEYWORDS="~amd64 ~x86" fi @@ -64,7 +64,7 @@ DOCS=( "README.md" "COPYING" ) src_compile() { :; } src_install() { - emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install - emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra + emake PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install + emake -C src/comp PREFIX="${ED}"/usr LIBDIR="${ED}"/usr/$(get_libdir) install-extra einstalldocs }
