From 31455c5f3eed8c3563bc6efdfc9401014d1f3991 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sping@gentoo.org>
Date: Sat, 3 Apr 2021 22:48:08 +0200
Subject: [PATCH] dev-util/cppcheck: Fix compilation and resolve ${EROOT} for
 EAPI 7

Closes: https://bugs.gentoo.org/778467
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-3.0.18, Repoman-3.0.3
---
 dev-util/cppcheck/cppcheck-2.2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index 3246f31de032..8d38b79fecec 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,8 +41,8 @@ src_configure() {
 		-DHAVE_RULES="$(usex pcre)"
 		-DBUILD_GUI="$(usex qt5)"
 		-DUSE_Z3="$(usex z3)"
-		-DFILESDIR="${EROOT}/usr/share/${PN}/"
-		-ENABLE_OSS_FUZZ=OFF
+		-DFILESDIR="${ROOT%/}${EPREFIX}/usr/share/${PN}/"
+		-DENABLE_OSS_FUZZ=OFF
 	)
 	cmake_src_configure
 }
@@ -60,7 +60,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="${ROOT%/}${EPREFIX}/usr/share/${PN}/"
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
-- 
2.31.1