From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 22 Nov 2017 20:00:16 +0000 (+0100)
Subject: dev-util/cppcheck: Switch to EAPI 6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ce8381097ae89c5795e482a429fc4b8943c7e5f3;p=gentoo.git

dev-util/cppcheck: Switch to EAPI 6

Package-Manager: Portage-2.3.16, Repoman-2.3.6
---

diff --git a/dev-util/cppcheck/cppcheck-1.81.ebuild b/dev-util/cppcheck/cppcheck-1.81.ebuild
index 765ecfadc61a..c1c281e82e29 100644
--- a/dev-util/cppcheck/cppcheck-1.81.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.81.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit distutils-r1 eutils flag-o-matic qmake-utils toolchain-funcs
+inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -28,17 +28,17 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+
 src_prepare() {
+	default
 	append-cxxflags -std=c++0x
 
 	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
 	tc-export CXX
 	emake dmake
 	./dmake || die
-
-	default
 }
 
 src_configure() {