Version bump (bug 520242), fix test (bug 511438).

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

4 files changed, 182 insertions, 5 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index 5de81c21bf3d..cea3ad6a4b37 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.55 2014/10/10 06:31:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.56 2014/10/10 13:04:51 xmw Exp $
+
+*cppcheck-1.66 (10 Oct 2014)
+
+  10 Oct 2014; Michael Weber <xmw@gentoo.org> +cppcheck-1.66.ebuild,
+  +files/cppcheck-1.66-tinyxml2.patch:
+  Version bump (bug 520242), fix test (bug 511438).
 
   10 Oct 2014; Jeroen Roovers <jer@gentoo.org> cppcheck-1.65-r1.ebuild,
   -files/cppcheck-1.64-tinyxml2.patch, -files/cppcheck-1.65-r1-tinyxml2.patch,
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 0891b4bfc54f..ae55dc2cb74e 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -3,16 +3,21 @@ Hash: SHA256
 
 AUX cppcheck-1.65-c++0x.patch 172 SHA256 2b0256f2c31c6484da31fe1c40dd2c83bd48542b26bbeb99e79cc01f514ed12a SHA512 d04371d8919a0ce2448153de4a8438c8e2064b3353682d7499ab6222a7e66411ec85e6ed22640e3b4c0cb6d7f628bd5fa1b368c153e3d00e4e8ad90a88c0990a WHIRLPOOL 643c65f3f94da39bc9872ed6bfdad015631c3baa46e4b1e16668ac9a3ff5fcde48b550492644714274611d10ecb981b5979517343a50da185477e79fe2b86213
 AUX cppcheck-1.65-tinyxml2.patch 3355 SHA256 38394e1ff82823c4c1fd5995f1e3c41dfb8202838ed4b695654dfde7044cc36e SHA512 69c5fd9908576483e19e8edfc42aadd8c51d188ece88e30d1be34335adfa28bd9e9296ed1adb28107e7538e519eb35c4b195c149eb578b6c83651edc1d38a4e2 WHIRLPOOL 4288e978feefe08ea68944b27bbe87c751b825cd7a9aa436e42b3cd0b9283d6d028e674667ec20de724c92da261348015aaea63a33c07a813401fc599920c6ef
+AUX cppcheck-1.66-tinyxml2.patch 3375 SHA256 691d1628ee0574c7ab79991da48056cdc9396bc6616b1cf4149e1edcb9ee0b53 SHA512 4de1f9d6a537f3378493782d2893cfaf3345fb86d1f3ad26cfdb7abd0d3f3be5ebc10bfd9450d639565b825eac45669a58e0a8b798eb45a134524445fd6acd5b WHIRLPOOL 1c66b38f745719352c946f9446692dbc094a64a158adf74708b0af2beb554f64c0bc82e56fd7313e0c4f25a75fbd93ff26730a364a9fe15658ba6371f4e03041
 DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e
 DIST cppcheck-1.65.tar.bz2 1227353 SHA256 16577a2423ad6cbb7506e1b4032172b0b27d65b8a4174fb0c671472f37b65d67 SHA512 ce1ef2771470383e33e159b99ce5bcf1c7f570c7a539d9488bf771a5d23b4511acd7ad7e14b839e5433f47032f4d662b6c053579d4e353caf7bf22588e1d2916 WHIRLPOOL 5101d970f7d8ad19c3dea4f0d95713fe9c8afd3ac3f7bde04cf51c11ecbecfe4fc97f57c780408a15af0ef4e5a0bf4aa7780bd994bc59548c91efaee6cf80edb
+DIST cppcheck-1.66.tar.bz2 1064369 SHA256 9469c23d39df5f03301fb0f9c29d75e9d63ed80d486cc6633145e3c95293c1b7 SHA512 de61b64f9085244a0f8c511ffe19e5ef18b6ff0274a3317328f72178f92843171c1e3ca7e60d496504703c7ec4f6e458247b1a3f16c371de6a2eb21b1b41d305 WHIRLPOOL 2b1fb4c1bff14153c36d52a2c1b60f3bbe93e0bedc3bff71e65aa73bb3c343e2f2db8c86f24e2ba9d227513d0a0fe627ee92858e782a63ec1b03ea285252b6f4
 EBUILD cppcheck-1.63-r1.ebuild 1265 SHA256 f0ca59d93e38c58c2e868a5d1a1756b90bb5a1fea87b6eb18155a178ac69ce7b SHA512 d29f1ea7d5375240b5e169972deeec21927b2176a63b43d168b308cf2a4ff355f0ac77a24610b11026ed7bb7a939c9b1c03f85bbce4e010e6de387bc06d60084 WHIRLPOOL c0598a62d663abc462b3d2a5f78b0c95fc1aa90c54544dd813e0a7ac255b9f918e963c1f9d8634e31c1767426f796a88b80cc1a3d522153b35a84653edec71b3
 EBUILD cppcheck-1.65-r1.ebuild 2030 SHA256 c2e584c0f902fc636ae1008e5a05fb9daa3bc5f4b20b0d0e446dd09b5008360f SHA512 a43bcb77b0590adef4aa0c4e48cb91a454cd53d6db0aceabc847e4651e4a2e14c7751f0d0cc2b97d1f8e19385156b7d422d7b5fd3b42f3a70de9114a4ced9de3 WHIRLPOOL 7a6f2476229e06025db5574f7291b0e57b2450251e80ff360343df8853fe9b29ab406ff7c0917fba5247de85d8e03d2f507d19256ab215a3aa5b8f952a531890
-MISC ChangeLog 8959 SHA256 0c5d3a510b9ab4e2aa647d119b342f3a77a43a8b3ab3a991447d8294ea118d7c SHA512 0a8c78fc59f3e127901537f26b493e47a1fd0f9c1ef3eaa170a10dcac9ee911e6f7fa034f172a5628655510028f05905f245b04be5166b3f16a1f2c2129de24e WHIRLPOOL bf2c7127bb320c58f7d432cd0e7464ec7e5cd13a9603ab3aaa1184e366acbefb92e8b724c4b0910af1b7690abb645e3283e959243ec9482d5ba3e26bffff2467
+EBUILD cppcheck-1.66.ebuild 2167 SHA256 dd2a4a865d3c4d36caeeaac88522cfdfab57ad28ce6937deedb19f7d10421078 SHA512 0c315917777270def9921dd2b3201c7f5eba13cdfaa05ead59f259985434d41929e64f75c1a50103a161f689ce3b5035d459d1b774f102852d780894c79dd143 WHIRLPOOL b9e72a07ea9c50f3d94d6cab0edeba66d9e865bab7aca10f75647841364e0103b4f2860d6cb172f5dd646f1d3a180358f43a92d8c8ddf1362d656c2d63b8b070
+MISC ChangeLog 9150 SHA256 aeaf84df441496716f8789d3588e19c3150562369a2966d11912b11d67f4b666 SHA512 c649455f263cde8bed1ba168ddbd64f05d477fdeee13b2164cc5762796ffe7fdf8b772254cb74e52fc2a1005d476f4fa2f9231d5ed29e152a1d713b5584896b8 WHIRLPOOL c2ebd4b55fee91d109f1cb7bf5d9a09668b4b4e7b15f12dcfb0f4b922eed3b7711fc0fa17e1707d300ea7d8de57ee517ed9058a77e127a474d6ca5b6a463cd9d
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ3fTMACgkQVWmRsqeSphPT5QCfXmHlkhcIm6g75LPg5dr5RFmo
-SlIAn3qulLxb8hIkSroDgErGh5mkRCKp
-=vwPj
+iL4EAREIAGYFAlQ32XdfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JD3ZgD9Fvw/C2Bcer1OhS6RsIjVax5V
+odm3prc4SzZ3CCm+uZsA/0N8fZDuSLFYLivP/I0EYWHqM0Vt7XhsBRBWGPJAEwJZ
+=cSWm
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.66.ebuild b/dev-util/cppcheck/cppcheck-1.66.ebuild
new file mode 100644
index 000000000000..7aac05e4a787
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.66.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.66.ebuild,v 1.1 2014/10/10 13:04:51 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+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 ~x86"
+IUSE="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}"/${P}-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.65-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
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
new file mode 100644
index 000000000000..1417ea321d7d
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
@@ -0,0 +1,67 @@
+--- cppcheck-1.65/tools/dmake.cpp
++++ cppcheck-1.65/tools/dmake.cpp
+@@ -170,7 +170,6 @@
+     }
+ 
+     std::vector<std::string> externalfiles;
+-    getCppFiles(externalfiles, "externals/");
+ 
+ 
+     // QMAKE - lib/lib.pri
+@@ -179,10 +178,6 @@
+         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));
+@@ -208,7 +203,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));
+@@ -354,9 +348,9 @@
+ 
+     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";
+@@ -401,10 +401,10 @@
+     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";
+--- cppcheck-1.65/gui/gui.pro
++++ cppcheck-1.65/gui/gui.pro
+@@ -15,7 +15,7 @@
+     LIBS += -l../bin/cppcheck-core
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp