Version bump (bug #525954 by Christian Strahl).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 111 insertions, 5 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index 7d3c5db4a4bf..92f7da4a6622 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,11 @@
 # 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.58 2014/11/28 13:02:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.59 2014/12/28 08:47:36 jer Exp $
+
+*cppcheck-1.67 (28 Dec 2014)
+
+  28 Dec 2014; Jeroen Roovers <jer@gentoo.org> +cppcheck-1.67.ebuild:
+  Version bump (bug #525954 by Christian Strahl).
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> cppcheck-1.66.ebuild:
   Support python 3.4
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index ebd1a83de8b5..1bda8affdca2 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -7,15 +7,17 @@ AUX cppcheck-1.66-tinyxml2.patch 3375 SHA256 691d1628ee0574c7ab79991da48056cdc93
 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
+DIST cppcheck-1.67.tar.bz2 1084926 SHA256 6214c0cf0c11c83ecfae35f8cc8db4fa47389a77360919653d635612cefe2ab9 SHA512 5d1e3e12c818f850b00a8e3b3d79f24fceb0fa806d9100aaa6aed1bbbc86237af2e7dd4567fdfd227281f62d4b5450ac6cbbc6a97e04b380c242c59ddd3609ef WHIRLPOOL 1fc82744a78b76d9bb682fa6f6d8a619164c5cb250eb199ac545d4c147522ab5c4961d635cdea291ccf65f7972a162d394c4e500542b27b8679e262093e86884
 EBUILD cppcheck-1.63-r1.ebuild 1265 SHA256 f0ca59d93e38c58c2e868a5d1a1756b90bb5a1fea87b6eb18155a178ac69ce7b SHA512 d29f1ea7d5375240b5e169972deeec21927b2176a63b43d168b308cf2a4ff355f0ac77a24610b11026ed7bb7a939c9b1c03f85bbce4e010e6de387bc06d60084 WHIRLPOOL c0598a62d663abc462b3d2a5f78b0c95fc1aa90c54544dd813e0a7ac255b9f918e963c1f9d8634e31c1767426f796a88b80cc1a3d522153b35a84653edec71b3
 EBUILD cppcheck-1.65-r1.ebuild 2164 SHA256 43957596749e8018118c44da173e2e54774030915bfb1b43a5038a3fd6c0b256 SHA512 3b8313a9793391dfc36c4a4bf409e9b9cedb5d04ee78098d985b3edebb08ad9fb500357c3ab486950f075feeed0cff1bec544fcff8c3d7eb91953bf7f45393df WHIRLPOOL fb80f6986c64a220840944da7497a30bafb56a0a86305da37d1553761a8540a0e5b3b20ae4b5275cc00ae6d04e68f68f2a990f31f96543a5c5a5734540e91315
 EBUILD cppcheck-1.66.ebuild 2173 SHA256 bf431a50a8ecf8b3820a5c40b1f23e389c2cd3de588d15610c8fc845e6bb413b SHA512 100ca80b62faa4c3e1345a1bdf214a28ac69d36d6a6991ea9f2b2256c7626c87505f06786fd55408b72022c5282c07b84efa9d8554c06eb7bb26b6ee52234674 WHIRLPOOL 7fcfbcf27347f41a993fc4005f82135a4c08245ac529cb2fc1d4912657af7b03134129a8608d2f1daf9aa69b2b31d7059e84681e65bc72f1a225a500e19f090e
-MISC ChangeLog 9374 SHA256 9f5eaf9bfaed2d4b2d089dbb004154efabf623d42e3e44fc573d6cdf88f7ad08 SHA512 9435d655243bb6c5817ee26806d0c7436c8e7d499929a8f85c71193993863b95e7cabf1edd4e83d833a536ab48718a637867c699df7700edd336248944bfb056 WHIRLPOOL 7914f4c6bdf3b11798695296bd89251e3523b9193d212fa8ec948f29f811f19f34ddd8e0ee99b0e16601f030036fc5993bdf778fca11fd0dbeeada60eb0955d3
+EBUILD cppcheck-1.67.ebuild 2177 SHA256 24c5ca0ffa7ec466cbc40ac4c181a3796b65929dff03e520af6b276520b76b1d SHA512 63774433eb38eb07cdd620b096182d27a8df2c1cd75c8ad619e02590ad299ec4c1b50dcea7db365896ab7770793a9946f393f8706be072259824a73d439c0b94 WHIRLPOOL 16198a0766e456858643e1db0cc7c73b992ad681980ef25d702c241a9e0f88f0396ed824cf9e052aeb07e93c39c407f226a9ecd3906a985049aa31b8b5c4617d
+MISC ChangeLog 9523 SHA256 575a61393d2376d5eec342f36271d175684fc497ea6bfa5b8b29e7337c1eded6 SHA512 df7a35613bc6553fd2dbab6e17a804c5cfc9c5de70c5a165eae87a2f00d12e626e570a080d7ac7e72e05a5a47faf027e631091dd76e3b76f302ebb47754b4d96 WHIRLPOOL f76a438cb2798d510ff152f136e2f232145ece485a4e835d2fd49ff9d3fc328e052f8d303bec3f2215d0567f426e53248e83decd3243c576875a47f69ae9a2d2
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4cnEACgkQCaWpQKGI+9Q94gCfRHgCSoMD1uBktQCWWEp2pf4M
-QCYAnRTlxX5y6iqBFrXqQzVgJ8a+y5RP
-=+kbi
+iEYEAREIAAYFAlSfw6kACgkQVWmRsqeSphP05gCeIubf6u+2nD1pV1/L95HlAGFv
+AGYAnjZWQO5pq56CkvRCbjZQzOEM9rx8
+=tuIA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.67.ebuild b/dev-util/cppcheck/cppcheck-1.67.ebuild
new file mode 100644
index 000000000000..5454cb09f2ae
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.67.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.67.ebuild,v 1.1 2014/12/28 08:47:36 jer 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 ~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}"/${PN}-1.66-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
+}