gentoo resync : 24.12.2018

8 files changed, 105 insertions, 156 deletions

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index f197b24f4912..64ee02976017 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,9 +1,10 @@
-AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
-AUX cppcheck-1.84-char-signedness.patch 4839 BLAKE2B 8ee84544dace4ac35a80b7356d44e30a5f9b5a738d2904728f2c9decd744a6230345a0bfd9515c682f7d577c5b100f7d33a43a9e77bf2ae464ce502bc9e7d305 SHA512 2203665c60e4fa121b18af90f390a8810b772d6b608a1d0d4804d475ca21de02b10f6f543443e81e0cc49980d9f71323800c3cb2256064c4519c93b6c8d366f8
+AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899
+AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
-DIST cppcheck-1.84.tar.gz 2051244 BLAKE2B 8e4b4c71da969addec6d1cb2919c39625054797ae730c85555695e872f87295c20e4564db2eadf536a762ca018882285d5d329f9a5789608e14ef17f1069753d SHA512 7f971f9097db6d2fee7483634afc697bddff499a7b09c4be0bfdc3f8e502d47202a8d4f4fc1a330d0fb1d34a7772065b96419b4b4f4f1467b997e62459304526
+DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a5863561df66e46e319b9246ed14e3c5d4d73511db6e70275de4f4510866d7e1888b0fd6b49e5b01fc4f08d081119b36c SHA512 cc984c751d87150839782e96b3762dbf918d9e3687562eabaff6473e48e3254995dd3bffe8605842f867d7ad76845ca2248a53bbd54b5c367281db8a1c1c7fad
+DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
-EBUILD cppcheck-1.84-r1.ebuild 2382 BLAKE2B fe170aa38fbef3ad33d396ea74b33edbe7101bad9b7f2dda1779068411045b9f1eb7601fa0b9e1f89207d4162bc8a75d3bfde9a66714e1a5569abe80eeeb7683 SHA512 fd3bf998cc319a7aa2472f8214417ef2c3f1af6e0edc43763acad0bb8f89b02b3be8d484c532a0472d328925c32163a4d4f60b15c6c598e2cd2d40260604f95f
-EBUILD cppcheck-1.84.ebuild 2326 BLAKE2B dede88da8145164fa86946ab19e69aa4a8ab284df9dbe888922330084a383cb3c4f5700e0c7c6d2fb3dffefc154a965d79e5c2a6b02db2a8e021bd2b7ea04808 SHA512 57307a88b07ec02b0b2344f43873547cb9931bee8e6ac987310d9c79bc008f88b04c7e9491dc3b9c828f275427f5f51074ef81bfa4d0e835b5500a0c0913ae30
-EBUILD cppcheck-9999.ebuild 2271 BLAKE2B 8e254632480771a07b58d0c28026801dc20e9ddd864c44a6fb956b86cd2745793f2cb84ee3aed63b72605f6c9a47f91bd8fc94a4d59614873adc7842f3601af1 SHA512 dd14de11d4138d6bc4113c025d033215ceb7a3958f289f113eebf82a86c793fb59901e856748c8da49ae5b8639fe5a09d6bfd938c955ef85484f54c6962af6a5
-MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
+EBUILD cppcheck-1.85.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-1.86.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-9999.ebuild 2276 BLAKE2B fae2869f37c66579e943a6d9ba6cf76fe8cee7fff3da469b0a56b2bcd04d36fe1fbc9054642f2e3cfd5f2a4cba6de8fc9fe1000bacd327e27d8909fe1396d2b9 SHA512 71f7c9dc55fda1199755f4826c4d070abb52b4e9f7bb090fbb9801dfaf37d3c54fb480e32e674b67dc6089a4a6a0f58df00cd26c2447f57787fee3f912fe92d3
+MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
diff --git a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild b/dev-util/cppcheck/cppcheck-1.85.ebuild
index 82a4ecbe4b9c..87931e60c7b6 100644
--- a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.85.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -31,42 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.84-char-signedness.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
 )
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/cppcheck-1.84.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index 2fb1dddad4b9..87931e60c7b6 100644
--- a/dev-util/cppcheck/cppcheck-1.84.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -13,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
@@ -31,39 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 38d6d57ecc24..9d9977873aa9 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3
+inherit distutils-r1 git-r3 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
-EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
+EGIT_REPO_URI="https://github.com/danmar/cppcheck"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -31,39 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
index 9d8558466595..67e4ac65a410 100644
--- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
+++ b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
@@ -1,15 +1,15 @@
---- cppcheck-9999/gui/gui.pro
-+++ cppcheck-9999/gui/gui.pro
+--- a/gui/gui.pro
++++ b/gui/gui.pro
 @@ -19,6 +19,7 @@
      DEFINES += CPPCHECKLIB_IMPORT
  }
  LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
  
  DESTDIR = .
  RCC_DIR = temp
---- cppcheck-9999/tools/dmake.cpp
-+++ cppcheck-9999/tools/dmake.cpp
+--- a/tools/dmake.cpp
++++ b/tools/dmake.cpp
 @@ -123,7 +123,6 @@
  
      std::vector<std::string> extfiles;
@@ -39,8 +39,8 @@
  
      fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
      fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
---- cppcheck-9999/externals/externals.pri
-+++ cppcheck-9999/externals/externals.pri
+--- a/externals/externals.pri
++++ b/externals/externals.pri
 @@ -1,8 +1,5 @@
 -INCLUDEPATH += $${PWD}/simplecpp \

 -               $${PWD}/tinyxml

diff --git a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
deleted file mode 100644
index ee1b136c9a9a..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001
-From: Alexander Mai <amai@users.sf.net>
-Date: Thu, 28 Jun 2018 22:16:18 +0200
-Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline
- different results depending whether char is signed or unsigned on compile
- time
-
----
- test/testsymboldatabase.cpp | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
-index 0dafd2730..28473e8e9 100644
---- a/test/testsymboldatabase.cpp
-+++ b/test/testsymboldatabase.cpp
-@@ -26,6 +26,7 @@
- #include "tokenlist.h"
- #include "utils.h"
- 
-+#include <climits>
- #include <cstddef>
- #include <list>
- #include <map>
-@@ -5065,6 +5066,7 @@ private:
-                       "    long               get(long x) { return x; }\n"
-                       "    long long          get(long long x) { return x; }\n"
-                       "    unsigned char      get(unsigned char x) { return x; }\n"
-+                      "    signed char        get(signed char x) { return x; }\n"
-                       "    unsigned short     get(unsigned short x) { return x; }\n"
-                       "    unsigned int       get(unsigned int x) { return x; }\n"
-                       "    unsigned long      get(unsigned long x) { return x; }\n"
-@@ -5079,12 +5081,13 @@ private:
-                       "        long               v5  = 1;      v5  = get(get(v5));\n"
-                       "        long long          v6  = 1;      v6  = get(get(v6));\n"
-                       "        unsigned char      v7  = '1';    v7  = get(get(v7));\n"
--                      "        unsigned short     v8  = 1;      v8  = get(get(v8));\n"
--                      "        unsigned int       v9  = 1;      v9  = get(get(v9));\n"
--                      "        unsigned long      v10 = 1;      v10 = get(get(v10));\n"
--                      "        unsigned long long v11 = 1;      v11 = get(get(v11));\n"
--                      "        E1                 v12 = e1;     v12 = get(get(v12));\n"
--                      "        E2                 v13 = E2::e2; v13 = get(get(v13));\n"
-+                      "        signed char        v8  = '1';    v8  = get(get(v8));\n"
-+                      "        unsigned short     v9  = 1;      v9  = get(get(v9));\n"
-+                      "        unsigned int       v10 = 1;      v10 = get(get(v10));\n"
-+                      "        unsigned long      v11 = 1;      v11 = get(get(v11));\n"
-+                      "        unsigned long long v12 = 1;      v12 = get(get(v12));\n"
-+                      "        E1                 v13 = e1;     v13 = get(get(v13));\n"
-+                      "        E2                 v14 = E2::e2; v14 = get(get(v14));\n"
-                       "    }\n"
-                       "};");
- 
-@@ -5094,7 +5097,10 @@ private:
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 4);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v2 ) ) ;");
--        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        if (std::numeric_limits<char>::is_signed)
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        else
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v3 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 6);
-@@ -5112,7 +5118,10 @@ private:
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
--        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 11);
-+        if (std::numeric_limits<char>::is_signed)
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        else
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12);
-@@ -5128,6 +5137,9 @@ private:
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v13 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 16);
-+
-+        f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v14 ) ) ;");
-+        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 17);
-     }
- 
-     void findFunction20() { // # 8280
--- 
-2.16.4
-
diff --git a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
new file mode 100644
index 000000000000..84e892827125
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
@@ -0,0 +1,24 @@
+--- a/tools/dmake.cpp
++++ b/tools/dmake.cpp
+@@ -363,10 +363,10 @@
+     fout << ".PHONY: run-dmake tags\n\n";
+     fout << "\n###### Targets\n\n";
+     fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "all:\tcppcheck testrunner\n\n";
+     fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "test:\tall\n";
+     fout << "\t./testrunner\n\n";
+     fout << "check:\tall\n";
+@@ -380,7 +380,7 @@
+     fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
+     fout << "\tg++ -Iexternals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
+     fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "clean:\n";
+     fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 3bf4b78228a1..7556003fff3e 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
 	</use>