gentoo auto-resync : 01:01:2025 - 06:30:57

5 files changed, 12 insertions, 342 deletions

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 7fc040f45fa6..684fb5187630 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,8 +1,3 @@
-AUX cppcheck-2.13.0-32-bit-tests.patch 1241 BLAKE2B 8af4df092aa481b380e161b1d45f25000fb001e2d5172cbaa3a0ffe3257e811e495d446e8418d97e809011d067d03efacca9e1ee9c264ee45a56b0ade50e1340 SHA512 e916ff0bb845332626711447eb0af33927d26bc92f55ab9b378377e84a0ac3ddc504555f5862b97caa555f1a99bf2469610641bd9f7a5e268543fc649b1481fc
-DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae0a7c84ff68a1ea7985abbc65fc7ea6e319111ed6a968f4f93f3b682ce46447ba1e3b1fccd96535497f3fd190b913 SHA512 35f266cd247860aa0a0d84862faf4561f4efea096e641a01ebc3b1e4cea14c91c75773344da5bd3d48101c11ee7841b46f24419a9583e65bd242d0219a1ca418
 DIST cppcheck-2.14.2.tar.gz 3723248 BLAKE2B 551c783e13202f496b705602566799848b611bcc706f7a803c9ff530b3405db9e0b5294d2ce51ef5a4889e08c5b9d54c15d40a7ec6f4dc59333a7b6ed24b1f02 SHA512 8e90fa87845a083a4de66ec86edf707184a2293eb346fd79bfcafb73f93db049216472fcb2ab802ce529680f9708261ba3c26675c6fd9637e1dc83903bc44c4b
-DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
-EBUILD cppcheck-2.13.0.ebuild 3174 BLAKE2B 8809bee9b0fcebb6e56de883dcd1db2102ddd50789d1992445416eaf76d22a0dbb5c8583e32b5e88cef51425c9769b11b7a69399e8b8bfbb1a3c33a2a2caa342 SHA512 d0ec553281ddcdca9d2750fe2d786f87336847ab4dcbd31f259a98d4014163e85a2ed145a85b2795362f8ce8d1dea9510aaf5eae51c5d201f778fcd77bd71757
-EBUILD cppcheck-2.14.2.ebuild 3074 BLAKE2B 874d2138c9fc44188534446001d90289d50dbe4f4ebb0a8493297ccd059598e3e3987ee48af205a6df6443ae5ef6e2f77ed095c5c7ded2bc62b27929852e0bb6 SHA512 737a79d3b631b756478dbf33b40cd905075a6329d9f38b30ae7a947216d4a80a3c882fb2fd40974b777ce1d37794f473722ac686b81d301aafb09e85fb6c43c0
-EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0
+EBUILD cppcheck-2.14.2-r1.ebuild 2859 BLAKE2B 8ce5603c20534d73a2ae5134e9dcba0239332e20f0fa0fa23ad803ebefc1251eff2d8eb663b1090942104fc2d94cb7419f86732d26407aefbd5cd0e15ff097f7 SHA512 3e52198c062f802f0962921e2a8fd42c62778898a5d131702dbcc8dd9df5199200d8962cd600d93e13e82af657ee7f169bfeb191ab93c61501e5a07068435e06
 MISC metadata.xml 439 BLAKE2B 2fae88ef8445fcf382e68d615e7f9c4b41ce119785b9d3a8a3685297270043da641c8e454e40de2507f6e17a91846488e4dcb1a72e09e241287fb06cc531ae82 SHA512 64084c96f491b6f966d9b20409ec43a530280c01e29c2c531a43bb40d62263c7fb9e1c55079cddfe2eb437ffa6ca431a9dce758a5932c549bd8cb5850a8769c8
diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
deleted file mode 100644
index 447003eceefe..000000000000
--- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="https://github.com/danmar/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 qt6 htmlreport pcre test threads"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	charts? ( gui )
-	qt6? ( gui )
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/tinyxml2:=
-	pcre? ( dev-libs/libpcre )
-	gui? (
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,network]
-			dev-qt/qttools:6[assistant,linguist]
-			charts? ( dev-qt/qtcharts:6 )
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qthelp:5
-			dev-qt/qtnetwork:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			charts? ( dev-qt/qtcharts:5 )
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	htmlreport? (
-		$(python_gen_cond_dep '
-			dev-python/pygments[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	gui? (
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
-	test? (
-		gui? (
-			!qt6? (
-				dev-qt/qttest:5
-			)
-		)
-		htmlreport? (
-			$(python_gen_cond_dep '
-				dev-python/pytest[${PYTHON_USEDEP}]
-				dev-python/pygments[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.13.0-32-bit-tests.patch
-)
-
-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'|" htmlreport/test_htmlreport.py || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFILESDIR="${EPREFIX}"/usr/share/${PF}/
-		-DBUILD_MANPAGE=ON
-
-		-DHAVE_RULES=$(usex pcre)
-
-		-DBUILD_GUI=$(usex gui)
-		-DUSE_QT6=$(usex qt6)
-		-DWITH_QCHART=$(usex charts)
-
-		-DBUILD_TESTS=$(usex test)
-		-DREGISTER_TESTS=$(usex test)
-		-DREGISTER_GUI_TESTS=$(usex test)
-
-		-DUSE_MATCHCOMPILER=ON
-		-DUSE_LIBCXX=OFF
-
-		-DUSE_THREADS=$(usex threads)
-		-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
-	use htmlreport && epytest htmlreport
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PF}/cfg
-	doins cfg/*.cfg
-
-	if use gui ; then
-		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-
-	use htmlreport && 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
-}
diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2-r1.ebuild
index efdc1693e60a..efa3e8721f9d 100644
--- a/dev-util/cppcheck/cppcheck-2.14.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.14.2-r1.ebuild
@@ -13,36 +13,25 @@ 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"
-IUSE="charts gui qt6 htmlreport pcre test"
+IUSE="charts gui htmlreport pcre test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	charts? ( gui )
-	qt6? ( gui )
 "
 RESTRICT="!test? ( test )"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/tinyxml2:=
-	pcre? ( dev-libs/libpcre )
 	gui? (
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,network]
-			dev-qt/qttools:6[assistant,linguist]
-			charts? ( dev-qt/qtcharts:6 )
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qthelp:5
-			dev-qt/qtnetwork:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			charts? ( dev-qt/qtcharts:5 )
-		)
+		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="
-	${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	htmlreport? (
 		$(python_gen_cond_dep '
@@ -55,17 +44,8 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
-	gui? (
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
+	gui? ( dev-qt/qttools:6[assistant,linguist] )
 	test? (
-		gui? (
-			!qt6? (
-				dev-qt/qttest:5
-			)
-		)
 		htmlreport? (
 			$(python_gen_cond_dep '
 				dev-python/pytest[${PYTHON_USEDEP}]
@@ -95,7 +75,7 @@ src_configure() {
 		-DHAVE_RULES=$(usex pcre)
 
 		-DBUILD_GUI=$(usex gui)
-		-DUSE_QT6=$(usex qt6)
+		-DUSE_QT6=$(usex gui)
 		-DWITH_QCHART=$(usex charts)
 
 		-DBUILD_TESTS=$(usex test)
diff --git a/dev-util/cppcheck/cppcheck-2.9.ebuild b/dev-util/cppcheck/cppcheck-2.9.ebuild
deleted file mode 100644
index c6d68f1cc701..000000000000
--- a/dev-util/cppcheck/cppcheck-2.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Python is used both for htmlreport (USE flag) but also for various
-# helper scripts in /usr/share/cppcheck.
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 cmake
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="htmlreport pcre qt5 test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/tinyxml2:=
-	htmlreport? (
-		$(python_gen_cond_dep '
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	htmlreport? ( ${DISTUTILS_DEPS} )
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		htmlreport? (
-			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]' python3_{10..11})
-		)
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	rm htmlreport/test_htmlreport.py || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_RULES="$(usex pcre)"
-		-DBUILD_GUI="$(usex qt5)"
-		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
-		-DENABLE_OSS_FUZZ=OFF
-		-DUSE_BUNDLED_TINYXML2=OFF
-		-DBUILD_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-python_install() {
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_python_install
-		popd || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	python_fix_shebang "${ED}"/usr/share/cppcheck/*
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PN}/cfg
-	doins cfg/*.cfg
-
-	if use qt5 ; then
-		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-
-	distutils-r1_src_install
-
-	dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch b/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch
deleted file mode 100644
index a31a014f5968..000000000000
--- a/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/935368
-https://github.com/danmar/cppcheck/commit/9118d330d387e73a20e1bc46c65387306afa0895
-
-From 9118d330d387e73a20e1bc46c65387306afa0895 Mon Sep 17 00:00:00 2001
-From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
-Date: Sat, 23 Dec 2023 20:59:59 +0100
-Subject: [PATCH] Fix test failure on 32bit platform (#5803)
-
---- a/test/testother.cpp
-+++ b/test/testother.cpp
-@@ -2173,6 +2173,7 @@ class TestOther : public TestFixture {
-               "}\n");
-         ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 't' should be passed by const reference.\n", errout.str());
- 
-+        Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
-         check("struct S {\n" // #12138
-               "    union {\n"
-               "        int a = 0;\n"
-@@ -2189,7 +2190,7 @@ class TestOther : public TestFixture {
-               "};\n"
-               "void f(S s) {\n"
-               "    if (s.x > s.y) {}\n"
--              "}\n");
-+              "}\n", /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0);
-         ASSERT_EQUALS("", errout.str());
- 
-         check("struct S { std::list<int> l; };\n" // #12147
-