From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Oct 2017 18:53:29 +0100
Subject: reinit the tree, so we can have metadata

---
 dev-util/cppcheck/Manifest                         |  11 +++
 dev-util/cppcheck/cppcheck-1.77.ebuild             | 104 +++++++++++++++++++++
 dev-util/cppcheck/cppcheck-1.78.ebuild             | 104 +++++++++++++++++++++
 dev-util/cppcheck/cppcheck-1.79.ebuild             | 104 +++++++++++++++++++++
 dev-util/cppcheck/cppcheck-9999.ebuild             | 104 +++++++++++++++++++++
 .../cppcheck/files/cppcheck-1.75-tinyxml2.patch    |  55 +++++++++++
 dev-util/cppcheck/metadata.xml                     |  14 +++
 7 files changed, 496 insertions(+)
 create mode 100644 dev-util/cppcheck/Manifest
 create mode 100644 dev-util/cppcheck/cppcheck-1.77.ebuild
 create mode 100644 dev-util/cppcheck/cppcheck-1.78.ebuild
 create mode 100644 dev-util/cppcheck/cppcheck-1.79.ebuild
 create mode 100644 dev-util/cppcheck/cppcheck-9999.ebuild
 create mode 100644 dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
 create mode 100644 dev-util/cppcheck/metadata.xml

(limited to 'dev-util/cppcheck')

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
new file mode 100644
index 000000000000..f25ff81d884e
--- /dev/null
+++ b/dev-util/cppcheck/Manifest
@@ -0,0 +1,11 @@
+AUX cppcheck-1.75-tinyxml2.patch 2294 SHA256 309309d7af8046e7841c0de02404f804aa09015dfcc6e58c9e8edd48f3fdcf74 SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07 WHIRLPOOL 53b8d1b13861f16ab0bc7aa50591a12e8882f190e7917e15931cd88375540cd868b5aec7b79eebbdc1f5f25e187f6bb808e458b019014e8c6edc50ad58864388
+DIST cppcheck-1.77.tar.bz2 1188453 SHA256 1980ffe5c9c24bb6dea24514d42be3aa49d6ba7cc26c448b3543611fe8ba2619 SHA512 df8dddf7758c342d45b3393246e07eaa11a53dca19e8a0d09de04f12ea6232538941328d9ca9ac52eb425871fd1c49d55c77e6e38b40772b6f856fd1e9e99779 WHIRLPOOL 9f7842eba0f53a999993dbd23d09c10e5bd3dcca5ecbb0689e4ded8c7529d84fd939a57ce9cd267cdd21b2d79aeb6c07d672983ccb52be0fcc0b28ca80a31b59
+DIST cppcheck-1.78.tar.bz2 1201959 SHA256 e42696f7d6321b98cb479ad9728d051effe543b26aca8102428f60b9850786b1 SHA512 598556e9d657a3a77ff889cb6647291160017f7f9322326771416ff59d44126ce47c39767657b863cdb8a1b46d7c83bb337ec2fe0574500b37e99c33377b5dd8 WHIRLPOOL 2087ad837353d01bca828af940c427909a3e556e97e46d1822e0f2f527619c87b15d1a7f647992dd46eb3a2ef1eb4fb86344db31d7a01fb6f8a9070dfeecef96
+DIST cppcheck-1.79.tar.bz2 1206623 SHA256 2b85b693de54f15048f1841e7aef74574f99da6270d2182baba78514fa27f06d SHA512 766649b685d60b057752a49eda46f5bb42681c01c32169e83f85ea6f5d3302b572a2d484c1cee1380fd304489d5a32f83eb59a72ceefb1b787031e84bf3a2676 WHIRLPOOL dee33b68c8b924a68b90cbabcd9da6489003fb9f4fc0e2f5d411c82404c666b0c034ca33cc8e4043e4b1d18622158d1dd3de3b8ebd83d52ee01cd3513a39ad26
+EBUILD cppcheck-1.77.ebuild 2194 SHA256 dc079d8e141b85ef9a9360e2553901dfcf95a985f57e3c1683c84951f004a31f SHA512 a1e30c8344d63a466b1d344136b0d553dfaf701bb9e40358ed7b5e64fa8bdff69e79980815e458e8de36843d886a4632b1ccf8f8543a5a6cbca519a718dada6b WHIRLPOOL 48c5ab158e84034bcf7ad3fd0cdcc312766757927beaaa521a1f656050c41b702f3b00c2fd683bca8db6f2b81144eb32cd7d47ec13dc4921abaf31b90d327646
+EBUILD cppcheck-1.78.ebuild 2196 SHA256 a3887ce663e5b77249f8d34abd37535a9c6b5bca9d525a95aaa8780ece35e533 SHA512 4cf2adf39208578543b665f772c144a17698d3633bdf9b019b4b6896dc7703965bf887921dc43100bf5300328673a23daf0c555cc0059d3753527768da529759 WHIRLPOOL db40b7c9e9fa964c601934c54b53e29340d74f9b761bdf1b61d4bc62e7abaa6257da0caa2258f3505af6347beaf95548c5f828d5c53b5370031692845a093ccc
+EBUILD cppcheck-1.79.ebuild 2203 SHA256 4134be2a42148e120b57102bea02556e13e866700b4a7de33068f13fcef68e53 SHA512 f4af48b4d3adb8ae4c8efecc32f29ed249f12da9d8f13ee70700277af3ff33b4bf9387bcd96ca9d4523d03d4cdcdbf729418ee75df90a541a5687435a3d1d0f6 WHIRLPOOL 67fb465ca5c8b23d070599f1516c21e6e0072b5aadc575b726f5e7c7409fdad173468812fce1187a0674aa359ffa998741e50eea17276ef3a74c0b262544ee5c
+EBUILD cppcheck-9999.ebuild 2196 SHA256 b5b9ab11751b82408531d1391190be14ceec633cdbf3a8c4c942965f9daead38 SHA512 5dacbd45a70f2190492a0d3adb92753ac768579ffa2ca9fea5dac74bcde3e3c889465deb3f46248b7a870fdc9dc5853ee721975e2b5f1a4c136564a5d450b9ac WHIRLPOOL c94929ed0c9e18b8e6aca4c8f15e9c28b03aa4ef483a313076d11f58b0dcc0d3e2053fbaa15a8ce1c5d720812708eef9a43e64e7cd59d95334ca8dfc75851cf1
+MISC ChangeLog 5582 SHA256 507ae46ed2c6e07dcd0fead0ffd82651a50b36f2cf2296e5c978178f5696964c SHA512 d16a214991a86f76f11edeed8378c0208c0117cb20a62ce351a63b64ebee778c41f81be7fb021c7c557c197c93f16e727801af05322f0177ce554d1225a1fc13 WHIRLPOOL 24efef1ac7031d3782ab487fa8853463b96112cec85577723edd534aeeec9f77f61c139b184b6e9c81b96212c4f9b4d11b08dc1cc64dfd574a337999bbaf7ad3
+MISC ChangeLog-2015 10993 SHA256 012074ab8ab80f8cce91ceb12de1dcaabf7edc2cd76e3a8ee612c74c7a2f1f05 SHA512 72ce4bdd77ffe3a9bdaf89dbbef5d763fbf43d3ec694bfe8758a5cbfe2bcef11256b8975aa60631145993d032e572135bbe9595d15682329ca222a45412e01c8 WHIRLPOOL ea46d1646fa95ac52158453e7798d9c61dd3c9cdc92a791611a0636b8ced3cf57ed58959e0fe50f40bf064694299045449796b7bf114e807c68a7bddca363c2c
+MISC metadata.xml 397 SHA256 3f1be41c16f6248d0484bb9322303a683ed6fec8e6472bb133353f4cb14d41db SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e WHIRLPOOL c5e8fd8dba7da098ebb271a41fdf9ff42840e5868479d8cf49ce5e3ea3c1adf6ff5491594ddc4d21e97afcebe6fd441a08f31ee926f2c75f6b7f36b7fe267a57
diff --git a/dev-util/cppcheck/cppcheck-1.77.ebuild b/dev-util/cppcheck/cppcheck-1.77.ebuild
new file mode 100644
index 000000000000..f4ad03600e8f
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.77.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	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() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	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"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-1.78.ebuild b/dev-util/cppcheck/cppcheck-1.78.ebuild
new file mode 100644
index 000000000000..fcdd220729f1
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.78.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	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() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	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"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-1.79.ebuild b/dev-util/cppcheck/cppcheck-1.79.ebuild
new file mode 100644
index 000000000000..04500dfcb915
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.79.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	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() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	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"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
new file mode 100644
index 000000000000..529f5e6fadc3
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic git-r3
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	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
+
+	epatch_user
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	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"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
new file mode 100644
index 000000000000..9d8558466595
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
@@ -0,0 +1,55 @@
+--- cppcheck-9999/gui/gui.pro
++++ cppcheck-9999/gui/gui.pro
+@@ -19,6 +19,7 @@
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+ LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-9999/tools/dmake.cpp
++++ cppcheck-9999/tools/dmake.cpp
+@@ -123,7 +123,6 @@
+ 
+     std::vector<std::string> extfiles;
+     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
+-    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
+ 
+     std::vector<std::string> clifiles;
+     getCppFiles(clifiles, "cli/", false);
+@@ -172,7 +171,6 @@
+         std::ofstream fout1("test/testfiles.pri");
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "\n\nSOURCES += ";
+             for (unsigned int i = 0; i < testfiles.size(); ++i) {
+                 const std::string filename(testfiles[i].substr(5));
+@@ -337,9 +335,9 @@
+          << "endif\n\n";
+ 
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp");
+ 
+     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
+@@ -1,8 +1,5 @@
+-INCLUDEPATH += $${PWD}/simplecpp \
+-               $${PWD}/tinyxml
++INCLUDEPATH += $${PWD}/simplecpp
+ 
+-HEADERS += $${PWD}/simplecpp/simplecpp.h \
+-           $${PWD}/tinyxml/tinyxml2.h
++HEADERS += $${PWD}/simplecpp/simplecpp.h
+ 
+-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
+-           $${PWD}/tinyxml/tinyxml2.cpp
++SOURCES += $${PWD}/simplecpp/simplecpp.cpp
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
new file mode 100644
index 000000000000..3bf4b78228a1
--- /dev/null
+++ b/dev-util/cppcheck/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<use>
+		<flag name="htmlreport">install cppcheck-htmlreport</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">cppcheck</remote-id>
+	</upstream>
+</pkgmetadata>
-- 
cgit v1.2.3