Adding metadata

5 files changed, 122 insertions, 102 deletions

diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 2cb16e74140b..8c9f51d931e0 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,2 +1 @@
-DIST ghdl-5.1.1.tar.gz 7894213 BLAKE2B 5d8c4ca8e0a85c604d9116087c50af83fac2741f607873810e00827b78231240e8d11af6b8cec634a719971cf2064e733fb91c93870487419f40c47ea295c7d0 SHA512 b70051d49b5f4e427b116512ef29589b826308de1b33f2c4f8fd49c50eaeaf6e09be454c8455665b59f8f7b5cb82c9c198a1c29ebf8ca1110e7126f3e10f5567
 DIST ghdl-6.0.0.gh.tar.gz 8056568 BLAKE2B 79897019b648b2e3e4b09529e61c2b2fa928f2f6f6e3683fa7847517c80cadf2ede5cb177aedb449b8d0ccfb34c1858be031e43247d1adf0fd922d895b87a642 SHA512 9e37fd127638e7676811ef2d43f5b08822f05ea16821773051b8497f5504491eef7970295ddf9ff4969c58a78ab9b34af386144d67740fc3cfd1347e6104519d
diff --git a/sci-electronics/ghdl/ghdl-5.1.1.ebuild b/sci-electronics/ghdl/ghdl-5.1.1.ebuild
deleted file mode 100644
index 2455a6774852..000000000000
--- a/sci-electronics/ghdl/ghdl-5.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gcc_14 )
-LLVM_COMPAT=( {19..20} )  # Check configure script for supported LLVM versions.
-
-inherit ada edo llvm-r1 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 +static-libs"
-
-# The LLVM backend requires static libraries to work, see bug: https://bugs.gentoo.org/938171
-REQUIRED_USE="${ADA_REQUIRED_USE} llvm? ( static-libs )"
-
-RDEPEND="
-	${ADA_DEPS}
-	llvm? (
-		$(llvm_gen_dep '
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
-
-pkg_setup() {
-	ada_pkg_setup
-
-	use llvm && llvm-r1_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
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-}
diff --git a/sci-electronics/nvc/Manifest b/sci-electronics/nvc/Manifest
index a9b2b3ac2030..691eb8dc94a1 100644
--- a/sci-electronics/nvc/Manifest
+++ b/sci-electronics/nvc/Manifest
@@ -1,2 +1,3 @@
 DIST nvc-1.21.1.tar.gz 2447603 BLAKE2B eae837f58bce6923864f9705462963d72540d0ad1d6425e3b5fe20be8f8308f61823fc5effd319e78a85ffefd0ec29f649e13a2b4de2add46b87a34bf2556e45 SHA512 4f0b1003da7674bc241638bc9a7366f0afd5081dce25fb5589f6e6daab8f90f0350be1cab35877a8e97b6d01d9882eda8cf82d726353c15380863329e5047808
 DIST nvc-1.22.0.tar.gz 2485983 BLAKE2B 142804e5eb076f82ce8a8a8ad55675cd25e6b56e74646ab8b783cdf9416baf81bf8637747b522a9002e33db15eece2bb21a2b1bc7ef3c48e62a85c3b38335703 SHA512 cfd3f93b093663e3eb3f805d7526c3519a5912e079afeadb6bccd1b59db4fbf9abb026b95981379eb1f74415e0daa21548be7a9be61b2767c95bf092e4c8cd70
+DIST nvc-1.22.1.tar.gz 2490447 BLAKE2B 6873631d490b6f16b24eeb723e0109a8a61765ff43bf96965cc1b4d9f2beaede870c03a577d33b5b4540de88889839cde47f11bb28af37510ffa9617159a9b4f SHA512 c5cbe702113d09c401ba3419e6a7c2357eef784ac68ce16d3d7ba31c72add25a4affce275bfe9ae03511e2305e536bb3e10e517bda9c9ff216bc06e5ff33fdef
diff --git a/sci-electronics/nvc/nvc-1.21.1-r1.ebuild b/sci-electronics/nvc/nvc-1.21.1-r1.ebuild
index ce03f6267a7c..178af3d1318f 100644
--- a/sci-electronics/nvc/nvc-1.21.1-r1.ebuild
+++ b/sci-electronics/nvc/nvc-1.21.1-r1.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 
 	NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}"
 fi
diff --git a/sci-electronics/nvc/nvc-1.22.1.ebuild b/sci-electronics/nvc/nvc-1.22.1.ebuild
new file mode 100644
index 000000000000..ce03f6267a7c
--- /dev/null
+++ b/sci-electronics/nvc/nvc-1.22.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {20..22} )
+
+inherit autotools llvm-r2 shell-completion
+
+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"
+
+	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="llvm test"
+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:=
+	virtual/zlib:=
+	llvm? (
+		$(llvm_gen_dep '
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-libs/check
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		dev-libs/check
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch"
+	"${FILESDIR}/nvc-1.21.1-fpurge.patch"
+)
+
+# Special libraries for NVC.
+QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so"
+
+pkg_setup() {
+	if use llvm ; then
+		llvm-r2_pkg_setup
+	fi
+}
+
+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 llvm)
+	)
+	econf "${myconf[@]}"
+
+	export V="1"  # Verbose compilation and install.
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	local -x ASAN_OPTIONS="detect_leaks=0"
+	local -x PATH="${S}/bin:${PATH}"
+	nonfatal emake -j1 check-TESTS
+}
+
+src_install() {
+	default
+	mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die
+	dostrip -x "/usr/$(get_libdir)/nvc"
+}