Publish srcux candidate 0000000571-20261005-201336

3 files changed, 143 insertions, 2 deletions

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 75b0c4e13398..ef7cebedde7e 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,3 +2,4 @@ DIST cppcheck-2.17.1.tar.gz 3872633 BLAKE2B 8a2404b2610386166c1e8d3bfe8b3405834b
 DIST cppcheck-2.18.2.tar.gz 3930679 BLAKE2B caa9be7676f50b7931f2e2aae3bb8cb94460fe183c3cd626659939a3d79f1b4f69e5163479500abac6cab966065b1084e9d6ad391e9b89375fc33ad430d93a2c SHA512 fe562aa23a38313c925bde4b647a7783340aa2cfe2b355d2c2779a86c8ed5d490164e40d17bc398579303167a59b8812aa9185468be3516dc564169941afb5c1
 DIST cppcheck-2.19.1.tar.gz 3984524 BLAKE2B d1bcf8ff33b34dcd96b56ac604c168ce3346d673bdc7a9d496b8bdde527331e828732b48afd37b3bd0b79949b362e23c9bbae35112496dd853cbd840895f7e7e SHA512 490b80795b24586e443b80ea8044c9a4dce53a59d35c5cf5ad360b3163ebe5b8474f17e4cf8b168fab9fb284eadfde22ccc5b3f8e66c8153ebcffaa7708f0084
 DIST cppcheck-2.20.0.tar.gz 4007393 BLAKE2B 99610e7d3e1dc88e71526c8ac1f850710d2e9a687a95be8dd04d13a9660c330c8ea211af389e36217691a75813fbbaac24cc04fabf46602a507978ec0e202a82 SHA512 072179cf35f91708735a85966517b5788554c32443558865af64d782cfc082acd073219ab511f5e2f98bd8f1dc8c0d02447452a00f15524eda2ca20be6af8108
+DIST cppcheck-2.21.0.tar.gz 4029561 BLAKE2B dee259b9b513a11f8b81b20fcea9cb44bd85c8d17a9ad6d8c914674099d63b6fd5b5400f95602c2eefead18e2ecf68025f6d2184aacad8aeb4bfed964fc403f0 SHA512 0e08c72975243569985e9098519d7cca8e84a8687a496e406234e1be1f3e71c039e4d21437d00866244bd0a8a60dd30fc70756125bf0347ce3b2d809b0a9b4f9
diff --git a/dev-util/cppcheck/cppcheck-2.20.0.ebuild b/dev-util/cppcheck/cppcheck-2.20.0.ebuild
index e724bdeed216..f28d1253f1a7 100644
--- a/dev-util/cppcheck/cppcheck-2.20.0.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.20.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="charts gui pcre test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -106,7 +106,7 @@ src_test() {
 		# https://github.com/danmar/cppcheck/pull/5462
 		TestFileLister
 	)
-	cmake_src_test
+	cmake_src_test -j1
 
 	rm test/cli/other_test.py || die
 	rm test/cli/lookup_test.py || die
diff --git a/dev-util/cppcheck/cppcheck-2.21.0.ebuild b/dev-util/cppcheck/cppcheck-2.21.0.ebuild
new file mode 100644
index 000000000000..e832a8e68353
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.21.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/cppcheck-opensource/cppcheck"
+SRC_URI="https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="charts gui pcre test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	charts? ( gui )
+	test? ( pcre )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/tinyxml2:=
+	gui? (
+		dev-qt/qtbase:6[gui,widgets,network]
+		charts? ( dev-qt/qtcharts:6 )
+	)
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${COMMON_DEPEND}
+	gui? ( dev-qt/qttools:6[assistant,linguist] )
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/patchelf
+	virtual/pkgconfig
+	gui? ( dev-qt/qttools:6[assistant,linguist] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Modify to an existing docbook location
+	sed -i \
+		-e "s|set(DB2MAN .*|set(DB2MAN \"${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl\")|" \
+		man/CMakeLists.txt || die
+
+	# Make tests use cppcheck built in build dir.
+	sed -i -e "s|CPPCHECK_BIN = .*|CPPCHECK_BIN = '${BUILD_DIR}/bin/cppcheck'|" \
+		test/tools/htmlreport/test_htmlreport.py || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFILESDIR="${EPREFIX}"/usr/share/${PF}/
+		-DBUILD_CLI=ON
+		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_MANPAGE=ON
+
+		-DHAVE_RULES=$(usex pcre)
+
+		-DBUILD_GUI=$(usex gui)
+		-DWITH_QCHART=$(usex charts)
+
+		-DBUILD_TESTING=$(usex test)
+		-DREGISTER_TESTS=$(usex test)
+		-DREGISTER_GUI_TESTS=$(usex test)
+
+		-DUSE_MATCHCOMPILER=ON
+
+		-DDISABLE_DMAKE=ON
+		-DUSE_BOOST=OFF
+		-DUSE_BUNDLED_TINYXML2=OFF
+
+		# Yes, this is necessary to use the correct python version.
+		# bug #826602
+		-DPython_EXECUTABLE=${PYTHON}
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	cmake_build man
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# Out of source builds breaks test TestFileLister
+		# https://github.com/danmar/cppcheck/pull/5462
+		TestFileLister
+	)
+	cmake_src_test
+
+	rm test/cli/other_test.py || die
+	rm test/cli/lookup_test.py || die
+	rm test/cli/premium_test.py || die
+	PYTHONPATH="${S}/tools" TEST_CPPCHECK_EXE_LOOKUP_PATH="${BUILD_DIR}/bin/" epytest test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If shared libs are built, they need to be patched
+	# patchelf --set-rpath '$ORIGIN' "${BUILD_DIR}"/lib/*.so || die
+	# dolib.so "${BUILD_DIR}"/lib/*.so
+
+	insinto /usr/share/${PF}/cfg
+	doins cfg/*.cfg
+
+	if use gui ; then
+		patchelf --set-rpath '$ORIGIN' "${WORKDIR}/${P}_build/bin/${PN}-gui" || die
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+
+	python_doscript htmlreport/cppcheck-htmlreport
+	python_fix_shebang "${ED}"/usr/share/${PF}
+	python_optimize "${ED}"/usr/share/${PF}
+
+	dodoc -r tools/triage
+	doman "${BUILD_DIR}"/man/cppcheck.1
+}