commit: a7cb73a1dbd527098483cc531c13f2de2810b35e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 21:50:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 09:07:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7cb73a1
dev-util/cppcheck: drop 2.9, 2.13.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/cppcheck/Manifest | 2 -
dev-util/cppcheck/cppcheck-2.13.0.ebuild | 157 ---------------------
dev-util/cppcheck/cppcheck-2.9.ebuild | 120 ----------------
.../files/cppcheck-2.13.0-32-bit-tests.patch | 28 ----
4 files changed, 307 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index d98c5f9a5b71..74f6d2df37ff 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1 @@
-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
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.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-git...@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
-
