5 files changed, 118 insertions, 91 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index bfa476de3ff4..67294ce49496 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 7b37fb1fba6b..7291b26f8130 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,5 +1,4 @@
 AUX ghdl-4.0.0_pre20231218-no-pyunit.patch 689 BLAKE2B 2df3df07e290240b2e99422fda33d2ccee9f01a5f3c3aa3535e40ab66bf5de95cbef3821a3e31b0f36b82f5bc90e078e9d2f9424ea5226f7c671ce4dec571458 SHA512 9149bb90346b0c97683a4ed7056cecb727f4ff9a5b89f8b4046983475cd40937f363438129304c72199442bcc3ad948f2c86cb38b6bd0d314dba9199f34a37a6
 DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703
 EBUILD ghdl-4.1.0-r1.ebuild 1749 BLAKE2B 21189188192f6049caa4402e101616d295e36c993502220f7bd99543dde09b2e7324fc1d6b2586edc6d2c4bbf3eefeea5d2ba01e206c521fde44d2843111a2be SHA512 edfb6377135a98ae9f44983a6dbf366f50cbbff52f7c24892911b79bf625d4b69c4a639bcb171e728e1d85fd4ff6a067c36840e5b77b41e197194c58b2be770b
-EBUILD ghdl-4.1.0.ebuild 1551 BLAKE2B 88d7bc60d054a48297b5e21d333e9479f7116c6f01cc75c239847c74c5407724ab8883edd483a36cfd4fc760a8e494e4438dc028af117a978f76b230613fa47b SHA512 a7c5bb4e4948cac92aadeff2ffd82642f34d35cfa6d63772a1ac8003238bf2ab30d9d4879c121c0d1b01e5a4f21c6e37995850bd9b36c7a6b1a1548ff6e230eb
 MISC metadata.xml 1462 BLAKE2B a403ab50a3463fc26ddfb6ad65aa2cfe9782e98b74cd91fe24ef81678e7c52a2211b0bcad27accc4cd57db281ed23ad5d8697ae69dd8b67c623465949d6d3434 SHA512 4bd4c20a8fbbdaa80a63373f81bd96144e110371403832627aba81a7a95d073ee73922516a6d5c193898affbeb8bd7f1ce9fc4203faa13464cf39ba809c82d5d
diff --git a/sci-electronics/ghdl/ghdl-4.1.0.ebuild b/sci-electronics/ghdl/ghdl-4.1.0.ebuild
deleted file mode 100644
index 7fb1396f35c1..000000000000
--- a/sci-electronics/ghdl/ghdl-4.1.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_13 )
-LLVM_MAX_SLOT=17        # Check "configure" script for supported LLVM versions.
-
-inherit ada edo llvm toolchain-funcs
-
-DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87"
-HOMEPAGE="https://ghdl.github.io/ghdl/
-	https://github.com/ghdl/ghdl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ghdl/${PN}.git"
-else
-	SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="llvm"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="
-	${ADA_DEPS}
-	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
-
-pkg_setup() {
-	ada_pkg_setup
-
-	use llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local -a myconf=(
-		# Build.
-		--disable-werror
-
-		# Install location.
-		--libdir=$(get_libdir)
-		--prefix=/usr
-
-		# Features.
-		--enable-libghdl
-		--enable-synth
-	)
-
-	if use llvm ; then
-		myconf+=( --with-llvm-config=llvm-config )
-	fi
-
-	# Not a autotools script!
-	edo sh ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	patchelf --set-soname libghw.so lib/libghw.so || die
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
diff --git a/sci-electronics/nvc/Manifest b/sci-electronics/nvc/Manifest
index 7e23f8051c05..19d8dc8aceb4 100644
--- a/sci-electronics/nvc/Manifest
+++ b/sci-electronics/nvc/Manifest
@@ -1,4 +1,6 @@
 AUX nvc-1.9.2-jit-code-capstone.patch 200 BLAKE2B f819ef52f6f47b5c2c04d7c938c82a439dc111daffad1ec92506b3d15daa6eb2182fb5384edff8ca76b3120a62085af8ddd01cf7092bea66eb37213985fd90b5 SHA512 11b9be76fb07893fa95b17006fc694faea30c522454f16183b18aa43c772d38098ba5c558ed331203530fd1eb44a37a0c85cff5f3f89d9410164cad29b635375
 DIST nvc-1.14.0.tar.gz 2030838 BLAKE2B e8c3e98077efcd1f024a70bb7a39e0cc1333b0ecf5e372f12eea5660e5a2907fbb660b7b5ee6ae7bf691f02134c4da898905baee650efae87839732565d7ece4 SHA512 6d498bfef7a3fc69784c93ce5799db401993802b54554be04da5f4872a2965066a0e93a0a98d2d7de07c4bcf1ecef7b11f6360b6bac392e9ad34875656d49db0
+DIST nvc-1.14.1.tar.gz 2033076 BLAKE2B 8c17d08aaf01d8dec293530b9e28e37261396e846433a574532e7d1c68bd13424879e25a00e186e46523fa73b9e731a624088312c8133b3fa0d5626f42681d8b SHA512 13648a8c9b952a64c0ec053f733f359ee138a0a3f02ac160ed8d7ac2ace0db658a9092695229a0fe6d1bebf7bae4386969b6b2883e720ae6f4e8ab8098960cc2
 EBUILD nvc-1.14.0.ebuild 1989 BLAKE2B 52b36e73ef7f7e616714f4e852cda26d02005b3fd59bb726d89bf69f736a09b08b2d16c40210de8797a97645e02003d1511b661901565f62c3205d3a8949c4bd SHA512 f665a5a4772312a09fd2419e9adf4a0f367b021889e81dd9a1fb890846eed337867b278cc12c9fe5c07846a5d21150cafff51b882b7466587b7679604911724d
+EBUILD nvc-1.14.1.ebuild 1989 BLAKE2B 52b36e73ef7f7e616714f4e852cda26d02005b3fd59bb726d89bf69f736a09b08b2d16c40210de8797a97645e02003d1511b661901565f62c3205d3a8949c4bd SHA512 f665a5a4772312a09fd2419e9adf4a0f367b021889e81dd9a1fb890846eed337867b278cc12c9fe5c07846a5d21150cafff51b882b7466587b7679604911724d
 MISC metadata.xml 1226 BLAKE2B 128540883638e57fd16a3e1620a49cc6dae4db49fcb5b6863007f9cda3af8801a2f47d0c2bf400727fde7e88b22c9c06b5c8cc8c073e150ad3046f8b37b098a2 SHA512 20ac4aa36dd420487eefa409de17ea2351f4225bf864d82817e201fc452dd9efc4ced9e6e7bae35eaf4901eb66d25da6463c82f7802a698336c5e8be6a053286
diff --git a/sci-electronics/nvc/nvc-1.14.1.ebuild b/sci-electronics/nvc/nvc-1.14.1.ebuild
new file mode 100644
index 000000000000..326d6b674270
--- /dev/null
+++ b/sci-electronics/nvc/nvc-1.14.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..18} )
+
+inherit autotools bash-completion-r1 llvm-r1
+
+DESCRIPTION="NVC is a VHDL compiler and simulator"
+HOMEPAGE="https://www.nickg.me.uk/nvc/
+	https://github.com/nickg/nvc/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nickg/nvc.git"
+
+	NVC_SOURCEDIR="${WORKDIR}/${PN}-${PV}"
+else
+	SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}"
+fi
+
+NVC_BUILDDIR="${NVC_SOURCEDIR}_BuildDir"
+S="${NVC_BUILDDIR}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug llvm"
+RESTRICT="test"         # Some tests fail.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/zstd:=
+	dev-libs/capstone:=
+	dev-libs/elfutils
+	dev-libs/icu:=
+	dev-libs/libffi:=
+	dev-libs/libxml2:=
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
+	llvm? (
+		$(llvm_gen_dep '
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-libs/check
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch" )
+
+# Special libraries for NVC.
+QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so"
+
+pkg_setup() {
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	mkdir -p "${S}" || die
+}
+
+src_prepare() {
+	pushd "${NVC_SOURCEDIR}" >/dev/null || die
+
+	default
+	eautoreconf
+
+	popd >/dev/null || die
+}
+
+src_configure() {
+	# Needs "bison" and "flex" exactly.
+	unset LEX
+	unset YACC
+
+	local ECONF_SOURCE="${NVC_SOURCEDIR}"
+	local -a myconf=(
+		--enable-vital
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable debug)
+		$(use_enable llvm)
+	)
+	econf "${myconf[@]}"
+
+	export V=1          # Verbose compilation and install.
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	PATH="${S}/bin:${PATH}" emake check-TESTS
+}
+
+src_install() {
+	default
+
+	mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die
+	dostrip -x "/usr/$(get_libdir)/nvc"
+}