gentoo resync : 20.03.2022

5 files changed, 2 insertions, 212 deletions

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 45c3bd53f019..e4830d0b94e9 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,8 +1,3 @@
-AUX cppcheck-2.4.1-limits.patch 317 BLAKE2B a85978e5c6f5cdadcb8603719075f6982a739a4e8549f7cec1b64113889329a5bc75c321317797d8aceb6f12165c774bebcc5bd64724cbe07e78240eaecb1345 SHA512 dd56acfc19031cb380c8d0b04989f0a8aae5c9c47b9c22c3212cd0fa633455b87982ec9317fe05adf210f34c04e4edbbea0e64a751339d3dd3522705328cadcd
-DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
-DIST cppcheck-2.6.2.tar.gz 3880239 BLAKE2B 63abba752ed0e4bef1bf7be4eb3f1a0dfcd1bab286db41e7fd787969674f59354f1c2a0b4477bb1d0cc7ca71306bc6a3375cebade1c60416a21010f7b313d20c SHA512 f1b1b0d6d46712147984bf907519eaaef04b41f02979d371d836aa8668fbdaa0f18b503a76d809abcedf9a0e7b7666be910714ca411d289aa921d0204585f47f
 DIST cppcheck-2.6.3.tar.gz 3880340 BLAKE2B ef83538a0aa867dd0c0bd6165b41921335256ed0372a4990ad85151ab5e87a79bde7958be43887f07a4bbf372b9992339b75ddeae7ed8ea767b83c028dfc56db SHA512 e59b4b4659c2b4fa2c16dcb548f7ee3027555dddc289ef8b54fe186af0396b6f7caa23d91bf1142ece62908b56fe9f5ba013191817322815681994093310fb37
-EBUILD cppcheck-2.4.1.ebuild 1789 BLAKE2B 3b2c61a7535c3684982f22d10b64c44f64c2b96f2319df386c5899f21a3efe7710f59b7ddf4cb2301cd9b36674bb11de84fd89e4319ff866fd151ddbb8e632b7 SHA512 5e19b9ab507695836ebbdbccec1b7e94704b2c3c9eb7814a60fc40698216efeb6ed35439178092cf29ed5da12289e9ffdc01c8e3455d4b224119bdc69b187994
-EBUILD cppcheck-2.6.2.ebuild 2005 BLAKE2B 2650d77fa1c3e1cdae45fa0b2bb9ed12b215c382ff92a59cc465638205ed0965f3648d28f1a841aa84945d91ad4330c5c1179dc57039ae18054ac6ad134d78d1 SHA512 ee111591fcb301230fef997797ae32a68d7a39c4bfade5f09485f44cb1a0238f464e39c696d39ef44b5198c26406d1153280f83dfaabf5e88ea7d0d8571fff4c
-EBUILD cppcheck-2.6.3.ebuild 2003 BLAKE2B d2e1a6ec96b9593ba57f203bfc1e7120593a3c2231fc5ea4f2ef7570581335f53b35c939638354b3f074398e869351e71e444d7f1a173de4d95d81a98604498c SHA512 1748350126e311d9c40f13283851dcff348ebb25a242e168c57f1a5da29ab48179c2bdf20505d46f0e338dea3dd5dbe607c2eaa6d90095cc17a514957187ccc5
+EBUILD cppcheck-2.6.3.ebuild 2001 BLAKE2B 6229fe97e051df083a748c36d2bc606060763d9a678008c87ebcb523acc24d76a822d14e2eee7dc81d9d6e1cb10940f6a684be8fec93b01f81e49a1dcf898763 SHA512 6203a4611ce362e6e115f97c19865a24d0bc9e019e739bd01fb211b4b7457ac6a0720ff5d2b28a4accf2297767659b80e5f0d617551baea81a0ba730b6ef8869
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
deleted file mode 100644
index d7892faae5db..000000000000
--- a/dev-util/cppcheck/cppcheck-2.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5 +z3"
-
-RDEPEND="
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	z3? ( sci-mathematics/z3 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-limits.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_RULES="$(usex pcre)"
-		-DBUILD_GUI="$(usex qt5)"
-		-DUSE_Z3="$(usex z3)"
-		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
-		-DENABLE_OSS_FUZZ=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}" \
-		FILESDIR="${EPREFIX}/usr/share/${PN}/"
-
-	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
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_install
-		popd || die
-		find "${D}" -name "*.egg-info" -delete || die
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-
-	dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/cppcheck-2.6.2.ebuild b/dev-util/cppcheck/cppcheck-2.6.2.ebuild
deleted file mode 100644
index a934618d7ad9..000000000000
--- a/dev-util/cppcheck/cppcheck-2.6.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=manual
-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 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="htmlreport pcre qt5 test +z3"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	htmlreport? (
-		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
-		dev-qt/qtprintsupport:5
-	)
-	z3? ( sci-mathematics/z3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		htmlreport? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_RULES="$(usex pcre)"
-		-DBUILD_GUI="$(usex qt5)"
-		-DUSE_Z3="$(usex z3)"
-		-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
-}
-
-src_test() {
-	cmake_src_test
-
-	# TODO: Needs some hackery to find the right binary
-	#if use htmlreport ; then
-	#	distutils-r1_src_test
-	#fi
-}
-
-python_test() {
-	pushd htmlreport || die
-	eunittest
-	popd || die
-}
-
-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
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_install
-		popd || die
-	fi
-
-	dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/cppcheck-2.6.3.ebuild b/dev-util/cppcheck/cppcheck-2.6.3.ebuild
index facf4c87067f..4240391f2657 100644
--- a/dev-util/cppcheck/cppcheck-2.6.3.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5 test +z3"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch b/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
deleted file mode 100644
index 8b8db9cb8a42..000000000000
--- a/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
-index d59789236..3604d517f 100644
---- a/lib/symboldatabase.cpp
-+++ b/lib/symboldatabase.cpp
-@@ -35,6 +35,7 @@
- #include <cassert>
- #include <climits>
- #include <cstring>
-+#include <limits>
- #include <iomanip>
- #include <iostream>
- #include <unordered_map>