Merge updates from master

sci-electronics/bsc/bsc-0_pre20210106.ebuild

@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Bluespec high level hardware design language compiler"
+HOMEPAGE="https://github.com/B-Lang-org/bsc"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="7d25cdedd5c6df310acfcf5a3255aeb13b6adb61"
+	# Using SRC_URI here will failed because this repo uses git submodules.
+	# SRC_URI="https://github.com/B-Lang-org/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	# 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
+
+LICENSE="BSD GPL-3+ MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-haskell/old-time:0=
+	dev-haskell/regex-compat:0=
+	dev-haskell/split:0=
+	dev-haskell/syb:0=
+	dev-lang/tcl
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-haskell/cabal:0=
+	dev-lang/ghc:0=
+	dev-util/gperf
+	sys-devel/autoconf
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_pre20210106-fix-libdir.patch
+	"${FILESDIR}"/${PN}-0_pre20210106-fix-wrapper.patch
+)
+
+DOCS=( "README.md" "COPYING" )
+
+# We don't want to run it because it will do install by default.
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install
+	einstalldocs
+}

sci-electronics/bsc/bsc-9999.ebuild

@@ -7,11 +7,19 @@ DESCRIPTION="Bluespec high level hardware design language compiler"
 HOMEPAGE="https://github.com/B-Lang-org/bsc"
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git"
+	inherit git-r3
 else
-	SRC_URI=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	EGIT_COMMIT="7d25cdedd5c6df310acfcf5a3255aeb13b6adb61"
+	# Using SRC_URI here will failed because this repo uses git submodules.
+	# SRC_URI="https://github.com/B-Lang-org/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	# 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
 
 LICENSE="BSD GPL-3+ MIT"
@@ -41,8 +49,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-fix-libdir.patch
-	"${FILESDIR}"/${PN}-9999-fix-wrapper.patch
+	"${FILESDIR}"/${PN}-0_pre20210106-fix-libdir.patch
+	"${FILESDIR}"/${PN}-0_pre20210106-fix-wrapper.patch
 )
 
 DOCS=( "README.md" "COPYING" )