Version bump by Christian Strahl (bug 548682).

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 197 insertions, 17 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index e32d4a7f1fe2..43ca87750a4f 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.63 2015/04/08 17:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.64 2015/05/20 12:32:46 xmw Exp $
+
+*cppcheck-1.69 (20 May 2015)
+
+  20 May 2015; Michael Weber <xmw@gentoo.org> +cppcheck-1.69.ebuild,
+  +files/cppcheck-1.69-c++0x.patch, +files/cppcheck-1.69-tinyxml2.patch,
+  cppcheck-1.68.ebuild:
+  Version bump by Christian Strahl (bug 548682).
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> cppcheck-1.63-r1.ebuild,
   cppcheck-1.67.ebuild, cppcheck-1.68.ebuild:
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 52800c9438a6..4410cc5931f8 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -3,30 +3,22 @@ Hash: SHA256
 
 AUX cppcheck-1.65-c++0x.patch 172 SHA256 2b0256f2c31c6484da31fe1c40dd2c83bd48542b26bbeb99e79cc01f514ed12a SHA512 d04371d8919a0ce2448153de4a8438c8e2064b3353682d7499ab6222a7e66411ec85e6ed22640e3b4c0cb6d7f628bd5fa1b368c153e3d00e4e8ad90a88c0990a WHIRLPOOL 643c65f3f94da39bc9872ed6bfdad015631c3baa46e4b1e16668ac9a3ff5fcde48b550492644714274611d10ecb981b5979517343a50da185477e79fe2b86213
 AUX cppcheck-1.66-tinyxml2.patch 3375 SHA256 691d1628ee0574c7ab79991da48056cdc9396bc6616b1cf4149e1edcb9ee0b53 SHA512 4de1f9d6a537f3378493782d2893cfaf3345fb86d1f3ad26cfdb7abd0d3f3be5ebc10bfd9450d639565b825eac45669a58e0a8b798eb45a134524445fd6acd5b WHIRLPOOL 1c66b38f745719352c946f9446692dbc094a64a158adf74708b0af2beb554f64c0bc82e56fd7313e0c4f25a75fbd93ff26730a364a9fe15658ba6371f4e03041
+AUX cppcheck-1.69-c++0x.patch 218 SHA256 1ff4b09f93aa3dcb5733af34850c4693be19a5348247362c9a3b071b2f1572b5 SHA512 93371607f36f44a8949ed0f4b1f75266e228e2edd14e265e03c516c62e7299413e3345f1a6a1ca225c5428201c61888987fa5b9928eacf30552d2e5ba84482af WHIRLPOOL d936957322173e3ed1f516aa44e8b0e16c70a5657b0fb18ace1f2f0027d9491c2b1e2e6207ac54a6db27ac47079e971c2b153fc1812b778e13ff5a745e41d046
+AUX cppcheck-1.69-tinyxml2.patch 3582 SHA256 4afc0d31ee73b2fa8dc3c15a4122255cbe46065f14dbb7aa800dcbd8bcca9223 SHA512 2a3aaced906244ad58cbb5f5575db9099609f5e3a66b6eda2118b4b047089d11c3b5dbcd97d6adf3850acf4208d5118cc5c9b5918f0a03eea045e8730c064422 WHIRLPOOL d681e46fdc1a524a5c402dfb1f1f8f5e14a8f696982f09e90faa8a2c64787c91c48be620564df2566ee3d6f0e506e3fb32a861ae346e668ab0ec4051f8adbb45
 DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e
 DIST cppcheck-1.67.tar.bz2 1084926 SHA256 6214c0cf0c11c83ecfae35f8cc8db4fa47389a77360919653d635612cefe2ab9 SHA512 5d1e3e12c818f850b00a8e3b3d79f24fceb0fa806d9100aaa6aed1bbbc86237af2e7dd4567fdfd227281f62d4b5450ac6cbbc6a97e04b380c242c59ddd3609ef WHIRLPOOL 1fc82744a78b76d9bb682fa6f6d8a619164c5cb250eb199ac545d4c147522ab5c4961d635cdea291ccf65f7972a162d394c4e500542b27b8679e262093e86884
 DIST cppcheck-1.68.tar.bz2 1008321 SHA256 add6e5e12b05ca02b356cd0ec7420ae0dcafddeaef183b4dfbdef59c617349b1 SHA512 72c78a17281ad3d771459895ad776c5dceda605edef13886e870cff456db5dc5cbff39d56bdf39788283bf673dd28a13b1602a330b8e33a3042b07cf43f0f011 WHIRLPOOL 16d8d4deeef9ec9fb4415c5941935122ebf3a44159ac8251ebfbfca2aeeb270bccaed5dcf63f6018b3fcf79cad6779af76d0e1cba47e853394794be4942cd622
+DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
 EBUILD cppcheck-1.63-r1.ebuild 1260 SHA256 b32fe8d649730164a21a2454ae44ae60fdf6793bcb7a267c521962a9bb85af1c SHA512 3b1ee6e7d88f2c551eb3952ba5b457287037d902037898fd1caad6f49ca6e774ce32cc1042410eb2037e714adabc16f4c8869015dfd4cb47ef5cee653fc45d08 WHIRLPOOL 86b8f16f309d966dec65374caf87cf5fc713d5a47dbd6d08c2ffed0457c18eb3863f87a04874b214c5dc0542f7962c47dd904fe2f03044a6b774de0c621d3e91
 EBUILD cppcheck-1.67.ebuild 2247 SHA256 8d0e9f10d5aa5ae5255b9fe974c766ea0e6dd323373f86004c6423a5193d208f SHA512 8376b38e1fe8515a1471e1d7bd525c6551ce9ff5bf7241f31ca1c3cfbdedf37f1df1540eb52d37eb1f4894aff30b136e180ba0491d4b54e60dabaf7c2cd0a68c WHIRLPOOL 4cdca7ce42654e1a8c7fd5d334bc180758215b30513deaa835402b9e163c2543ce03dadba5d40a5e8fa055ccea8be463abdeefcc6e648410f85fc936423e9b5c
 EBUILD cppcheck-1.68.ebuild 2264 SHA256 b5dc4ec0c1396ff398b73c12afc17bfee555bf9d7e44e48fc36df329858bac1e SHA512 c5dcef34a55749957d3ba402c8ba744f33a3a9ee306614016b8138f5357ffbc95b19d223b27fbbbff831e33439b1f5b975c6862656aa22cde29603edcce56f8a WHIRLPOOL ee275210a0e2f0314878ce6a71d6351cab2ee2fe8711d4bdea326bfc3460c3971cd9d0d9f85a844783c55fefb926c5aa90fe294811b51e00c954f6cbd441ee63
-MISC ChangeLog 10172 SHA256 c3af27b2210fbf88e7f46097ecdc455f3fad156a31e032476bef6404750d1434 SHA512 0121c9af41a1d4d092beb27940146960ce5f78d118d8450d5ca1df78dcd51983188695ef1c2a0dac35e10b2daa8f12743694ad6e771cbb6ba87b3a3cd9e2d44d WHIRLPOOL a4ee099a3261bc87ba9fe884f04ee190f0c045a1abe43219f0e3c43d76de68fdf1bb9eb6507ac41644cb8448a262aadad8a44e1d956a5d051697305dad36c7d3
+EBUILD cppcheck-1.69.ebuild 2236 SHA256 8c91985d98bd20efdb30df4a3fefb16fdc96a6af942e3235e872890e0fc5cbf0 SHA512 32b4119729d47d5c19577b145be726847851e7d566b572774d9425539f97f11ca1206f9157673515669b09871be5773a40f92ed7487b4a202d0006cf1349f637 WHIRLPOOL ad5ae921bcec4ecaa9f5fbdcc4d0198ddc913e55225bf4dd778735b24fd2514715e361268a541fb749e57c78968c8c69d5ba3f52c1b8031b136f89ca124a4f80
+MISC ChangeLog 10415 SHA256 f4338297a4fceb3864adeaac3981729b457bd08f6f99821d69cf596059c64077 SHA512 443d1f5479297279692ddf7b450a528c35b6e74561ff7dd5a8edebed429b735d13554fe1855901df80b771889bd3f1f08047fe8219812e71c332caa5e2e94b66 WHIRLPOOL d9b6239abe8f23ca2bcdfa3240e0d57693204d5793e6d206b70e4496b37ea5efba0d6df7f1166ddc1011c096ff1b5dbb7c53ccd692515e398c3d8e8a931b98cb
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWtRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcKwP/2+UpYSrH6OpB/a4fIp3z9Tw
-j/V32hBaEAEO59OXJpocjYGoxGr2ERoAJNnhXLzVYSRSzdsohfvwr3uqK2TcahOX
-sXEGoa5XBjrVXelHaPr8GMlubSGAg9b3jSOy+fqx7zUTyUG7nK3EbzNCEigVOjYC
-JEo9u3z7bgXa9NcdSuOcWkzFi9DHpG7x3ef+1WYWLex17mMjjB0q9zxFQtSVdlut
-KTqqh0i5usEa5tDZvrTEeRL2BEeazUgbxNzSgaTrsfqQK1MICLLg7qV6/J/x1fGv
-GMxo1DGMjyX1F1IUkwWK7G2HYplvMskWtJLDFOvEQpMtbIIww6PNtIrey/8DDkJk
-X8+Me4PduXqht41kSZABrBzJiVHxWi1v5bpt9uS06B5tLJxfwvl7bEgG9TUE82KZ
-x49A8hWq7nTvBbcYj6UiRIEjW3oz2Se8iWrsxqCMxv9WVX+fixzlP0b85VTzLc7G
-0CDSC/fUcg9aUu2hJGJzg9YfNob6nbxOa5i6mKKM9q4c9JtX3pKxjNd94cJkVDRG
-H691e8L8UXf57NLvp20IJRh80CSCUWNmIdahpnFtaLMUIIWPKaYYHV6VvDO7o2b1
-5lbvaGdeYcNOoCQSewdq0d6TqMvg3h7+EMtETBq7FWBhzm1NaiIvHSsMINPFvBc5
-mXjf76F27ofWSSBcjGLy
-=euOh
+iF4EAREIAAYFAlVcfvAACgkQknrdDGLu8JDMmgD+M0uryBrDQYLARsFJcwNwpD3M
+t8ItLpklXEwORbn/TmgA/3KVd+C+/DiPtHj1l+UUen4qzqWZifeFnp4Mx4vTNOKD
+=eRJt
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.69.ebuild b/dev-util/cppcheck/cppcheck-1.69.ebuild
new file mode 100644
index 000000000000..93db4a38ddfa
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.69.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.69.ebuild,v 1.1 2015/05/20 12:32:46 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+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="examples htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=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() {
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
+}
+
+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() {
+	emake install DESTDIR="${D}"
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	fi
+	doman ${PN}.1
+	dodoc readme.txt
+	if use examples ; then
+		dodoc -r triage
+	fi
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
new file mode 100644
index 000000000000..8e9635c28354
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
@@ -0,0 +1,12 @@
+--- cppcheck-1.69/gui/gui.pro
++++ cppcheck-1.69/gui/gui.pro
+@@ -146,9 +146,7 @@
+     LIBS += -lshlwapi
+ }
+ 
+-contains(QMAKE_CC, gcc) {
+     QMAKE_CXXFLAGS += -std=c++0x
+-}
+ 
+ macx {
+     contains(QMAKE_CXX, clang++) {
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
new file mode 100644
index 000000000000..0b0c9f84ba36
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
@@ -0,0 +1,67 @@
+--- cppcheck-1.69/gui/gui.pro
++++ cppcheck-1.69/gui/gui.pro
+@@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
+     LIBS += -l../bin/cppcheck-core
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-1.69/tools/dmake.cpp
++++ cppcheck-1.69/tools/dmake.cpp
+@@ -171,7 +171,6 @@ int main(int argc, char **argv)
+     }
+ 
+     std::vector<std::string> externalfiles;
+-    getCppFiles(externalfiles, "externals/", true);
+ 
+ 
+     // QMAKE - lib/lib.pri
+@@ -180,10 +179,6 @@ int main(int argc, char **argv)
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+             fout1 << "include($$PWD/pcrerules.pri)\n";
+-            fout1 << "BASEPATH = ../externals/tinyxml/\n";
+-            fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+-            fout1 << "BASEPATH = ../lib/\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
+             for (unsigned int i = 0; i < libfiles.size(); ++i) {
+                 std::string fname(libfiles[i].substr(4));
+@@ -209,7 +204,6 @@ int main(int argc, char **argv)
+         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));
+@@ -357,9 +351,9 @@ int main(int argc, char **argv)
+ 
+     makeConditionalVariable(fout, "CXX", "g++");
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+ 
+     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -399,10 +393,10 @@ int main(int argc, char **argv)
+     fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
+     fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
+     fout << "\t./dmake\n\n";
+-    fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+     fout << "clean:\n";
+-    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
+     fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";