From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 572A113835A for ; Sun, 28 Mar 2021 10:52:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A97F2E08F0; Sun, 28 Mar 2021 10:52:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F91BE08DD for ; Sun, 28 Mar 2021 10:52:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3F28340E12 for ; Sun, 28 Mar 2021 10:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1F0F63C for ; Sun, 28 Mar 2021 10:52:45 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1616927996.9b3dedde6a4bf9a486382573134d8754422384e6.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/bsc/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-electronics/bsc/bsc-0_pre20210124.ebuild sci-electronics/bsc/bsc-9999.ebuild X-VCS-Directories: sci-electronics/bsc/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9b3dedde6a4bf9a486382573134d8754422384e6 X-VCS-Branch: dev Date: Sun, 28 Mar 2021 10:52:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a706c805-7b66-4340-b2a8-1dd32dbfa2ba X-Archives-Hash: c473388752f80008ab74a41df0e7e693 commit: 9b3dedde6a4bf9a486382573134d8754422384e6 Author: Andrew Ammerlaan riseup net> AuthorDate: Sun Mar 28 10:39:56 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 }