Version bump (fixes bug #430428). Removed old

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 192 insertions, 194 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index f32418b051ca..1ab3a4a09573 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.115 2013/03/10 01:38:36 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.116 2013/07/04 12:47:51 polynomial-c Exp $
+
+*ntop-5.0.1 (04 Jul 2013)
+
+  04 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -ntop-4.0.1.ebuild,
+  +ntop-5.0.1.ebuild, -files/ntop-4.0.1-gentoo.patch,
+  +files/ntop-5.0.1-gentoo.patch:
+  Non-maintainer commit: Version bump (fixes bug #430428). Removed old.
 
   10 Mar 2013; Christoph Junghans <ottxor@gentoo.org> ntop-4.0.1.ebuild,
   ntop-4.0.3.ebuild, ntop-4.1.0.ebuild:
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index b4af3e2ec3f3..6617a1fb69cf 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,28 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ntop-4.0.1-gentoo.patch 6996 SHA256 896d844bfcfb05030aa307152abcd9c177f058ee9f7db2fb3a01e15dbda43204 SHA512 bbe069754adbbe00ff3d8650de88b3eb4d8861e02766d2acceafd433570f0f7af607e9139a658c5eb99c387624019c1fdd83bff05ddc864645d1996587c6fba2 WHIRLPOOL 6db3b4fecb57261eb4d49bd5db8bfde7adb330cc648af9fcb6e0e87eef8aa4fc9b9e3e46903d0b205c650dd26f8f44c4eb609c37a59f914b8ffa72f5723ecfc1
 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-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
 AUX ntop-initd 747 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d SHA512 294cf1c0c274f1fbb29804965306be1aee97d98e83a2fd25925ac92398ce9d1f8f617968888842fa6d6d19b0b28f2f29bb9f8fd861067a18cc53ea89c91b0c67 WHIRLPOOL 3f57ec8e287e99d9d4854974d0d3d2566995ebb3b2889a8baed66457c45ac2d645af1dfa3d2e991a740d64465d70a91a5f93ca953ed2971f33d008c61dd45b36
 AUX ntop-update-geoip-db 492 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 WHIRLPOOL d96c2fa39287ed6e0ac8b76a5c09ff4485305328bfd61fd738ff82a09cde0a8f0be76474d0c5bc95f0a55aa212b092f2e7b7a3bf3d8e6ee2ec1e88f246653e78
-DIST ntop-4.0.1.tar.gz 39184538 SHA256 5b8d393246e423e434532a4de79fe4f08191b98c451d76a4ede251302fd4f56d
 DIST ntop-4.0.3.tgz 39191671 SHA256 5b34b64fa4aebaeb365b2f255b2bbeb0a487686f49e85680789070d1c2404dc0 SHA512 48734b8c2fcb5c8efb9917836702b6407cca568cfd715c1cab98b8f4eaba2aa43491414132a94019d4619400b7e02a2232abd0a60cb2dbc413c6fbe6472f7f2f WHIRLPOOL c7bc59a010fd6792110eead7a6fe6cbeb401d7d38fd47a440d66091f3c317a7d80d2685bcb5e129db3267ef691908e4363c2ed3dfbff9c58578e272c420541a7
 DIST ntop-4.1.0.tar.gz 39118983 SHA256 c71e5563879ec1866296825e1705f30b5a67eb87c9abfbd7dc1c5baeed0384a4 SHA512 6759ef6396768b33db96db20ceb907f9d8a5e3421c920d277e043bec85eb1fb38e41b7c88e189e7dd316a02c627aa4c4ea9295beee8cd890ac09b5d8b161a579 WHIRLPOOL ae5616bf29a002d02273fcb436fd3b869ec6fcb7c3d10a61097f72aabe68240232f8aff9b533300baa76fc2096900902dfd900f95142c334c61f5cd425e543a7
-EBUILD ntop-4.0.1.ebuild 3492 SHA256 ed386120a63542706d7526bdd4ab095d2611cff93d58505e723637a9b3f5ece0 SHA512 40156b19c3a1efcba74f8eb20942b329d183aedf17ec12b0064b0f0514282b28e8fbfc8e96c14972e56b322f6fc1a625c2188b889c148ed8ecebf5786347791b WHIRLPOOL 7a11b31af8fad6a2df1b5fcbb798eb6ce22e53ea0d70972855da95fb8d9064cb5a6d5ddd01a8ec3d74f7e4ba0c9a422bc074c70ca79d91a8dcb727ef275b7d5e
+DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee
 EBUILD ntop-4.0.3.ebuild 3495 SHA256 f5be31321d796e65fca8722d1af92d53cd1eb302802b6136e897328c82916b97 SHA512 f11aea1c238ba115bb1c04178b6ba3c90287eaf174b75ea6c8403c014d25b19f48cb7ab6ff83aff1aa61a38d4aaad852e53cfc0621251f0434213da375a28b46 WHIRLPOOL 40c39b78a26a6222db10445b7905f295c270ef5681bf5af8338b2c8d5f364fdc17036f520893666d6f8e3829cdd10d2fed110132e8e32640c1c6bb41e922dca4
 EBUILD ntop-4.1.0.ebuild 2624 SHA256 cd4f33565d249315448b7554b2ac932a7a67fa558d2eee5d6b78e55145319256 SHA512 cf5da917ac0d5bab4c518c754a1e4885803847f205d2b710e15b45e14cdd7dc440704031294c7a1297a0d17748b31dc2740977f0104c196a4eccd5d41e5183b4 WHIRLPOOL d24cfc92ef87fce8da4348fcd0febc0312dfc3b23223c38ec75a29d548ef7828572a9a1af87e0e34295c034426c6e3d7083d87b9ef4a9ec5f185fc94d77bbac8
-MISC ChangeLog 15888 SHA256 e755b16a1e3c3f1580bae7bdbfe44c4230d2feea76eba9d30575da2f87f24aa1 SHA512 ca2f4fe43f1be882b7ed93a13470dbfcda754878f83d356c1d25d2fe33ceae44dd7eeffafaae858b3d5f33056be38591b06c944858ddd62c3676ea51e371338c WHIRLPOOL 0016e68abb10afe71c74b020d959225956873597ed6350031df51e634eceb7d4f2e87c97419063f20d82ab4901a1bab5153c2fbe095aeeb70671676bcfba212a
+EBUILD ntop-5.0.1.ebuild 2774 SHA256 98981638385b414c754d9c59eeca22a6cdff28e5a915ec6aea2654625dc39ef9 SHA512 2a1ef28a2df8b72bc4ddb0a566c5fabf3045ef30ba8001ba8d5bf54b9e41bf9c8e39771a0496fcc2f774be39b008f4c6938f7c528c4baa5eeeb3b400c46fecbf WHIRLPOOL b3b17f8838d3e552754392a8b50544532b2acf6341b2d1432a9a5f11ad50573dbe868ed2dbc54a757e005f289b9632e322d704fe9fbf7c880e82e94014a83ba0
+MISC ChangeLog 16156 SHA256 301c947a2347ed04352e22b9952d8e1b81663e16be29e074eb42ebfa4a6604fd SHA512 2230d35aae16c488833f441b4d94fa24942b1a90fe1a8ec650dbfa2e4c0c427e7dfdbb2824ce30758779794dc220503eef7dd1d18f5a02f53e5e1d8c31833347 WHIRLPOOL 5234c46cdc9b07c29b7d48b657a379856a0d42af91c68e0356928da3ef263844dd401d3d004bb804332ebb7a695660856e3a6be1baf6374613aae0932b7d4a7d
 MISC metadata.xml 726 SHA256 8a92db7bc1d416edb070e77e05b334bce2fad523700b1630a4386461fad1713a SHA512 7b0dfb1be74bff0af9763afc57db89f0f35cae422c5d71a8cfccf8d59999fa73e637486bebbe6a90ab0d613818e996e010a802f07a9f6ff09d2f4c84caf14a00 WHIRLPOOL d31605fc7a98a13efc6bee0509fa9afc067bb9a2be838c545f8e9da2a21f2abbab5febaee849ce903d55beb1cff7d1dbe8eb2d63c4e6d08def2d4282a6469eff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRO+QeAAoJEOeBhlrCAAWGFw8H/0agOg36TYQzq1CRcWyPPZyI
-vOkt+V2+sBtk0ik6hB9AXbGUR9mYe0PwPISvkSvWEMP+4BG5n7dcBBpnVyDpmdE+
-yNHjdmMfR1Gr3RCP0WtnnmJluCcbX/ghVPzFRbjtw4tYgPVswDncfjp4N83ZanIP
-fw20esWs6QH8LF7bUtwSVSn9qZQefTy/19mslHvbFkqRjF2wmqVEt7sVtV+47Cpd
-NLkeR1K4K6aIQY65hJ/Mmi9UO1Q4SiMch1gz5N7LMmQkGCxl41mclA+WWdSr4sB5
-tm51Q+wVfDr5KENB5LdDwRr+12inZjWDjy/j1MwkAnEzDmf5LO3emyt/o3wjVCQ=
-=uWj5
+iQIcBAEBCAAGBQJR1W74AAoJEPiazRVxLXTFDnoP/3uKZI+5WVs0T3WWMrB01Ggu
+SKZUFbTgjJgBovu0kWfP0EnvBE85SjkBnnnyf5xaou2j8vCANXRJAmE03AfQwxJU
+TUhAtg1f8S7jydGQzmGY38xgtwzNgCDQXiN2tIghRRFALaYknhULpHQsO0nqGm62
+/ottwo9bYfI2Hc4wmO0qpWpIFT3uThUQZpVqheq1utyT/h0AcgClvM5yM4yktj4v
+sSBAerBCGhlNQBbovbBy+e2P9qJTU6XY5IXymQ6GItW/FJmg478x4ZSRdNECLpze
+XlAhzQp0C+PbMhm6xFgQVQybu3lAM/ya/MgDvT3oT03sAMlDKWPN0W1TAFdOWjbF
+iR2AqSjQ4iR+1oAFZro+5aj9HwnrRwcBfCPY6AHXCzMn8vlUISaYzEZ+UY5VZUdb
+LW7D52trqwTuer5NuJEf866TuekhxJEUfLoGTbECSXRYq/omBYNGkpFbN5WbFeqE
++S0ZD5N0wBxGob/UVPHpoQ4BkR6aOK5Rt9Z/jk4L82ltPrd3ozCwI6oF2aKUuTaj
+ICKktztMYh7xLcOwkAWZpT2L8Tk8NyojauScTGJ/zJgRXjSGFnz7YCvAjNgNe5+k
+lS0xJnRfgXIli6hBOZ2eLMFa9N5PReVHaPk1fQ77VxKcjTEqfr9z/hDNpOkHXi/x
+dPc0FbwVQwRx6LUVOBEm
+=Yr22
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
index a68c664d2994..dee04ed96de8 100644
--- a/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -1,15 +1,6 @@
-diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
---- ntop-4.0.1.orig/configure.in	2010-08-07 00:44:41.000000000 +0200
-+++ ntop-4.0.1/configure.in	2010-09-24 01:42:46.000000000 +0200
-@@ -57,6 +57,7 @@
- dnl>
- umask 002
- AM_CONFIG_HEADER(config.h)
-+AM_MAINTAINER_MODE
- 
- HAS_ERROR=
- HAS_WARNING=
-@@ -497,11 +498,6 @@
+--- ntop-5.0.1/configure.in
++++ ntop-5.0.1/configure.in
+@@ -469,11 +469,6 @@
      LOCALEDIR="/usr/lib/locale"
  fi
  
@@ -21,11 +12,10 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
  PWD=`pwd`
  
  echo
-@@ -1809,39 +1805,17 @@
- 
+@@ -1739,18 +1734,6 @@
  if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
  LIBS="$LIBS -lGeoIP"
--
+ 
 -if test -f "GeoLiteCity.dat"; then
 -   echo "GeoLiteCity.dat already present"
 -else
@@ -38,27 +28,15 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
 -   gunzip GeoLiteCity.dat.gz
 -fi
 -
--dnl> --------
--
--if test -f "GeoIPASNum.dat"; then
--   echo "GeoIPASNum.dat already present"
--else
--   if test -f "3rd_party/GeoIPASNum.dat.gz"; then
--     cp 3rd_party/GeoIPASNum.dat.gz .
--   else
--     wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
--   fi
--
--   gunzip GeoIPASNum.dat.gz
--fi
- else
- AC_MSG_RESULT(Please install GeoIP (http://www.maxmind.com/))
+ dnl> --------
+ 
+ if test -f "GeoIPASNum.dat"; then
+@@ -1769,8 +1752,11 @@
  exit 1
  fi
  
 -cp "3rd_party/oui.txt.gz" .
 -cp "3rd_party/specialMAC.txt.gz" .
-+gunzip 3rd_party/GeoIPASNum.dat.gz &&
 +gunzip 3rd_party/GeoLiteCity.dat.gz &&
 +mv "3rd_party/etter.finger.os.gz" . &&
 +mv "3rd_party/oui.txt.gz" . &&
@@ -67,27 +45,26 @@ diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in
  
  if test -d ./configureextra; then
  
-@@ -2002,7 +1976,6 @@
+@@ -1931,7 +1917,6 @@
  AC_SUBST(SO_VERSION_PATCH)
  AC_SUBST(RRD_LIB)
  AC_SUBST(RRD_INC)
 -AC_SUBST(GEO_DIR)
  AC_SUBST(GETOPT_H)
  AC_SUBST(GETOPT_C)
- 
-diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
---- ntop-4.0.1.orig/globals-core.c	2010-04-25 14:52:28.000000000 +0200
-+++ ntop-4.0.1/globals-core.c	2010-09-24 01:42:46.000000000 +0200
-@@ -372,7 +372,7 @@
+ AC_SUBST(NDPI_LIB)
+--- ntop-5.0.1/globals-core.c
++++ ntop-5.0.1/globals-core.c
+@@ -369,7 +369,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
  
 -  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
-+  _mtuSize[DLT_RAW] = 1500                                     /*   raw IP */;
++  _mtuSize[DLT_RAW] = 1500;                                     /*   raw IP */
    _headerSize[DLT_RAW] = 0;
  
    /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
-@@ -491,19 +491,18 @@
+@@ -470,19 +470,18 @@
    struct stat statbuf;
  
    /* Initialize GeoIP databases */
@@ -98,7 +75,7 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
      safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
  		  "%s%c%s",
 -		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
++		  myGlobals.dbPath,
  		  CONST_PATH_SEP, GEO_IP_FILE);
      revertSlashIfWIN32(path, 0);
  
@@ -109,10 +86,11 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
        }
      }
    }
-@@ -513,19 +512,18 @@
+@@ -491,20 +490,18 @@
+     traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
    
    /* *************************** */
- 
+-
 -  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
 +  {
      char path[256];
@@ -120,7 +98,7 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
      safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
  		  "%s%c%s",
 -		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
++		  myGlobals.dbPath,
  		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
      revertSlashIfWIN32(path, 0);
  
@@ -131,18 +109,17 @@ diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c
        }
      }
    }
-diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
---- ntop-4.0.1.orig/Makefile.am	2010-04-25 14:52:28.000000000 +0200
-+++ ntop-4.0.1/Makefile.am	2010-09-24 01:43:07.000000000 +0200
-@@ -43,7 +43,6 @@
+--- ntop-5.0.1/Makefile.am
++++ ntop-5.0.1/Makefile.am
+@@ -36,7 +36,6 @@
  
  #AM_CFLAGS =
- #AM_LDFLAGS= 
+ #AM_LDFLAGS=
 -ACLOCAL_AMFLAGS=-I m4
  
  DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
  CLEANFILES     = $(DISTCLEANFILES) stamp-h1
-@@ -74,9 +73,7 @@
+@@ -67,9 +66,7 @@
  NTOPDATA = ntop-cert.pem \
             $(ETTER_PASSIVE) \
             oui.txt.gz \
@@ -153,7 +130,25 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
             html/*.css html/*.dtd \
-@@ -370,30 +367,7 @@
+@@ -133,7 +130,7 @@
+ 
+ libntop_la_DEPENDENCIES =  config.h
+ libntop_la_LIBADD       = $(BASE_LIBS)
+-libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
++libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
+ 
+ # Archive for http representation, or the 'viewer'
+ libntopreport_la_SOURCES = emitter.c       globals-report.c  graph.c \
+@@ -145,7 +142,7 @@
+ 
+ libntopreport_la_DEPENDENCIES = libntop.la
+ libntopreport_la_LIBADD       = libntop.la $(BASE_LIBS)
+-libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
++libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
+ 
+ man_MANS = ntop.8
+ 
+@@ -367,30 +364,7 @@
  
  # download the vendor information table
  dnvt:
@@ -185,7 +180,7 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  # download the Novell SAP Protocol information table
  #dnsapt:
-@@ -401,45 +375,7 @@
+@@ -398,45 +372,7 @@
  
  # download the passive ethernet fingerprint database
  dnetter:
@@ -232,10 +227,9 @@ diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am
  
  # ntop census
  census-fail:
-diff -Nru ntop-4.0.1.orig/report.c ntop-4.0.1/report.c
---- ntop-4.0.1.orig/report.c	2010-08-07 00:22:05.000000000 +0200
-+++ ntop-4.0.1/report.c	2010-09-24 01:42:46.000000000 +0200
-@@ -2353,7 +2353,7 @@
+--- ntop-5.0.1/report.c
++++ ntop-5.0.1/report.c
+@@ -2299,7 +2299,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
    } else {
diff --git a/net-analyzer/ntop/ntop-4.0.1.ebuild b/net-analyzer/ntop/ntop-4.0.1.ebuild
deleted file mode 100644
index a09dab3db918..000000000000
--- a/net-analyzer/ntop/ntop-4.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.0.1.ebuild,v 1.8 2013/03/10 01:38:36 ottxor Exp $
-
-EAPI="2"
-
-inherit autotools eutils user
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-SRC_URI="mirror://sourceforge/ntop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 ssl"
-#snmp support is disabled
-
-#snmp? ( net-analyzer/net-snmp )
-COMMON_DEPEND="virtual/awk
-	dev-lang/perl
-	sys-libs/gdbm
-	dev-libs/libevent
-	net-libs/libpcap
-	media-libs/gd
-	media-libs/libpng
-	net-analyzer/rrdtool
-	ssl? ( dev-libs/openssl )
-	sys-libs/zlib
-	>=dev-libs/geoip-1.4.5
-	>=dev-lang/lua-5.1.4"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-1.4"
-
-# Needed by xmldumpPlugin - couldn't get it to work
-#	dev-libs/gdome2
-#	>=dev-libs/glib-2"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/corefonts
-	media-gfx/graphviz
-	net-misc/wget
-	app-arch/gzip"
-
-pkg_setup() {
-	# snmp doesn't compile in this release, disabled for now
-	#if use snmp ; then
-	#	ewarn "snmp plugin is under development and upstream does not recommend"
-	#	ewarn "it for usage in production environment."
-	#	if ! use ipv6 ; then
-	#		echo
-	#		eerror "snmp plugin has compilation problems without ipv6 support."
-	#		eerror "For additional information see bug #121497."
-	#		die "snmp without ipv6 is broken"
-	#	else
-	#		if ! built_with_use net-analyzer/net-snmp ipv6 ; then
-	#			echo
-	#			eerror "You have both ipv6 and snmp enabled."
-	#			eerror "This require ipv6 support in net-analyzer/net-snmp."
-	#			eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
-	#			eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
-	#			die "net-analyzer/net-snmp was build without ipv6."
-	#		fi
-	#	fi
-	#fi
-
-	enewgroup ntop
-	enewuser ntop -1 -1 /var/lib/ntop ntop
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
-	eautoreconf
-}
-
-src_configure() {
-	# force disable xmldumpPlugin
-	export \
-		ac_cv_header_glib_h=no \
-		ac_cv_header_glibconfig_h=no \
-		ac_cv_header_gdome_h=no \
-		ac_cv_lib_glib_g_date_julian=no \
-		ac_cv_lib_xml2_xmlCheckVersion=no \
-		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_with ssl) \
-		--with-rrd-home=/usr/lib \
-		--disable-snmp \
-		|| die "configure problem"
-		# $(use_enable snmp)
-}
-
-src_install() {
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	emake DESTDIR="${D}" install || die "install problem"
-
-	keepdir /var/lib/ntop &&
-		fowners ntop:ntop /var/lib/ntop &&
-		fperms 750 /var/lib/ntop ||
-		die "failed to prepare /var/lib/ntop dir"
-	insinto /var/lib/ntop
-	local f
-	for f in GeoIPASNum.dat GeoLiteCity.dat; do
-		# Don't install included GeoIP files if newer versions are available
-		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
-			doins "3rd_party/${f}" ||
-			die "failed to install ${f}"
-	done
-
-	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
-	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
-
-	newinitd "${FILESDIR}"/ntop-initd ntop
-	newconfd "${FILESDIR}"/ntop-confd ntop
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/ntop-update-geoip-db
-}
-
-pkg_postinst() {
-	elog "If this is the first time you install ntop, you need to run"
-	elog "following command before starting ntop service:"
-	elog "   ntop --set-admin-password"
-}
diff --git a/net-analyzer/ntop/ntop-5.0.1.ebuild b/net-analyzer/ntop/ntop-5.0.1.ebuild
new file mode 100644
index 000000000000..d0f91976d288
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1.ebuild,v 1.1 2013/07/04 12:47:51 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils user python-single-r1
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/products/ntop/"
+SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="snmp ssl"
+
+COMMON_DEPEND="
+	virtual/awk
+	dev-lang/perl
+	sys-libs/gdbm
+	dev-libs/libevent
+	net-libs/libpcap
+	media-libs/gd
+	media-libs/libpng
+	net-analyzer/rrdtool
+	ssl? ( dev-libs/openssl )
+	sys-libs/zlib
+	dev-libs/geoip
+	dev-lang/lua
+	snmp? ( net-analyzer/net-snmp[ipv6] )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/libtool-1.5.26
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/corefonts
+	media-gfx/graphviz
+	net-misc/wget
+	app-arch/gzip
+	dev-libs/glib:2
+	dev-python/mako"
+
+pkg_setup() {
+	enewgroup ntop
+	enewuser ntop -1 -1 /var/lib/ntop ntop
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
+	eautoreconf
+}
+
+src_configure() {
+	export \
+		ac_cv_header_glib_h=no \
+		ac_cv_header_glibconfig_h=no \
+		ac_cv_header_gdome_h=no \
+		ac_cv_lib_glib_g_date_julian=no \
+		ac_cv_lib_xml2_xmlCheckVersion=no \
+		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
+
+	pushd nDPI >/dev/null || die
+	econf
+	popd &>/dev/null || die
+
+	econf \
+		$(use_enable snmp) \
+		$(use_with ssl) \
+		--with-rrd-home=/usr/lib
+
+}
+
+src_compile() {
+	pushd nDPI >/dev/null || die
+	emake
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/ntop &&
+		fowners ntop:ntop /var/lib/ntop &&
+		fperms 750 /var/lib/ntop
+	insinto /var/lib/ntop
+	gunzip 3rd_party/GeoIPASNum.dat.gz
+	gunzip 3rd_party/GeoLiteCity.dat.gz
+	local f
+	for f in GeoIPASNum.dat GeoLiteCity.dat; do
+		# Don't install included GeoIP files if newer versions are available
+		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
+			doins "3rd_party/${f}"
+	done
+
+	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
+	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
+
+	newinitd "${FILESDIR}"/ntop-initd ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
+
+	exeinto /etc/cron.monthly
+	doexe "${FILESDIR}"/ntop-update-geoip-db
+}
+
+pkg_postinst() {
+	elog "If this is the first time you install ntop, you need to run"
+	elog "following command before starting ntop service:"
+	elog "   ntop --set-admin-password"
+}