Version bump, update HOMEPAGE

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

10 files changed, 89 insertions, 214 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index ebc05b1faf3f..7b46c9952240 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,14 @@
 # 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.51 2014/04/26 18:55:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.52 2014/05/19 15:50:29 xmw Exp $
+
+*cppcheck-1.65 (19 May 2014)
+
+  19 May 2014; Michael Weber <xmw@gentoo.org> +cppcheck-1.65.ebuild,
+  +files/cppcheck-1.65-c++0x.patch, +files/cppcheck-1.65-tinyxml2.patch,
+  -cppcheck-1.59-r1.ebuild, -cppcheck-1.60.1.ebuild, -cppcheck-1.61.ebuild,
+  -cppcheck-1.62.ebuild, cppcheck-1.63-r1.ebuild, cppcheck-1.64.ebuild:
+  Version bump, update HOMEPAGE
 
   26 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cppcheck-1.63-r1.ebuild:
   Stable for x86, wrt bug #502804
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 7158aa5834ee..da47951e4767 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,34 +2,20 @@
 Hash: SHA256
 
 AUX cppcheck-1.64-tinyxml2.patch 901 SHA256 188a0f10a05359ff2811efb976ff9b3c2f2874a8bcf714ce45e58827c35f2aee SHA512 a825e6fce89af249c463b554aec3a8ed681dd9c4be38d879cad1e92e4f9ececf10d9f287d361ac5e4cce6c00e7eb2114e262e53e66aa3ccb6f44359b26da53fd WHIRLPOOL 23e35bb9fe245c874b79f3b61ac4e769f65c52b29dbfd394be3bb7c8965e2aafbb659dbd299ebd0d27db6b5c1694155638dde13152daeca77ff172d25b66935d
-DIST cppcheck-1.59.tar.bz2 1243616 SHA256 6be40d8422c545959d1cc44ce3f80be9f6d3d18f70d65b8d2e1b65284aa38f6e SHA512 c09f772a80e00c9a0a4ab09523e153dd21c205b6a91339886fbf36c2a27fc6c0a7c89d5721ed0e4c3f82df1b7e2d4b20949c78dcc167d2792d0d291d0c63b6e3 WHIRLPOOL ec9f6fcd079392bcc28a25700725b4bba87f10cc9eb1b7dceff7f268f4378731ae3cbc0f0156b486b1e3d6e9e8703890bc9c4a08ef96e205fc14a3209c3b6b1d
-DIST cppcheck-1.60.1.tar.bz2 1255595 SHA256 08c754744c1d53c2368692c133a69778f3bbfcce5c93a3f5b32575b9d7699449 SHA512 75e0ae2af2705670d2fb257447890f1214ceb341fde90b5380d5a47267bdf905ef5dd4d188e16e51662fa06f740c4b901b6c6376817070ebe69228654f4c9d2b WHIRLPOOL e79d0ec5b666fc4a09b8a84e14214dcd57f7a94b5a14ae8644f1145b69120321b890edb2a83627f5075a638d2c767ada51fbbe7ad7e345d80b33034620aa63e6
-DIST cppcheck-1.61.tar.bz2 1140799 SHA256 7cb21cb0fb3aed22040065db2bbfc42bf855db46ad8f023b73d465f7214b70d5 SHA512 2cea51103d542d9b03d319fb8badfefce5b0dc40279148d0b3217026a172cf62c2ae1f95c87b6b3da040077cf6a832fb44ef077faf189b59b2e56516c5909195 WHIRLPOOL 500ec0ca0c6afffbb39f8ee7fa9bac739c4947ec5e87b30bc62c6e2555bd678817b1a90fdc01ca22f125a2ff5bf189054bc01d85aee063be97637f35910e9e67
-DIST cppcheck-1.62.tar.bz2 1171442 SHA256 0c257368870985cdb870d0e95f3e909df881472eafcc7699a25681b9e0143d0c SHA512 abcb050119168ca866f88e95867c39d0b2180abded83bcdba112b9aed1f3db6e20b3507c37761f8f239b1095e96314aa11bb1cfbcbd9a265e727f55b1843b6a6 WHIRLPOOL 7c287aa9bc6faac7ac4dc2ea2fd18ae2d64b0796c997377ecab0a67ebcd1a6417d13cd5d2c9f4038f422467c070cd79f6a83d2e5f372dbc23d39d8c302fc21d9
+AUX cppcheck-1.65-c++0x.patch 172 SHA256 2b0256f2c31c6484da31fe1c40dd2c83bd48542b26bbeb99e79cc01f514ed12a SHA512 d04371d8919a0ce2448153de4a8438c8e2064b3353682d7499ab6222a7e66411ec85e6ed22640e3b4c0cb6d7f628bd5fa1b368c153e3d00e4e8ad90a88c0990a WHIRLPOOL 643c65f3f94da39bc9872ed6bfdad015631c3baa46e4b1e16668ac9a3ff5fcde48b550492644714274611d10ecb981b5979517343a50da185477e79fe2b86213
+AUX cppcheck-1.65-tinyxml2.patch 1197 SHA256 0eff639fb58f134886033c798dca6559af7c2db3d169f2e8ca6d94309f8764ca SHA512 d8180ede04a5d6b75c15b8003a9ea62d31299d58d474ff56239f3b7d72ceac5c00b078e603b0881b15116e538609a4dcd3726ccd0d4d2940c2b2ef78d914d083 WHIRLPOOL 325a17c57f25124e913f6716b9daa696aa2fdfd4debe4a39654547d979c7f4306d1332321ceb85c7ec35cef71eed949e04a84f96ef813d4ea269b398d59d7c19
 DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e
 DIST cppcheck-1.64.tar.bz2 1183612 SHA256 ce455a49786c311ec74f5ad287e0231d4c7f4b18375e7ac73ae7ea9cd2cb5058 SHA512 2721248e4f0cf0b6899b8cbc18bcbb23d1e212dcaf1392b8f81094baba34d9dcb091fa6007696885bc11c84ecb13353360c7238f218c5e4b56ddcbdfef855ee2 WHIRLPOOL 342909138aadb4ed8a82b6793dee65f6b5b15bf04c857bb5042240220261542f8b46471ebd8c3cc62aa45bfa6dd39430cefd477b9945227604d6270c25119dba
-EBUILD cppcheck-1.59-r1.ebuild 1202 SHA256 93ee68a93f8ced641d8aed5e7d2825b0383cb50df856eb7725162fb1aacc6c10 SHA512 cc5428c60e4fb1c32378dd39e2b7ff080eea4ce36fbea86b6df3981f4021a626164c814de521f18624d43babdcd286723c2646ae2463a0f72013488b4a39ab7c WHIRLPOOL 11eefe99830db49ccd5bd1b078bf7e81d2280117ce939fa3025fc2c330d2370dbf3b060044c5701dcb93a27d00e350347305bb5ad031f265ce8ffab4f11ce976
-EBUILD cppcheck-1.60.1.ebuild 1201 SHA256 418b5caef4267145850c10550c9eeb7a23bbc636387b99508c64610987a06e02 SHA512 775ef3c38cbc0ba474f189426afe09610d43aa5c4f6a20a886fd79f53f6e059efbd17658f74dd960196824a745077b4cb42a32139134f3be40952b00b7c801fb WHIRLPOOL 1e0c2246221c17514c345d9be11035c2617253753d5980e0eca1f3e027eab93456233da9cbb8c2db42cc3e45135ffda0c5e5326b735d607a85afce0d8e392359
-EBUILD cppcheck-1.61.ebuild 1196 SHA256 2265615b31306386a3fd8623fb40767e777b0384c7e22d7c47edb919f1fd78fa SHA512 17fda2084fddc5a5a72b4261311005d140c1c8494a410767580017d03ee7c4b65404afc20a22579b7148a2269d2decffd19bfe03a711322344fda65bf3f322a7 WHIRLPOOL d3e60fb75649af5ed2ce35c403ded5d82c6dff0e3c99b14b4ab9fe6611e34a9c05ed09ce9ec8c58649d7d9fc0a8fdfedb601a4fdf04e570b94590a0913fbf7ee
-EBUILD cppcheck-1.62.ebuild 1194 SHA256 9dffc9c9eb46b93afdb05fcc6fa161ee7c49ca7ddac026a467536a92574dd9c7 SHA512 a1195809e406b287e9d30a8da0886a971907965ba6fb50536bcc4a68a03e4b6cf8916d2fda57be9bbaac48982b8f57c1e8698b569c67429f99798ce7bb79a6e2 WHIRLPOOL 6829a61a83b971e4b15eb1ceef3d0e561f1f2251e85b6884db8e6e2688a27176c7988003e9374a82989be0e9e02f64431678e1f1ae27f5df5512f604bb0e45bd
-EBUILD cppcheck-1.63-r1.ebuild 1276 SHA256 65357c0ced7b67115af25bfe052b797b0f12ce9332ca7c2daba0d696eefce5ba SHA512 66236d113d5bffeb64d1ee4e0f50e288224fec0a3b01567646c2485a019ab2b73350faa66a88939088121b2c48100fabf53b1725f532984817cab3c1b12afdaf WHIRLPOOL 7c47c99cd6e6ea352d3ce311dea38309aa616faa40a4b497941f6211f8f223f19f17e9ae8f06414837fec4e348de919c50af936d9f7815b0ee8545efcd9143a4
-EBUILD cppcheck-1.64.ebuild 1490 SHA256 6a6e506417402d8ee55af5d05a73347017a3eb4eb3eedfb4d8ff3cfb52cd4513 SHA512 f0df6d29f694fb700fea06d0106fd70837889d86e621f8bdd92ae5fd9fa8be7e03b4834f547babe9ca2b14ec654f3a7576c5de6ac5b97b93e9cd84a7be3099cf WHIRLPOOL 63eae1c035087a1373e363a9d4f6b66a84eff1308ea7130a7c0d67763aa264dda1201cf8111340604798833e7cd1ac8a0063785de36d57a8aa682cc7f9beb19b
-MISC ChangeLog 8008 SHA256 282fc227c1ecbbeb44cedfc62d373df839d3933d1a9549d51c3e481b9e159228 SHA512 6374cb21ca8ca573ac2c3aee47c39bc49ef82b8d05b28e1003af1bdd0f159ed0bf90f4f2c8033ec525b0cab93015fc88c9f17e21e09aaf70ca5971c42e11a03a WHIRLPOOL 8e3d9fd347de137dcc5646e20efd101c99dd1efa34fc275212d004bc5407dd33c4f546ce70b80626c9a5bba7043d87c068c0c9bd46a89582ca024481a163b618
+DIST cppcheck-1.65.tar.bz2 1227353 SHA256 16577a2423ad6cbb7506e1b4032172b0b27d65b8a4174fb0c671472f37b65d67 SHA512 ce1ef2771470383e33e159b99ce5bcf1c7f570c7a539d9488bf771a5d23b4511acd7ad7e14b839e5433f47032f4d662b6c053579d4e353caf7bf22588e1d2916 WHIRLPOOL 5101d970f7d8ad19c3dea4f0d95713fe9c8afd3ac3f7bde04cf51c11ecbecfe4fc97f57c780408a15af0ef4e5a0bf4aa7780bd994bc59548c91efaee6cf80edb
+EBUILD cppcheck-1.63-r1.ebuild 1265 SHA256 f0ca59d93e38c58c2e868a5d1a1756b90bb5a1fea87b6eb18155a178ac69ce7b SHA512 d29f1ea7d5375240b5e169972deeec21927b2176a63b43d168b308cf2a4ff355f0ac77a24610b11026ed7bb7a939c9b1c03f85bbce4e010e6de387bc06d60084 WHIRLPOOL c0598a62d663abc462b3d2a5f78b0c95fc1aa90c54544dd813e0a7ac255b9f918e963c1f9d8634e31c1767426f796a88b80cc1a3d522153b35a84653edec71b3
+EBUILD cppcheck-1.64.ebuild 1479 SHA256 c46aa2a153f4257a52389d0f83aad5cd53adc1ed0f59bf2ece5d36de86648fd1 SHA512 b4cafe2f578dda25602f136a231ce2918bbfa894d3d46094181f13cd185196fff9cbd9e0a1f59359828a3dbb1c32cb9f8262a862914b9317f877b546ac061893 WHIRLPOOL df36834fe9b45e996fb956cc41724ca28cd1c18434ecfee51094033ca34fabc088b5c663857a00acc0b99f9c3b189a32a1a66ff9f403fadb57b31e3d4bfbfb27
+EBUILD cppcheck-1.65.ebuild 1537 SHA256 b0d4a1bbb8ad9b1ccd9b7fecdde04c7c96e0f694f89d9e6c2a6cac1d82b5fbc4 SHA512 90a214622e592059bc3d6842b0eff5dc96c7f9dac335169c3825e22968183eaa8226702cac966565d545fa2e62daaa47efd470188e19edd2d1e2adecd4f613bd WHIRLPOOL ecb84ba9a8a1fcf1b55abafe3cbfb0d398c1f7948961013c604de8617383496cac7844c4fa78fce14a88118621160da17a836c23b465a446165fed5f863a3811
+MISC ChangeLog 8361 SHA256 12d4c16c0c3938c1beaf5bcf90aae780432e39c8854f809887162e152b6d278b SHA512 c2fd45b02d3e2ed9ce00c59f471a440c9e06a955e3b232f0dc5819c1d882a1de420a716ccb7a78fc23ab388397a6bbd447aea723b2f36eabad1b060107a554ed WHIRLPOOL 9ecb329fd3386431bb8a51209995973edca4865b0adfb57fe39f5e64ecd166ba83276aab4b0c8f9407a8995a94a7b1f4ea402ad8da6fdc6b4ef103bdbf77bc9c
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTXAEfAAoJELp701BxlEWf0eMP/3wYUJdlrQORaPB+SGn2RviR
-S7JYRsDseZrg3zBgQHt7Lzi5m9Ye4Z59L6I79c/qeXqFl8C8vAuRaFQ+EO2Ra6AP
-XjhSnKsIw9ABZ9gTKsLiZhsS5hwCzx0o3z51wInMPzEDGqrpZDdtxEsthxRsPLNJ
-opwQFO68MYv5JExPEisyZIOcybTzy26kbGywHeJCED+j5TYwMtycnubmHTE2o6AF
-4t9q9b5ujvp9/mnGCfqvacUiRhE3LPUHEHKMFFLzUo+0MlKtBZVJpT6Hz5dtsKf0
-xXLWl99PvspMEEM8Q5BwP92vshdRnH9cs1col8y3yiAdLpIXNJIeg5c10j66MCDV
-775Ic7VDwCRMc9PovYS4xWSPLu/cI8eZrPfSgvv59Ah4zkMkeDGYm9RILTOhDzye
-tl4cHphB3ATP17DImA4hsnkrWqch48HkfFijK8BsMwrBDllT21TWR3g5eTOUOqVA
-LPUSlQaaC1sz346zxQhlwuGlodShd82rlMCIef3Z607C1fGFWCWt8Ni6fjOtkG1C
-dfQqJsGa68mK8GG4GsU9uKrZs7l/QQR0qCArE0vXETv3mu4MDcIs7SjaLrqu6qLt
-GNr++0FWJzI06SoQ+UVzO90DgSTN8p/s+t/KGJh6+L0UccKfgeLwhxQ2pdYS31Rw
-JxKcvAse8pvLedNF9C8h
-=/DKO
+iF4EAREIAAYFAlN6KEoACgkQknrdDGLu8JDkwwD/cNzEC/gnduqupusp88Yurz5w
+QT107YNIY/6enLB9QEcA/2Ql/hrbYmibRHO8jSFQOYh+mUL1ER03UBamCafdyvCJ
+=QHMN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
deleted file mode 100644
index 759a753879d8..000000000000
--- a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.59-r1.ebuild,v 1.3 2013/09/05 18:40:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( ${PYTHON_DEPS} )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake
-	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_install() {
-	emake install DESTDIR="${D}"
-	dodoc readme.txt
-	if use qt4 ; then
-		dobin gui/${PN}-gui
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	fi
-}
diff --git a/dev-util/cppcheck/cppcheck-1.60.1.ebuild b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
deleted file mode 100644
index ad53eead2a98..000000000000
--- a/dev-util/cppcheck/cppcheck-1.60.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.60.1.ebuild,v 1.2 2013/09/05 18:40:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( ${PYTHON_DEPS} )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake
-	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_install() {
-	emake install DESTDIR="${D}"
-	dodoc readme.txt
-	if use qt4 ; then
-		dobin gui/${PN}-gui
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	fi
-}
diff --git a/dev-util/cppcheck/cppcheck-1.61.ebuild b/dev-util/cppcheck/cppcheck-1.61.ebuild
deleted file mode 100644
index c49469e154ec..000000000000
--- a/dev-util/cppcheck/cppcheck-1.61.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.61.ebuild,v 1.1 2013/12/03 08:53:50 xmw Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( ${PYTHON_DEPS} )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake
-	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_install() {
-	emake install DESTDIR="${D}"
-	dodoc readme.txt
-	if use qt4 ; then
-		dobin gui/${PN}-gui
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	fi
-}
diff --git a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
index 6a7c3eceed27..c844d6faa0c3 100644
--- a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.63-r1.ebuild,v 1.3 2014/04/26 18:55:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.63-r1.ebuild,v 1.4 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/dev-util/cppcheck/cppcheck-1.64.ebuild b/dev-util/cppcheck/cppcheck-1.64.ebuild
index 934ffe7a9bf7..5b7ac0bf36b5 100644
--- a/dev-util/cppcheck/cppcheck-1.64.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.64.ebuild
@@ -1,6 +1,6 @@
 # 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.64.ebuild,v 1.1 2014/03/30 16:53:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.64.ebuild,v 1.2 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/dev-util/cppcheck/cppcheck-1.62.ebuild b/dev-util/cppcheck/cppcheck-1.65.ebuild
index 59e7932519e5..0a6375ac3d4c 100644
--- a/dev-util/cppcheck/cppcheck-1.62.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.65.ebuild
@@ -1,6 +1,6 @@
 # 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.62.ebuild,v 1.3 2014/01/14 13:59:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65.ebuild,v 1.1 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,18 +9,26 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="htmlreport qt4"
 
 DEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=dev-libs/tinyxml2-2
 	qt4? ( dev-qt/qtgui:4 )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	# Do not use bundled tinyxml2
+	epatch \
+		"${FILESDIR}"/${P}-tinyxml2.patch \
+		"${FILESDIR}"/${P}-c++0x.patch
+}
+
 src_configure() {
 	tc-export CXX
 	if use qt4 ; then
@@ -31,7 +39,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	emake CFLAGS="${CFLAGS}" \
+		CFGDIR="/usr/share/${PN}/cfg" \
+		TINYXML="-ltinyxml2"
 	if use qt4 ; then
 		pushd gui
 		qt4-r2_src_compile
@@ -44,9 +54,15 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	emake TINYXML="-ltinyxml2" check
+}
+
 src_install() {
-	emake install DESTDIR="${D}"
+	emake install DESTDIR="${D}" TINYXML="-ltinyxml2"
 	dodoc readme.txt
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
 	if use qt4 ; then
 		dobin gui/${PN}-gui
 		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
new file mode 100644
index 000000000000..67590d0fee95
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
@@ -0,0 +1,9 @@
+--- cppcheck-1.65/gui/gui.pro
++++ cppcheck-1.65/gui/gui.pro
+@@ -150,6 +150,4 @@
+     LIBS += -lshlwapi
+ }
+ 
+-contains(QMAKE_CC, gcc) {
+     QMAKE_CXXFLAGS += -std=c++0x
+-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch
new file mode 100644
index 000000000000..61776933578d
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch
@@ -0,0 +1,36 @@
+--- cppcheck-1.65/Makefile
++++ cppcheck-1.65/Makefile
+@@ -94,15 +94,15 @@
+ endif
+ 
+ ifndef INCLUDE_FOR_LIB
+-    INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml
++    INCLUDE_FOR_LIB=-Ilib
+ endif
+ 
+ ifndef INCLUDE_FOR_CLI
+-    INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml
++    INCLUDE_FOR_CLI=-Ilib
+ endif
+ 
+ ifndef INCLUDE_FOR_TEST
+-    INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml
++    INCLUDE_FOR_TEST=-Ilib -Icli
+ endif
+ 
+ BIN=$(DESTDIR)$(PREFIX)/bin
+@@ -242,11 +242,11 @@
+ 	$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)
+ 	./dmake
+ 
+-reduce:	tools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)
++reduce:	tools/reduce.o $(LIBOBJ)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+ 
+ clean:
+-	rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1
++	rm -f build/*.o lib/*.o cli/*.o test/*.o testrunner reduce dmake cppcheck cppcheck.1
+ 
+ man:	man/cppcheck.1
+