Adding metadata

14 files changed, 287 insertions, 44 deletions

diff --git a/sci-electronics/circt/Manifest b/sci-electronics/circt/Manifest
index 1db13456ec78..a6451d4d2248 100644
--- a/sci-electronics/circt/Manifest
+++ b/sci-electronics/circt/Manifest
@@ -1,3 +1,4 @@
-DIST circt-1.151.0.tar.gz 10160863 BLAKE2B a67b8ad8a8cb30f2e21c172b5b385dc6e38e3f494a366533c41cd24fef7a16410322a4928cd75c7f7366f17442d5fc3e6e86c25db553da14214d5c8de0a45942 SHA512 9d428e203dd19da448a7ae9bb5a39c45e4ce3b6d2483238683c84caa999853616292aa5bed89d3fef7bfbacc5d27bb04c85e2763eccd1d57471758d0a47cb39e
 DIST circt-1.153.1.tar.gz 10200306 BLAKE2B 3414e2a07b21acbe4e578a7c00da5a03978e68e705be7a0ba56dd265e7d324364ef6e9f7493dfc064772547c35511c1b0169645042c4c4ee8b4c209dc8d632ba SHA512 84baa86a7f4eb07f918e5358674b2e4789a9f951dc350653c4c142cec74ac123c9f349aa904ea4891c6d2fd986f43cfa220c73d9849e7641497c08e4d29414ea
+DIST circt-1.159.0.tar.gz 10427509 BLAKE2B ff903f05871cae394ef142a01a7a819a372303b469679fd3bce595289fe283b45a6f9a951ac816ff3bfecf2c5601e9c28627c543fbc43d45b65483378d32709a SHA512 3eeaa89474d68035b63f846ba0b00411975306b99584d6f77299590cb6ada55a66d26b3386bb75181063b28e36a502cb60c02f07079ae9d7dd10ac83e996c930
 DIST llvm-project-040a641988f6ed6f4fab250706ca2b620c1de2d8.tar.gz 275008647 BLAKE2B 6ae8c8f832a34d1cf2721cd133cf674bab7efd2d742bca198a312682504160d0a0b76c03b557436d5a4600570c4fbf5f8c21a20e7db3b6f45a2f63d4e8246a89 SHA512 719c03e7bd215f40bbedac5492d472a5b5686cef8add383a7b8e8e2044d3732e3323d5c24dc458a788a1fe0c329d8d1fcff988ec37cd91571875f8cdfc92a24c
+DIST llvm-project-6279700538792da0c5a08e17babfe9b6e824c69f.tar.gz 278511037 BLAKE2B 0bce8fff015c046341f601cff8b90fd6194f439651ffb13fd0321de9413a1ad45852267a2e442975be70bdef10709c44f8a21aa19f67aada26e1733c8a7b2b57 SHA512 a654ff3bcb383332846664e001a476c2479dc3f464da6a3335853807eb44868731ad3be7db363d55ecb78de6bf5ddd19b41054852e6ad46b5124045cacb968f2
diff --git a/sci-electronics/circt/circt-1.151.0.ebuild b/sci-electronics/circt/circt-1.159.0.ebuild
index 551acd400787..1c3c1adeceb8 100644
--- a/sci-electronics/circt/circt-1.151.0.ebuild
+++ b/sci-electronics/circt/circt-1.159.0.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
-MY_PV="${PV//./\/}"
-MY_LLVM_PV="040a641988f6ed6f4fab250706ca2b620c1de2d8"
+MY_LLVM_PV="6279700538792da0c5a08e17babfe9b6e824c69f"
 CMAKE_BUILD_TYPE="Release"
 PYTHON_COMPAT=( python3_{13..14} )
 inherit cmake python-r1
 
-DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
+DESCRIPTION="Circuit IR Compilers and Tools"
 HOMEPAGE="
 	https://circt.llvm.org
 	https://github.com/llvm/circt
@@ -35,7 +34,7 @@ fi
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="0"
 IUSE="test"
-REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
@@ -49,13 +48,9 @@ RDEPEND="
 	sys-libs/ncurses:0=
 "
 
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=(
 	"${S_LLVM}/llvm/llvm-LICENSE.TXT"
@@ -63,6 +58,12 @@ DOCS=(
 	"${S_CIRCT}/circt-LICENSE"
 )
 
+src_prepare() {
+	sed -i -e "s|^set(CIRCT_VERSION \"unknown git version\")|set(CIRCT_VERSION \"firtool-${PV}\")|" \
+		"${S_CIRCT}"/cmake/modules/GenVersionFile.cmake || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	python_setup
 
@@ -74,15 +75,7 @@ src_configure() {
 		-D BUILD_SHARED_LIBS=OFF
 		-D LLVM_STATIC_LINK_CXX_STDLIB=ON
 		-D LLVM_ENABLE_ASSERTIONS=ON
-		# Link zstd deterministically rather than letting cmake autodetect
-		# it, so the app-arch/zstd RDEPEND always matches.  See
-		# https://bugs.gentoo.org/977877
 		-D LLVM_ENABLE_ZSTD=FORCE_ON
-		# We do not link Z3 into circt, so the SMT/LEC passes and the z3
-		# integration tests cannot work.  Disable z3 discovery entirely so
-		# those tests are skipped instead of detected-but-broken.  Without
-		# this, a z3 binary on PATH enables the lit 'z3' feature and tests
-		# like circt-synth/functional-reduction-z3.mlir run and fail.
 		-D Z3_DISABLE=ON
 		-D LLVM_BUILD_EXAMPLES=OFF
 		-D LLVM_ENABLE_BINDINGS=OFF
@@ -96,16 +89,6 @@ src_configure() {
 }
 
 src_test() {
-	# Only exercise CIRCT's own suites.  check-mlir runs upstream MLIR
-	# mlir-runner JIT tests that dlopen the MLIR runtime shared libraries,
-	# which our static CMAKE_SKIP_RPATH build does not expose, and which are
-	# out of scope for packaging CIRCT.  See https://bugs.gentoo.org/977441
-	#
-	# The circt-tblgen RTG instruction tests include mlir tablegen headers
-	# through circt's llvm submodule path (llvm/mlir/include), which is empty
-	# in the release tarball because we build against a separate llvm-project
-	# checkout.  Point it at the real tree so those tests find
-	# mlir/IR/OpBase.td instead of failing.
 	if [[ ! -L ${S_CIRCT}/llvm ]]; then
 		rmdir "${S_CIRCT}/llvm" || die
 		ln -s "${S_LLVM}" "${S_CIRCT}/llvm" || die
@@ -122,12 +105,6 @@ src_install() {
 	mv "${S_CIRCT}/LICENSE" "${S_CIRCT}/circt-LICENSE" || die
 	einstalldocs
 
-	# Several tools are only built when their optional frontend is present:
-	# circt-verilog and circt-verilog-lsp-server need the slang
-	# SystemVerilog parser, circt-bmc and circt-lec need Z3.  When those are
-	# unavailable the upstream build simply omits the binaries, so install
-	# whatever got built instead of aborting.  See
-	# https://bugs.gentoo.org/977442
 	local tool
 	local tools=(
 		arcilator circt-as circt-bmc circt-cocotb-driver.py circt-dis
diff --git a/sci-electronics/cocotb/Manifest b/sci-electronics/cocotb/Manifest
index 59d85b067781..793855210192 100644
--- a/sci-electronics/cocotb/Manifest
+++ b/sci-electronics/cocotb/Manifest
@@ -1,2 +1,3 @@
 DIST cocotb-1.9.2.tar.gz 300696 BLAKE2B 6905ad2ff978083c1d6ae39df8c31e322ac68c1c8eb289a5bf50d027f99ae7dc4b40748b328fdabc543cbf7f8ca16d214809adba23054021d973016a13bc7d56 SHA512 1a151a63ed9ec3868b6d9165ee6e6144b52fbbc9b83e78027cc9a1d907142148e2643fd8880f8fd6b1155ce76cba65ecf1f851c6a72e45ece7c3c9921ab5fe83
 DIST cocotb-2.0.1.tar.gz 318250 BLAKE2B 1152130d3da5d8238f85367f6122594bb8ad6bb6595a42285e5eef7e52afe57568418fd9bfe528990fc3d55fb3303741d388514df885c7f3a01358c81055fa95 SHA512 db420c53cf1432123b3ca9ee3daddfdd43a3ec2918962a5a4cc465701456e6678edc1e3b08571f7cdb3e7530910915d6ab2d5850f01833abd359e5ef5b62f0c7
+DIST cocotb-2.1.0.tar.gz 372215 BLAKE2B 0a9d6b894dfbfeca6086b86c5b0888a14e0a4dae9af797faa998c8fc217d41f3c38d5706b5a0c6f83e7a10b6c24e11e94617e3b52626eb427cb3f76e3ee5a9d4 SHA512 18d135c98756ed593f37f096385c6fc5f85d54f221918583394b577de9a1aa05d28a7626cecc6cf684c2bd2675576f85eb6e323289014bfd3a1f6ac3121df207
diff --git a/sci-electronics/cocotb/cocotb-2.1.0.ebuild b/sci-electronics/cocotb/cocotb-2.1.0.ebuild
new file mode 100644
index 000000000000..e75d81d9af11
--- /dev/null
+++ b/sci-electronics/cocotb/cocotb-2.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python-based chip (RTL) verification"
+HOMEPAGE="https://www.cocotb.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# Tests requires many eda tools, and can't work inside network sandbox
+RESTRICT=test
+
+RDEPEND="
+	dev-python/find-libpython[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# upstream resolves the version through setuptools-git-versioning
+	sed -i -e "s/^dynamic = \\[\"version\"\\]$/version = \"${PV}\"/" pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# parallel build is broken
+	MAKEOPTS="-j1" distutils-r1_src_compile
+}
+
+python_test() {
+	epytest
+}
+
+pkg_postinst() {
+	elog "cocotb requires a HDL simulator to function correctly."
+	elog "You may want to install one of the following packages:"
+	elog "  sci-electronics/icarus-verilog - Verilog simulator"
+	elog "  sci-electronics/ghdl - VHDL simulator"
+	elog "  sci-electronics/verilator - Fast Verilog simulator"
+	elog ""
+	elog "Commercial EDA tools are also supported, including:"
+	elog "  - Synopsys VCS"
+	elog "  - Cadence Xcelium/Incisive"
+	elog "  - Siemens EDA Modelsim/Questa"
+	elog "  - Aldec Riviera-PRO"
+	elog "Note: These commercial tools need to be obtained from their respective vendors"
+}
diff --git a/sci-electronics/kactus2/Manifest b/sci-electronics/kactus2/Manifest
index a0a5861960d6..14da496ec4cd 100644
--- a/sci-electronics/kactus2/Manifest
+++ b/sci-electronics/kactus2/Manifest
@@ -1 +1,2 @@
 DIST kactus2-3.14.1.tar.gz 18584477 BLAKE2B 3094950fa699a5f60115dda2a82f25f49f26801eb1bc5dc5021bc12023c8f3851e6729f660eea2488d9480481751596088b6da68d1f4c898461dc363077455fc SHA512 09c93c25af2d501054d0e2cc470cc155b7e56e9288526e40941c7f765413985f90039c720d06412c3c01a65f0168bfa8dcd7e42079eaea5446cd16ab24e278e3
+DIST kactus2-3.14.2.tar.gz 18595416 BLAKE2B e3fb8f04c6f52cbc7814b03956e6f9e6fa7012371ac9e77108f4a17aa8edc18d14d8a102de9a182dd3934721f8081c418fa51e9ef493fac14398e36fba67460f SHA512 041d2ca1f4960e626b46cc4af212bdcb91b15e666c3b2259c8b56776d411063d7e5b99fde9069ef53d49dcdd1579ca8ccea8d63f044990fde4a1aee9d4308c9c
diff --git a/sci-electronics/kactus2/kactus2-3.14.2.ebuild b/sci-electronics/kactus2/kactus2-3.14.2.ebuild
new file mode 100644
index 000000000000..06ce4e93487d
--- /dev/null
+++ b/sci-electronics/kactus2/kactus2-3.14.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit flag-o-matic python-r1 qmake-utils xdg
+
+DESCRIPTION="A open source IP-XACT-based tool"
+HOMEPAGE="
+	https://research.tuni.fi/system-on-chip/tools/
+	https://github.com/kactus2/kactus2dev
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}dev-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml]
+	dev-qt/qtsvg:6
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-lang/swig
+	dev-qt/qttools:6[linguist,qdoc]
+"
+
+src_prepare() {
+	default
+	# Fix QA pre-stripped warnings, bug 781674
+	find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die
+	# Fix bug 854081
+	python_setup
+	sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
+}
+
+src_configure() {
+	default
+	# The in-tree libKactusAPI and libIPXACTmodels must take link precedence
+	# over any copy from an already installed kactus2, otherwise the qmake
+	# LIBS order searches /usr/lib64 before ./executable and the binary links
+	# against the old ABI, failing with undefined references to freshly added
+	# symbols.  LFLAGS precede LIBS, so a build-dir -L here wins.
+	append-ldflags "-L${S}/executable"
+	# Fix bug 854075
+	# Fix bug 854078
+	eqmake6 Kactus2_Solution.pro
+}
+
+src_compile() {
+	default
+	python_compile() {
+		cp -TR "${S}/" "${BUILD_DIR}/" || die
+		# Fix bug 854081
+		python_setup
+		sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die
+		export PYTHON_C_FLAGS="$(python_get_CFLAGS)"
+		export PYTHON_LIBS="$(python_get_LIBS)"
+		pushd "PythonAPI" || die
+		eqmake6 PREFIX="$(python_get_library_path)"
+		emake
+		rm _pythonAPI.so || die
+		cp libPythonAPI.so.1.0.0 _pythonAPI.so || die
+		popd
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	# Can't use default, set INSTALL_ROOT and workaround parallel install bug
+	emake -j1 INSTALL_ROOT="${D}" install
+	python_install() {
+		pushd "PythonAPI" || die
+		python_domodule _pythonAPI.so
+		python_domodule pythonAPI.py
+		popd
+	}
+	python_foreach_impl run_in_build_dir python_install
+}
diff --git a/sci-electronics/sby/Manifest b/sci-electronics/sby/Manifest
index 99480d241c5c..0f7b4d7d7605 100644
--- a/sci-electronics/sby/Manifest
+++ b/sci-electronics/sby/Manifest
@@ -1,2 +1,2 @@
-DIST sby-0.67.tar.gz 179885 BLAKE2B 9923229ccc3b2d1ef6a8fcc3718a5a3f64b933fdc5e2b00214ddc50dc0f34868dba348c05e5f9f3180211b77f0e557b23fee668670b40ed1c3812073d2173ace SHA512 ec99ef583a4023e33d9d2f25badb3cd9b4746060ade63bff3e3b96d47e6e446a32583827bbed6f49dc165cb079a638f26866033c60382c89c4a9461b67b2a232
 DIST sby-0.68.tar.gz 180250 BLAKE2B 689db9c88ee67ded13f2c18b24d4d402239caf5489e831ce2a51393bcfa2d258cdb9d879acd6cae01b6f6cc757c5eae8d2df04dffdd41e07220f298d49fc334e SHA512 a981994197ebf04220497df6f391bf35aa78ff226831770d5bf6df31487bf74752d7adbbc406d3904d9b8be947e6cc1d9d30be64349309c2470bf602199fc58f
+DIST sby-0.69.tar.gz 180502 BLAKE2B 6a36aec49da3cf10aa215f7e3fe759832112424532492e61d9f269ff2ab0ea75fc5e97ce3bbe6b2ba464cbbb6603a4ee21bd9693bb06b57e6b6d4af36c9d457f SHA512 f634c64b2856ee2b9f6023c7639c0e3f86166a5e3e4688a7ae785e14077cf886d5ad75d8e4713447e8ccb294aff98ce16f456c47f776db4f8ae80ae6fd9f8b6c
diff --git a/sci-electronics/sby/sby-0.67.ebuild b/sci-electronics/sby/sby-0.69.ebuild
index 814fed187c54..814fed187c54 100644
--- a/sci-electronics/sby/sby-0.67.ebuild
+++ b/sci-electronics/sby/sby-0.69.ebuild
diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest
index 8313cd3ee4b4..9bf4fa087928 100644
--- a/sci-electronics/verilator/Manifest
+++ b/sci-electronics/verilator/Manifest
@@ -1 +1,2 @@
 DIST verilator-5.050.tar.gz 6339575 BLAKE2B 3d1acac34e5ff5285c1d238d8c0df1722b72105f492accf39a7e4b5d7c0957da691c63ee0c9016a18f5bb0613edde788aa933c9e3fa2685de9d257d429f6562d SHA512 d4e29997d3a13daff62801203683e933ae1ae0537ac19cd28aebf3553f677546165a736e98f509553c1ddaad68110ad176ef234b5c00a3cb8f988253dbbf9b39
+DIST verilator-5.052.tar.gz 7061822 BLAKE2B a863a06180eecab4387d91a58d7bf7291da0a98891298cf89baa5b177488cc032388770e4ab673d68cdfc2f5f18e6b192c5280c9081f8742a4232f863283a7cb SHA512 0b99da49c05150d3a24f5d2072d410b80cc44ac796bc4227b4cc5766a9b4f77cb63338cc8374036de516b63f42586dcfd8c0d98feefb3ca1878c5b7e84b715b3
diff --git a/sci-electronics/verilator/verilator-5.052-r1.ebuild b/sci-electronics/verilator/verilator-5.052-r1.ebuild
new file mode 100644
index 000000000000..9a0d9e586871
--- /dev/null
+++ b/sci-electronics/verilator/verilator-5.052-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
+HOMEPAGE="
+	https://verilator.org
+	https://github.com/verilator/verilator
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( Artistic-2 LGPL-3 )"
+SLOT="0"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	app-arch/lz4:=
+	virtual/zlib:=
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		dev-build/cmake
+		dev-debug/gdb
+		$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+	)
+"
+
+src_prepare() {
+	default
+	# https://bugs.gentoo.org/785151 and https://bugs.gentoo.org/975566
+	sed -i "s/\<python3\>/${EPYTHON}/g" "${S}"/configure.ac || die
+	find . -name "Makefile" -exec sed -i "s/\<python3\>/${EPYTHON}/g" {} + || die
+	find test_regress -type f -exec sed -i "s/\<python3\>/${EPYTHON}/g" {} + || die
+	python_fix_shebang .
+	# https://bugs.gentoo.org/887917 and https://bugs.gentoo.org/975970
+	# Upstream hard-codes -O3 / -Og / -ggdb / -gz / -Os / -O0, overriding user
+	# CFLAGS/CXXFLAGS.
+	local v
+	for v in CFG_CXXFLAGS_OPT CFG_CXXFLAGS_DBG CFG_LDFLAGS_DBG ; do
+		sed -i "/AC_SUBST(${v})/i ${v}=\"\"" "${S}"/configure.ac || die
+	done
+	sed -i -e 's/^OPT_FAST = .*/OPT_FAST =/' \
+		-e 's/^OPT_GLOBAL = .*/OPT_GLOBAL =/' \
+		"${S}"/include/verilated.mk.in || die
+	sed -i -e 's/"OPT_FAST=-O0"/""/g' \
+		-e 's/"OPT_GLOBAL=-O0"/""/g' \
+		-e 's/"-Os" if param\[.benchmark.\] else "-O0"/"" if True else ""/g' \
+		"${S}"/test_regress/driver.py || die
+	find "${S}"/examples -name Makefile_obj -exec sed -i \
+		-e 's/^OPT_FAST = .*/OPT_FAST =/' \
+		-e 's/^OPT_SLOW = .*/OPT_SLOW =/' \
+		-e 's/^OPT_GLOBAL = .*/OPT_GLOBAL =/' {} + || die
+	eautoconf --force
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/887919
+	econf CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	# https://github.com/verilator/verilator/issues/3352
+	export VERILATOR_SRC_VERSION="(Gentoo ${PVR})"
+	default
+}
+
+src_test() {
+	emake test
+}
diff --git a/sci-electronics/verilator/verilator-9999.ebuild b/sci-electronics/verilator/verilator-9999.ebuild
index 77d37f1260f4..40361d155c2a 100644
--- a/sci-electronics/verilator/verilator-9999.ebuild
+++ b/sci-electronics/verilator/verilator-9999.ebuild
@@ -49,10 +49,6 @@ BDEPEND="
 
 src_prepare() {
 	default
-	if [[ ! "${PV}" == "9999" ]] ; then
-		# https://github.com/verilator/verilator/issues/3352
-		sed -i "s/UNKNOWN_REV/(Gentoo ${PVR})/g" "${S}"/src/config_rev || die
-	fi
 	# https://bugs.gentoo.org/785151
 	sed -i "s/python3/${EPYTHON}/g" "${S}"/configure.ac || die
 	find . -name "Makefile" -exec sed -i "s/python3/${EPYTHON}/g" {} + || die
diff --git a/sci-electronics/yosys/Manifest b/sci-electronics/yosys/Manifest
index 8c6e1119b8e9..5224cb00faeb 100644
--- a/sci-electronics/yosys/Manifest
+++ b/sci-electronics/yosys/Manifest
@@ -1,2 +1,2 @@
-DIST yosys-0.67.tar.gz 16180615 BLAKE2B e7528f0bb0c88db972d720d89ddb174166f22e7c063687a2bae88d372be326e0f24b33c1a67d6a1c80a19aee7b0b8486a100eb504ff0e5d8a21bcef684f1d2fe SHA512 3bfc178b4f36c27085da995dbd60f7a62355bec2d3caa85787ca5e65cc8bbd438fa5aab96c7af0f502923324acddcb0336d840ae0fabcfda8c4aaa2e0dd797e0
 DIST yosys-0.68.tar.gz 16312861 BLAKE2B 759d4eedd71269cef6fa5fdf75ab4b356243e2b2cf033a982ff622f946ec0537fcf22c9527e932e05d8fe1952c5662ae6edeca473f1238cb62c9a9ea3ad3cc45 SHA512 8cc38cdcd973f0d1977e4088a825338620576cbdf87b523eda3ee15e221192d87c71c36fbe780e1f757240d131f1ecee7abcffe4a34d2e116e7e8151ecfd2173
+DIST yosys-0.69.tar.gz 16403186 BLAKE2B 5281547a9b1dd3ca95ce576a9b1a613c7f6517a100f01576356dcaa91549690678e6d14bee8136264b17331e7321a76b0bd589d712ffe4ec5097c077331aa30e SHA512 2ce21a3da8fe8a984958e7043e9f5d6d044870b40939a5e33b33fc6ced045587a2300fae3116596d2b9c143d904cacec2f95f0cfa62e35db2d0ad9a55b41ee24
diff --git a/sci-electronics/yosys/files/yosys-0.69-respect-flags.patch b/sci-electronics/yosys/files/yosys-0.69-respect-flags.patch
new file mode 100644
index 000000000000..bd332ca03eaa
--- /dev/null
+++ b/sci-electronics/yosys/files/yosys-0.69-respect-flags.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,8 +99,8 @@
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+ 	set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+-	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -ggdb")
++	set(CMAKE_CXX_FLAGS_RELEASE "")
++	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+ 	set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
+ 	set(CMAKE_CXX_FLAGS_SANITIZE "-O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+ 	if ("${SANITIZE}" MATCHES "memory")
+--- a/cmake/YosysLinkTarget.cmake
++++ b/cmake/YosysLinkTarget.cmake
+@@ -50,6 +50,7 @@
+ 		PREFIX "${YOSYS_PROGRAM_PREFIX}"
+ 		OUTPUT_NAME "${arg_OUTPUT_NAME}"
+ 		RUNTIME_OUTPUT_DIRECTORY ${YOSYS_CMAKE_BINARY_DIR}
++		POSITION_INDEPENDENT_CODE OFF
+ 	)
+ 	if (${arg_INSTALL_IF})
+ 		install(TARGETS ${arg_TARGET} DESTINATION ${YOSYS_INSTALL_BINDIR})
diff --git a/sci-electronics/yosys/yosys-0.67-r1.ebuild b/sci-electronics/yosys/yosys-0.69.ebuild
index 3a1c3d227459..d031d3895595 100644
--- a/sci-electronics/yosys/yosys-0.67-r1.ebuild
+++ b/sci-electronics/yosys/yosys-0.69.ebuild
@@ -41,8 +41,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-	"${FILESDIR}"/${P}-cmake4-compat.patch
+	"${FILESDIR}"/${PN}-0.69-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.67-cmake4-compat.patch
 )
 
 pkg_setup() {