Clean up patches.

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

4 files changed, 22 insertions, 8 deletions

diff --git a/net-analyzer/cbm/ChangeLog b/net-analyzer/cbm/ChangeLog
index c69b4b6f2682..0996ce561d50 100644
--- a/net-analyzer/cbm/ChangeLog
+++ b/net-analyzer/cbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cbm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.2 2012/11/03 08:41:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.3 2012/11/07 16:56:04 jer Exp $
+
+  07 Nov 2012; Jeroen Roovers <jer@gentoo.org> files/cbm-gcc-4.3.patch,
+  files/cbm-gcc-4.7.patch:
+  Clean up patches.
 
   03 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> cbm-0.1.ebuild,
   +files/cbm-gcc-4.7.patch:
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index f105ebe86a60..9a7ed96baf67 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -1,6 +1,16 @@
-AUX cbm-gcc-4.3.patch 232 SHA256 5f0bc84c4efe9f5afc2a1562351c534bf4b8e08d6af66eaddb996195a83b5359 SHA512 3078f2f616c5fcd874368e670025acda7cef8702d0b53299146c00db99a2c6c105e48163c6f9e2f32a5c3b8b3f9179b6eac5d63121c3a57a830011c48e8c6c2b WHIRLPOOL 17641a01ea8518691f7ff78f3c1ab1979be7c4b80090fe193144042bd9940d910a1e74ecad789d2fbcb640e889f6a4da820d2ffb072c126afcec6fcb5f2b6af4
-AUX cbm-gcc-4.7.patch 268 SHA256 570122103f5505920d926a3ae45087ebc6c549a15d9c6040b354c1f2cbc5d695 SHA512 5d6b5e5ed938fcaf44678c64723dfdbdef15caf459bc5aff7c0eea05d200bc9cae04ab126743eb4f0c1f5c4ff8a9aeabb86ab3b1e9c2698ee9832457c2e8085a WHIRLPOOL eb0b1efd3758f45794ea74ee44b5c3b5321ac7caad92c36e989c3501e303161aaef54b46e6091e64e8c50a5c9771d7541c51ceb393a775af8131bfb3fd2318bc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cbm-gcc-4.3.patch 159 SHA256 393e5c42d2692c0e3445a3f670d35f438fe1e8a00dd26ee97e1aaac9f2edcfff SHA512 9ba1cb68e4b48f3c5035254e88cebab7702b97739537d892f42a256635cfc692026c26b0325084b2fbbb15a865390c30167119c7bac9362076f18e416afef2be WHIRLPOOL 692f084f094248737583688261baf0724d7babc15cfac27f765dda328a47e5b3c2aa611bfaf5decd5d4e29bb595283129006dc90f9d944b27bdbe15d9f6b864d
+AUX cbm-gcc-4.7.patch 195 SHA256 1b885e7271ff3af92c3c6eb1f22f4b0b1dc5e39f77cf80a36494e5556e4e5d7d SHA512 e1d66c6122163509ea247692362230323039f642f6f8cbc06f0023044223875fc9567a20c7dbdf5651313dc76a0033aa14118c5abe8aa8196ab90991c90d348d WHIRLPOOL ced79a512d16da2e9effae2b23c10750a3f92ba158f2655e412dd3d5c2c319d7386b4aa3693249708453f77dd10fd4e8767ea2122f181dce4f62b48b748e2061
 DIST cbm-0.1.tar.gz 310247 SHA256 fa44b4b53218ddcfc0f3e7539a1a232485bdb0a574c4a07a084a262d938f3c7b SHA512 24bf6a4d68fed253977b965d7e5b6aff4fb9db502c47b4a2b3b36f8c2963c9648b78ae607e9753fe4792a73ddbc29b86b3a1acc3c431a9355b11ff348566add4 WHIRLPOOL 22779c8332d2729ebf138a504fd81fa1bebe1295aa7c0ff9806bb545f868e9622038a447a59610e04c62cbf99e473cbf0bb365517ae6c8c018881c8733294aed
 EBUILD cbm-0.1.ebuild 665 SHA256 925d52157cd6d1e815d6ae13cb01abb918b91ce9266026fd56fe1d601317011c SHA512 2c39247adf10d4f4cef6417aa5b208b8534ebe8ed38b01f30d5de15167c207b0a78de3d552575c78b8614cd37752c10595ac6ec5c7b7ca006f0db4e089e6757e WHIRLPOOL ca9e3c6917ea9441fe3c3b73938ccf84b7964a132bc8ecd7472e1aa92e3547f3d42441dcdcf4d1fd04ae09ec5f651a60923639ff2efd0a57975440e18d043907
-MISC ChangeLog 595 SHA256 94a042756ee5f0066a36c4c48d716ff2062f11e5415c26fb0b48188eae887024 SHA512 22fcfd88cbebb20e9b96caa9b26097c66b01c5cf7469cc99aaed92f47eb3957a42b5bf375605405b106c0ba6ef154baea83c47bc714f8eed1fca134994557cc6 WHIRLPOOL 7b987e0d58a3ba266907ae027c234f8c8bf85d63624b605e3be8e7c116e45e55fc4d57e4ee7541363b41702d2cc170e1e23fe8a4b2b7a22c0535a1658a4a83fe
+MISC ChangeLog 710 SHA256 0a62c602f004de519e07a295a5c1d2d9784999c3e9f0cca7a6a3301563699591 SHA512 28d10d9c0afe236a9597582390d90b5930ee82e0854b9c86964b067c0fc6114e2097573728fe016d7d3a61443e3ef1997108589d18853cbfe8592e1c4759ee0b WHIRLPOOL 9cb60317766a400352595c839b7820ce9984c20b9cff92b0867d337610514cb894172e2580daec8f5b14ebc5dbdf209c30ffe9271a80b890a9bf12c0504b22be
 MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCakqUACgkQVWmRsqeSphN1GACfVpAXTbo2EEssdMZ1QXSQnspA
+brIAn0INM7MfrN1/YX/XHI2B/ncKi89I
+=zKxt
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cbm/files/cbm-gcc-4.3.patch b/net-analyzer/cbm/files/cbm-gcc-4.3.patch
index e0399db76b67..ae9b58f6e99b 100644
--- a/net-analyzer/cbm/files/cbm-gcc-4.3.patch
+++ b/net-analyzer/cbm/files/cbm-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- src/statistics.hpp.orig	2008-11-07 19:09:29.000000000 +0100
-+++ src/statistics.hpp	2008-11-07 19:09:45.000000000 +0100
+--- a/src/statistics.hpp
++++ b/src/statistics.hpp
 @@ -3,6 +3,7 @@
  
  #include <list>
diff --git a/net-analyzer/cbm/files/cbm-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-gcc-4.7.patch
index 8f3acbed9819..94b50a6877f7 100644
--- a/net-analyzer/cbm/files/cbm-gcc-4.7.patch
+++ b/net-analyzer/cbm/files/cbm-gcc-4.7.patch
@@ -1,5 +1,5 @@
---- src/cbm.cpp.orig	2012-11-03 12:36:00.305615930 +0400
-+++ src/cbm.cpp	2012-11-03 12:36:10.920615253 +0400
+--- a/src/cbm.cpp
++++ b/src/cbm.cpp
 @@ -18,6 +18,7 @@
  #include <sys/socket.h>
  #include <arpa/inet.h>