Properly name patch. Remove old.

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

5 files changed, 14 insertions, 42 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index fea56e16ec44..5de81c21bf3d 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.54 2014/10/09 23:53:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.55 2014/10/10 06:31:14 jer Exp $
+
+  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,
+  +files/cppcheck-1.65-tinyxml2.patch:
+  Properly name patch. Remove old.
 
   09 Oct 2014; Michael Weber <xmw@gentoo.org> -cppcheck-1.64.ebuild,
   -cppcheck-1.65.ebuild, -files/cppcheck-1.65-tinyxml2.patch:
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index b036b12f8b97..0891b4bfc54f 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cppcheck-1.64-tinyxml2.patch 901 SHA256 188a0f10a05359ff2811efb976ff9b3c2f2874a8bcf714ce45e58827c35f2aee SHA512 a825e6fce89af249c463b554aec3a8ed681dd9c4be38d879cad1e92e4f9ececf10d9f287d361ac5e4cce6c00e7eb2114e262e53e66aa3ccb6f44359b26da53fd WHIRLPOOL 23e35bb9fe245c874b79f3b61ac4e769f65c52b29dbfd394be3bb7c8965e2aafbb659dbd299ebd0d27db6b5c1694155638dde13152daeca77ff172d25b66935d
 AUX cppcheck-1.65-c++0x.patch 172 SHA256 2b0256f2c31c6484da31fe1c40dd2c83bd48542b26bbeb99e79cc01f514ed12a SHA512 d04371d8919a0ce2448153de4a8438c8e2064b3353682d7499ab6222a7e66411ec85e6ed22640e3b4c0cb6d7f628bd5fa1b368c153e3d00e4e8ad90a88c0990a WHIRLPOOL 643c65f3f94da39bc9872ed6bfdad015631c3baa46e4b1e16668ac9a3ff5fcde48b550492644714274611d10ecb981b5979517343a50da185477e79fe2b86213
-AUX cppcheck-1.65-r1-tinyxml2.patch 3355 SHA256 38394e1ff82823c4c1fd5995f1e3c41dfb8202838ed4b695654dfde7044cc36e SHA512 69c5fd9908576483e19e8edfc42aadd8c51d188ece88e30d1be34335adfa28bd9e9296ed1adb28107e7538e519eb35c4b195c149eb578b6c83651edc1d38a4e2 WHIRLPOOL 4288e978feefe08ea68944b27bbe87c751b825cd7a9aa436e42b3cd0b9283d6d028e674667ec20de724c92da261348015aaea63a33c07a813401fc599920c6ef
+AUX cppcheck-1.65-tinyxml2.patch 3355 SHA256 38394e1ff82823c4c1fd5995f1e3c41dfb8202838ed4b695654dfde7044cc36e SHA512 69c5fd9908576483e19e8edfc42aadd8c51d188ece88e30d1be34335adfa28bd9e9296ed1adb28107e7538e519eb35c4b195c149eb578b6c83651edc1d38a4e2 WHIRLPOOL 4288e978feefe08ea68944b27bbe87c751b825cd7a9aa436e42b3cd0b9283d6d028e674667ec20de724c92da261348015aaea63a33c07a813401fc599920c6ef
 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
 EBUILD cppcheck-1.63-r1.ebuild 1265 SHA256 f0ca59d93e38c58c2e868a5d1a1756b90bb5a1fea87b6eb18155a178ac69ce7b SHA512 d29f1ea7d5375240b5e169972deeec21927b2176a63b43d168b308cf2a4ff355f0ac77a24610b11026ed7bb7a939c9b1c03f85bbce4e010e6de387bc06d60084 WHIRLPOOL c0598a62d663abc462b3d2a5f78b0c95fc1aa90c54544dd813e0a7ac255b9f918e963c1f9d8634e31c1767426f796a88b80cc1a3d522153b35a84653edec71b3
-EBUILD cppcheck-1.65-r1.ebuild 2031 SHA256 213313b0676cc848f5940150e8fa71580468b2e6c7eb59ab40734b3dd7997691 SHA512 11ef5ec0e2369e7b0be35940b951b683299b200cacaaf3a20b8323893f3d4b6344634dbde02536a88511069fd6dfb0c358f8a3ae05651e01f79f047986423ec6 WHIRLPOOL 0f7a57992f77483b95a8d19dcfffb37dbf29bac3b21795a0a28a49840abbdf12fed1a7a1cdbc2102d0367c7efaa7e5ec18dac9378a0aeeb884b962dd3b0fc505
-MISC ChangeLog 8733 SHA256 792cce397726f2ffb61bcef42afcc066cfef3162b21e9ef786b5ddc3f64807bf SHA512 a7cbd2d38e6e81a229b10523c5503f77b02a6ee29fa63dc0477e1fec45a89ab5df2b464388f7e012df3cb88c52394bd13efa55a637449adb85b66f3135003b28 WHIRLPOOL 674a36a426639a2614a648a49bedda698005dfdf317f1b619bac3be522d265ba0b25bb4d04bdec82266558b2af4c293efc604cc741e52512efc012331454a918
+EBUILD cppcheck-1.65-r1.ebuild 2030 SHA256 c2e584c0f902fc636ae1008e5a05fb9daa3bc5f4b20b0d0e446dd09b5008360f SHA512 a43bcb77b0590adef4aa0c4e48cb91a454cd53d6db0aceabc847e4651e4a2e14c7751f0d0cc2b97d1f8e19385156b7d422d7b5fd3b42f3a70de9114a4ced9de3 WHIRLPOOL 7a6f2476229e06025db5574f7291b0e57b2450251e80ff360343df8853fe9b29ab406ff7c0917fba5247de85d8e03d2f507d19256ab215a3aa5b8f952a531890
+MISC ChangeLog 8959 SHA256 0c5d3a510b9ab4e2aa647d119b342f3a77a43a8b3ab3a991447d8294ea118d7c SHA512 0a8c78fc59f3e127901537f26b493e47a1fd0f9c1ef3eaa170a10dcac9ee911e6f7fa034f172a5628655510028f05905f245b04be5166b3f16a1f2c2129de24e WHIRLPOOL bf2c7127bb320c58f7d432cd0e7464ec7e5cd13a9603ab3aaa1184e366acbefb92e8b724c4b0910af1b7690abb645e3283e959243ec9482d5ba3e26bffff2467
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlQ3H+lfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDvawD9EgztMgxTYEj7x6GV7G5/ljcn
-g6oaYqB2YyvTsTmKDYwA/0WxEA/jr9rGTqsZz62y44L5m7aPSBA8kgka1PQD3No2
-=A6Li
+iEYEAREIAAYFAlQ3fTMACgkQVWmRsqeSphPT5QCfXmHlkhcIm6g75LPg5dr5RFmo
+SlIAn3qulLxb8hIkSroDgErGh5mkRCKp
+=vwPj
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild b/dev-util/cppcheck/cppcheck-1.65-r1.ebuild
index 089efb8ec4a1..d76216bb5289 100644
--- a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.65-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.65-r1.ebuild,v 1.1 2014/10/09 23:16:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild,v 1.2 2014/10/10 06:31:14 jer Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals || die
-	epatch "${FILESDIR}"/${PF}-tinyxml2.patch
+	epatch "${FILESDIR}"/${P}-tinyxml2.patch
 	emake dmake \
 		CPPFLAGS="${CPPFLAGS}" \
 		CXX="$(tc-getCXX)" \
diff --git a/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch
deleted file mode 100644
index e694efa95458..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -81,15 +81,15 @@
- endif
- 
- ifndef INCLUDE_FOR_LIB
--    INCLUDE_FOR_LIB=-Ilib -Iexternals -Iexternals/tinyxml
-+    INCLUDE_FOR_LIB=-Ilib 
- endif
- 
- ifndef INCLUDE_FOR_CLI
--    INCLUDE_FOR_CLI=-Ilib -Iexternals -Iexternals/tinyxml
-+    INCLUDE_FOR_CLI=-Ilib 
- endif
- 
- ifndef INCLUDE_FOR_TEST
--    INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals -Iexternals/tinyxml
-+    INCLUDE_FOR_TEST=-Ilib -Icli 
- endif
- 
- BIN=$(DESTDIR)$(PREFIX)/bin
-@@ -226,7 +226,7 @@
- 	$(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS)
- 
- reduce:	tools/reduce.cpp
--	$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp
-+	$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib lib/*.cpp
- 
- clean:
- 	rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce cppcheck cppcheck.1
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-r1-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch
index cb5a4ae401e2..cb5a4ae401e2 100644
--- a/dev-util/cppcheck/files/cppcheck-1.65-r1-tinyxml2.patch
+++ b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch