Clean up patches.

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

5 files changed, 36 insertions, 36 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index e3b87fdea63c..3a7bd8ffd7f7 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.118 2014/07/15 17:45:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.119 2014/07/15 18:37:20 jer Exp $
+
+  15 Jul 2014; Jeroen Roovers <jer@gentoo.org> files/ntop-4.0.3-gentoo.patch,
+  files/ntop-4.1.0-gentoo.patch, files/ntop-5.0.1-gentoo.patch:
+  Clean up patches.
 
   15 Jul 2014; Jeroen Roovers <jer@gentoo.org> ntop-4.0.3.ebuild,
   ntop-4.1.0.ebuild, ntop-5.0.1-r1.ebuild:
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index dcc35589ecc3..46af5a6a74f1 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ntop-4.0.3-gentoo.patch 6228 SHA256 b341a031dfc4a01294d14ff8f52fae6cb591173d065a38db894ef031fa7207a5 SHA512 ff053b3995f643417ad38d517a6de5ac9b0771e9d0dcda86aaf6d42c9505bc2201be2b02acd77bf74efa95e2d2e16f2f2081da8e62eb671a30c6fdb7b9873d4b WHIRLPOOL c9d6e8ff09cffc7d37c747894949f0a30c89d3efe77433564d9497ed27101d7202f1ca27a6e570b6cd12a395a594b778f0edcae5213d01396be3484eb86bc238
-AUX ntop-4.1.0-gentoo.patch 7369 SHA256 a7cef4604d239285403b7ec57346088db972c92d4551513665b1d57928f470f0 SHA512 db9dbf8c5e18e6ceddb8d0c6b7dad5f01fbb47225b4b916a4cca7e5f8a61cf5cd33d47f00fcc9f1983e8d2971721000dd4c6558944556fc4721c6fa2a31cd234 WHIRLPOOL 1720e50456a8a0f1ffa3f8e693d8dda9a2171f289482ec728f8d476e7bfe0b4efd12cf18f1d4932a6c92ee209f885bbc6123763ee70eaf4c93e0821e31bc9a38
-AUX ntop-5.0.1-gentoo.patch 6824 SHA256 3fab00d82529e1b24031db2760a5c29d6db9f1365c309403e55cbff835801af7 SHA512 64214fc1d74d16a027c9a9c87fed96182ece62bb327126cb42a0cf0b623297f7f5093c55838e0af2c27f76bbd81de6117ebbd5801173ab487d3b33811f79d188 WHIRLPOOL ae2868d060f071c4c260dd037bc3322737ee03b21001a4e270c79d6f7cd0719f393555ae6fb8deccce51b727faf8baa3d16f4fe5399b22d250269373a6796c4b
+AUX ntop-4.0.3-gentoo.patch 6136 SHA256 86ad86f206cbfaf2a92951ad882d9b8705f4e028e6651e4102ac402321f8df37 SHA512 732e76ad7fe4ee4d3a2d01c15971f985070613d5188c302695fbe1b93910f85f2b46f2bc65e967c85b66807becab20b5459c8d6446ece52ec8883451a5fca155 WHIRLPOOL ab60c9e924899ac22ab33e248f78ac6d63a3cb181c77b1ae130c6d9b7929f893b87a1a10d1cf29e3e586f9b461bf6f4f8a6333ec7af703886392549310510f21
+AUX ntop-4.1.0-gentoo.patch 6735 SHA256 2c28b7c65cce840c6a22c1762f4e296d8c2f00fb91947a90d5ac4b1a757be18f SHA512 33804549d93b116037bab82445a547e541385169df380d95ce9da80e9b272d9b190932ff0a197b281cdf890c77e7d675e892ff458fc4f59a3dd0993551583f46 WHIRLPOOL c1c133dd5a7f8c9dadc7ba6c69dff615ee6e209198f2000c85e1e15aff875a17bf33f9a54f71536171d6bee5a2000c840f4a7166a62957bd01c356134b4ec3ad
+AUX ntop-5.0.1-gentoo.patch 6752 SHA256 cece982d8670c471e38e8b65c85a131a8a6ede31236e02743add5bec233d2418 SHA512 dd8309cd5c24eda0a9bb4a35b5598ff5f9a22b2af36ae9692f13b6254b2d9e624b646dda38610f6552b2694eb18d5946f0623fff76261c1d4e2ef94518fd5c69 WHIRLPOOL d7e88a7d2bb9cc92e81d2f5b019011212a8f88f551fe2fe06cf65b83e394b76ab474f3147f73a0d603e869344e7d0766f5784ad41215ce510a56498fd2cf4a2c
 AUX ntop-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
 AUX ntop-initd 747 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d SHA512 294cf1c0c274f1fbb29804965306be1aee97d98e83a2fd25925ac92398ce9d1f8f617968888842fa6d6d19b0b28f2f29bb9f8fd861067a18cc53ea89c91b0c67 WHIRLPOOL 3f57ec8e287e99d9d4854974d0d3d2566995ebb3b2889a8baed66457c45ac2d645af1dfa3d2e991a740d64465d70a91a5f93ca953ed2971f33d008c61dd45b36
 AUX ntop-initd-r1 787 SHA256 ebb85fa4ecc3686bf3d207eaaa959b6d1942512ccf6e8333a96f95bba3a435d0 SHA512 158071d262cc35213b8ef1e6ff4f3ebff20b180fd427fb103cd80557204c22be52d2d197371ee627ad660645e0674f701346802cb68c97fa9d212a532e8e953e WHIRLPOOL 53cadc62b45339e2b6d0010957e69237893149fc2e9ed504779c63106c491c531a7bfe047e4c8cadbcdd39d3a930a3dab922ecc41af862c3c6478a5141250fd1
@@ -14,12 +14,12 @@ DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84
 EBUILD ntop-4.0.3.ebuild 3499 SHA256 d28c90510f917cf34f48a66409f8919629f5907d935376fcdc801d68cf046072 SHA512 65cee9a6cc9e9b69c3df7c579fd3efa8bcf4e5572f7bf70d5ad601e2e0bfe4237c4879a0388fea4eeb151a1e84a3b66e63ffdec1d4737e14028397fef6f70591 WHIRLPOOL 16aa857c7843abadf12257e1697f44958d8c45a53d87d83f45b12c7023bf1696aaf067680f59a4d1208581d5d65fffd9cf6fccf6734c07126db7b54b00e64121
 EBUILD ntop-4.1.0.ebuild 2628 SHA256 e000639fa49d394f8e489d55e7c0aaffc9adcee7c7c22c98c17c394bf9264e5b SHA512 fdb9e8b0bd5ec55eb54826cec67f8a83939f206b58cf78559a6939c0e0b73a73175821f80983692a32e6c1710b9871bfc71146ee7a2085e2849b00d33792b8b6 WHIRLPOOL 0e2027a33761ab7f724deb307f8f582ae2144dce25d3ba457b463bcf56ffee7900652fccf097e0dc4ecebea1d48d439c5b56e5666326ed59099d30918255eef3
 EBUILD ntop-5.0.1-r1.ebuild 2817 SHA256 a4d878ce07d8c9c9b1819e1c04b5e82c6ec20ada317b3570e8bb8fa3a1775e00 SHA512 c639f795e19596452dbd5d99a017e9fdd2367a7ba884c3baa15cd9287fd536b130fb64c7a6b3d82feea33ff0b02bf9d604edecf1f7e8dd39162d7d60176f7e47 WHIRLPOOL 1cf1f0f3ddd571159ad1ea97a04d2a40ff9d83869f2f38aef814c08faa3b1324ee0acf707d00bb3833d2215247e35ce6ac9f2d26e14ac568172b1b6179bccb09
-MISC ChangeLog 16546 SHA256 ed8ef00df96030f571299e5a4e72d8405edc61591533c0654cac5f404fec6b3e SHA512 f2c3486e725885f90306ab8838747833cfe72235817253d84fd6ccfc51830c8705675ac0a7005925d7184e0f6bca9e5c10ebcb58448728246ddbe2b8dd61403c WHIRLPOOL b800162eae3ed0d6841dd66a4f4318af348d00892b1147e776261aaa84e0f0130589ce712ddee05c7189c854894df2a9277e380f1082dccbcc9c9b08f3a2d4be
+MISC ChangeLog 16709 SHA256 b9bb03686792f804f3bfc0421c0403f6a9a837c566a018b779d7652c4533ccb3 SHA512 43b5581f20b3b389f2323ad23d2f825e3767bfc6ba4dd0fdb84fa61259b53200135d252be921a9bb87cfe0b26040d26185b65d63d238c29ba18c3eaaac1c045f WHIRLPOOL 7ba0b24d5752b0d6abfd1bc7ddfa119c753947526df4074eaca1431bf4053e6efa169551591c0633c1107e0da3504c928a88be89f640dffaa9e4f8bf273e5b79
 MISC metadata.xml 726 SHA256 8a92db7bc1d416edb070e77e05b334bce2fad523700b1630a4386461fad1713a SHA512 7b0dfb1be74bff0af9763afc57db89f0f35cae422c5d71a8cfccf8d59999fa73e637486bebbe6a90ab0d613818e996e010a802f07a9f6ff09d2f4c84caf14a00 WHIRLPOOL d31605fc7a98a13efc6bee0509fa9afc067bb9a2be838c545f8e9da2a21f2abbab5febaee849ce903d55beb1cff7d1dbe8eb2d63c4e6d08def2d4282a6469eff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPFaMoACgkQVWmRsqeSphMuKQCdFDsMG0Kff0EzL6X4hDK7RTGQ
-3SoAnRcI84GnavrybpJFkho66133FAnS
-=p1zq
+iEYEAREIAAYFAlPFdOEACgkQVWmRsqeSphNt2ACcC0FhkLb02UMg9RuHymzjM0H7
+9ycAnjhDnaddY003+gjrLxo1B3cPdqfj
+=D2Fa
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
index 5de51c016c2b..6cd03512adf9 100644
--- a/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
@@ -1,5 +1,5 @@
---- ntop-4.0.3.orig/configure.in
-+++ ntop-4.0.3/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -57,6 +57,7 @@
  dnl>
  umask 002
@@ -63,8 +63,8 @@
  AC_SUBST(GETOPT_H)
  AC_SUBST(GETOPT_C)
  
---- ntop-4.0.3.orig/globals-core.c
-+++ ntop-4.0.3/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
 @@ -372,7 +372,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
@@ -119,8 +119,8 @@
        }
      }
    }
---- ntop-4.0.3.orig/Makefile.am
-+++ ntop-4.0.3/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -43,7 +43,6 @@
  
  #AM_CFLAGS =
@@ -219,8 +219,8 @@
  
  # ntop census
  census-fail:
---- ntop-4.0.3.orig/report.c
-+++ ntop-4.0.3/report.c
+--- a/report.c
++++ b/report.c
 @@ -2353,7 +2353,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch b/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
index 45d73be16486..10b93b92e90d 100644
--- a/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru ntop-4.1.0.orig//configure.in ntop-4.1.0/configure.in
---- ntop-4.1.0.orig//configure.in	2011-08-15 10:34:28.000000000 +0200
-+++ ntop-4.1.0/configure.in	2011-11-08 23:22:13.000000000 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -469,11 +469,6 @@
      LOCALEDIR="/usr/lib/locale"
  fi
@@ -54,9 +53,8 @@ diff -Nru ntop-4.1.0.orig//configure.in ntop-4.1.0/configure.in
  AC_SUBST(GETOPT_H)
  AC_SUBST(GETOPT_C)
  
-diff -Nru ntop-4.1.0.orig//globals-core.c ntop-4.1.0/globals-core.c
---- ntop-4.1.0.orig//globals-core.c	2011-03-03 22:00:04.000000000 +0100
-+++ ntop-4.1.0/globals-core.c	2011-11-08 23:22:13.000000000 +0100
+--- a/globals-core.c
++++ b/globals-core.c
 @@ -367,7 +367,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
@@ -111,9 +109,8 @@ diff -Nru ntop-4.1.0.orig//globals-core.c ntop-4.1.0/globals-core.c
        }
      }
    }
-diff -Nru ntop-4.1.0.orig//Makefile.am ntop-4.1.0/Makefile.am
---- ntop-4.1.0.orig//Makefile.am	2011-03-03 14:44:59.000000000 +0100
-+++ ntop-4.1.0/Makefile.am	2011-11-08 23:22:42.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -36,7 +36,6 @@
  
  #AM_CFLAGS =
@@ -230,9 +227,8 @@ diff -Nru ntop-4.1.0.orig//Makefile.am ntop-4.1.0/Makefile.am
  
  # ntop census
  census-fail:
-diff -Nru ntop-4.1.0.orig//report.c ntop-4.1.0/report.c
---- ntop-4.1.0.orig//report.c	2011-06-29 18:29:46.000000000 +0200
-+++ ntop-4.1.0/report.c	2011-11-08 23:22:13.000000000 +0100
+--- a/report.c
++++ b/report.c
 @@ -2091,7 +2091,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
index dee04ed96de8..57f136971cfc 100644
--- a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -1,5 +1,5 @@
---- ntop-5.0.1/configure.in
-+++ ntop-5.0.1/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -469,11 +469,6 @@
      LOCALEDIR="/usr/lib/locale"
  fi
@@ -53,8 +53,8 @@
  AC_SUBST(GETOPT_H)
  AC_SUBST(GETOPT_C)
  AC_SUBST(NDPI_LIB)
---- ntop-5.0.1/globals-core.c
-+++ ntop-5.0.1/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
 @@ -369,7 +369,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
@@ -109,8 +109,8 @@
        }
      }
    }
---- ntop-5.0.1/Makefile.am
-+++ ntop-5.0.1/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -36,7 +36,6 @@
  
  #AM_CFLAGS =
@@ -227,8 +227,8 @@
  
  # ntop census
  census-fail:
---- ntop-5.0.1/report.c
-+++ ntop-5.0.1/report.c
+--- a/report.c
++++ b/report.c
 @@ -2299,7 +2299,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);