From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 07A32158086 for ; Mon, 22 Nov 2021 15:52:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AA33E0794; Mon, 22 Nov 2021 15:52:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA80AE0794 for ; Mon, 22 Nov 2021 15:52:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0A45342D03 for ; Mon, 22 Nov 2021 15:52:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4913B1D6 for ; Mon, 22 Nov 2021 15:52:15 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1637596325.1d184b86516d7c090deb45394e4e2d0b643de16c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cppcheck/cppcheck-2.4.1.ebuild X-VCS-Directories: dev-util/cppcheck/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1d184b86516d7c090deb45394e4e2d0b643de16c X-VCS-Branch: master Date: Mon, 22 Nov 2021 15:52:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f0213e8b-037f-4814-a03f-14ef80557383 X-Archives-Hash: 3a745392ca94460c2f9cd82c05eb32d1 commit: 1d184b86516d7c090deb45394e4e2d0b643de16c Author: David Seifert gentoo org> AuthorDate: Mon Nov 22 15:52:05 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Nov 22 15:52:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d184b86 dev-util/cppcheck: [QA] EROOT -> EPREFIX Signed-off-by: David Seifert gentoo.org> dev-util/cppcheck/cppcheck-2.4.1.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild index 9130c7d88401..74102100a3f2 100644 --- a/dev-util/cppcheck/cppcheck-2.4.1.ebuild +++ b/dev-util/cppcheck/cppcheck-2.4.1.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -inherit distutils-r1 toolchain-funcs cmake + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 cmake DESCRIPTION="Static analyzer of C/C++ code" HOMEPAGE="https://github.com/danmar/cppcheck" @@ -30,6 +31,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig z3? ( sci-mathematics/z3 ) " + PATCHES=( "${FILESDIR}"/${PN}-2.4.1-limits.patch ) @@ -39,12 +41,11 @@ src_prepare() { } src_configure() { - local mycmakeargs=( -DHAVE_RULES="$(usex pcre)" -DBUILD_GUI="$(usex qt5)" -DUSE_Z3="$(usex z3)" - -DFILESDIR="${EROOT}/usr/share/${PN}/" + -DFILESDIR="${EPREFIX}/usr/share/${PN}/" -DENABLE_OSS_FUZZ=OFF ) cmake_src_configure @@ -63,7 +64,7 @@ src_compile() { src_install() { # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760 emake install DESTDIR="${ED}" \ - FILESDIR="${EROOT}/usr/share/${PN}/" + FILESDIR="${EPREFIX}/usr/share/${PN}/" insinto "/usr/share/${PN}/cfg" doins cfg/*.cfg @@ -75,7 +76,7 @@ src_install() { pushd htmlreport || die distutils-r1_src_install popd || die - find "${D}" -name "*.egg-info" -delete + find "${D}" -name "*.egg-info" -delete || die else rm "${ED}/usr/bin/cppcheck-htmlreport" || die fi