Add missing lua dependency (#274447).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 172 insertions, 151 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 1972031776ba..956fc4ae8d98 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.80 2009/06/14 10:05:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.81 2009/06/18 00:16:36 mrness Exp $
+
+*ntop-3.3.10-r1 (18 Jun 2009)
+
+  18 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  -files/ntop-3.3.10-external-geoip.patch, files/ntop-3.3.10-gentoo.patch,
+  -ntop-3.3.10.ebuild, +ntop-3.3.10-r1.ebuild:
+  Add missing lua dependency (#274447).
 
 *ntop-3.3.10 (14 Jun 2009)
 
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index ae29bdf3b834..5cafc05ea386 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,8 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ntop-3.3.10-external-geoip.patch 3489 RMD160 b145e935ecf1ae89b74397abcb00845bb481a16f SHA1 36fb1b34333127755152920ba3c24e2f3377378e SHA256 e8b42023e7db97bdfbdd33108d4771dccaf9ea26560cd2c6b2452967ba5423e8
-AUX ntop-3.3.10-gentoo.patch 2137 RMD160 0ac63d77363200ce7fddad9044e7139a4b0ad8bc SHA1 35e97086bd9078ce560d6dd1c0d9bbc2b21f7241 SHA256 0853a6e6fc95dfea13d8037b3743ac2d0ced09be4ad99b2f505f488bb8a7fc18
+AUX ntop-3.3.10-gentoo.patch 5717 RMD160 c3f7479b28ed42f0790f268b0edec048fef8ab1f SHA1 80dff7120c17388d775d6bd95f952996bc2f70ac SHA256 e271b8f6db43809d24785fadddb3bf8fa30de140df618b78d461e071608b900a
 AUX ntop-3.3.9-accesslog-umask.patch 496 RMD160 2b943d82b978f750b1c6f2cea7554c03fa60f439 SHA1 58ffbe0ab35e65adc363902e13cfa004492c5a8f SHA256 c27abc8d0564acf41daae0b0a7e94958597512f6dc0f566cb722efa08c769687
 AUX ntop-3.3.9-external-geoip.patch 3427 RMD160 58487133eafa4c8990eb5960c1f363cdafc34e38 SHA1 f4b77eb17fed29df005a4fcd9b9111ea71c00bba SHA256 462a1f4c4d4260b47f23e63ab008bc7e9ba1c030847fe5f021d27cd51490809a
 AUX ntop-3.3.9-gentoo.patch 1742 RMD160 560fca4b581215cb288178bf7b6e6d3b5822c754 SHA1 734f7392b38fe243800bfb6887b673543f14387d SHA256 2013f7124c5bd9c3f13202ef46eb7b49f3f01257ad62e91239796ae2b6f37a75
@@ -11,14 +10,14 @@ AUX ntop-initd 747 RMD160 cc62a0f68e7c27e63acaf55283784ab581a79ab9 SHA1 bf1ea42a
 AUX ntop-update-geoip-db 490 RMD160 d56f574c01820c137ea12ca14aebc6257d405649 SHA1 f679f00928dca20c20a606602ca89f4f8bc7d5b3 SHA256 d3d0a5ee2265301af049975130e2339ad0f408b001e8d83a68b8b98704ed0114
 DIST ntop-3.3.10.tar.gz 3235500 RMD160 85e73de0d7db041d12ae8d77a832b6ed199b6f4b SHA1 8c6b5024a99e73241abd1c831f5ea241b67d0dbf SHA256 aa18ba3acb564d707521deaa2655f61f5b617d98d4fb5a014553f3fa123f123a
 DIST ntop-3.3.9.tar.gz 4955257 RMD160 3d7b14bff99a6652ae83fb86a2cda3206cc3392c SHA1 77c1976d096709c6e45dcfe4befc2045cf83774b SHA256 606c027d02cdaab7de87475bef8be168e9f18329c2215ac21a518766aa8a331f
-EBUILD ntop-3.3.10.ebuild 3419 RMD160 f182eda399e98215276a9228ab1fe0d609a58320 SHA1 ec7e67d749774e90db5ff37630c6a07dd45a1e98 SHA256 cde96b5e2034a782e14f1a1e08e2eaa2ca9302f3ddc2df96ecfd4bec254393ff
+EBUILD ntop-3.3.10-r1.ebuild 3396 RMD160 7cf3be5ff9eafe5559db3a00dfb38a7352f49e2e SHA1 6fe609d05ecdd283e35d42c148cc5a1077b9bd65 SHA256 a225f0810dd5156b40e713ddd969aa9ae4394742837be504dd4916dae11ab81c
 EBUILD ntop-3.3.9-r2.ebuild 3441 RMD160 6c5766595a9c919c189129c47563fc9551a046ab SHA1 828bbe8bcf857c6a9d34b78dc628a0eca82b694f SHA256 3a72db0cf40a22c343982b7d7272cf39ecd1634cd8f85d7f5c29c3ead317d5b9
-MISC ChangeLog 11291 RMD160 61e6667a89b62282820f65eb4f5d91bcbb32ed22 SHA1 649bc85a9396f9da1123b3b478945a4d1f651dcd SHA256 250fce3021d7d8fc6daef7b02170dee8a606776c628b43423f0f567ca58977cd
+MISC ChangeLog 11533 RMD160 ba3e98d2ae381185b8ce9a17e51ae957fec4c176 SHA1 2b7dc8e8d4846e613ad33cad063eba442f70f8c5 SHA256 6a8782f8fae158d7657c8592acec98a97ba14d8b0b139bf958bd4f87185a4c2f
 MISC metadata.xml 824 RMD160 a154081a070f768b186bfb77031dd77b1cf5aaea SHA1 bb97f483589129a9ed66374359cf367e266d1d5d SHA256 b256de7da036de4fe73823e20e25da4bac70c9f50f58a326dad39f6619f7a624
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko0560ACgkQts85UDFmaOVLaACcDliGeC3crYN27E+CKEn55Vji
-gJ0AniyQiK7/QJ1HDTsxbT6K1WYO2z7J
-=6v8Z
+iEYEARECAAYFAko5h3oACgkQts85UDFmaOWCpwCfRU/FQFUdU6AMRskBWRaueL4y
+BOIAn026QRf0c+KcNmNbbHr7dTROxtaM
+=uIx/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/ntop-3.3.10-external-geoip.patch b/net-analyzer/ntop/files/ntop-3.3.10-external-geoip.patch
deleted file mode 100644
index c8ad557a10b6..000000000000
--- a/net-analyzer/ntop/files/ntop-3.3.10-external-geoip.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Nru ntop-3.3.10.orig/configure.in ntop-3.3.10/configure.in
---- ntop-3.3.10.orig/configure.in	2009-06-14 09:49:59.000000000 +0000
-+++ ntop-3.3.10/configure.in	2009-06-14 10:01:27.000000000 +0000
-@@ -1959,39 +1959,7 @@
- fi
- 
- dnl> GeoIP (http://www.maxmind.com/)
--if test -f "GeoIP.tar.gz"; then
--   echo "GeoIP already present on this machine"
--else
--   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--fi
--tar xvfz GeoIP.tar.gz
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
--# OSX Fix
--GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--if test -f $GEO_DYLIB; then
--   ln -s $GEO_DYLIB .
--fi
--
--if test -f "GeoLiteCity.dat"; then
--   echo "GeoLiteCity.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--   gunzip GeoLiteCity.dat.gz
--fi
--
--if test -f "GeoIPASNum.dat"; then
--   echo "GeoIPASNum.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
--   gunzip GeoIPASNum.dat.gz
--fi
--
--
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
--CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
-+LDFLAGS="$LDFLAGS -lGeoIP"
- 
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
- 
-@@ -2157,7 +2125,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-3.3.10.orig/globals-core.c ntop-3.3.10/globals-core.c
---- ntop-3.3.10.orig/globals-core.c	2009-04-17 20:27:57.000000000 +0000
-+++ ntop-3.3.10/globals-core.c	2009-06-14 11:50:53.000000000 +0000
-@@ -503,19 +503,18 @@
-   struct stat statbuf;
- 
-   /* Initialize GeoIP databases */
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
- 		  CONST_PATH_SEP, GEO_IP_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
--	break;
-       }
-     }
-   }
-@@ -525,19 +524,18 @@
-   
-   /* *************************** */
- 
--  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
-+  {
-     char path[256];
-     
-     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
- 		  "%s%c%s",
--		  myGlobals.configFileDirs[i], 
-+		  myGlobals.dbPath, 
- 		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
-     revertSlashIfWIN32(path, 0);
- 
-     if(stat(path, &statbuf) == 0) {
-       if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
- 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
--	break;
-       }
-     }
-   }
-diff -Nru ntop-3.3.10.orig/Makefile.am ntop-3.3.10/Makefile.am
---- ntop-3.3.10.orig/Makefile.am	2009-04-17 20:27:57.000000000 +0000
-+++ ntop-3.3.10/Makefile.am	2009-06-14 09:50:14.000000000 +0000
-@@ -76,9 +76,7 @@
- NTOPDATA = ntop-cert.pem \
-            $(ETTER_PASSIVE) \
-            oui.txt.gz \
--           specialMAC.txt.gz \
--	   GeoIPASNum.dat \
--	   GeoLiteCity.dat
-+           specialMAC.txt.gz
- 
- NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
-            html/*.css html/*.dtd \
-@@ -270,8 +268,6 @@
- 
- install: install-recursive
- 
--	cd @GEO_DIR@; make install
--
- 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
- 
- 	@echo ""
diff --git a/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch b/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch
index a4fe7ab3f732..bca3d6ca9b23 100644
--- a/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch
+++ b/net-analyzer/ntop/files/ntop-3.3.10-gentoo.patch
@@ -1,17 +1,6 @@
-diff -Nru ntop-3.3.10.orig/Makefile.am ntop-3.3.10/Makefile.am
---- ntop-3.3.10.orig/Makefile.am	2009-06-14 10:05:37.000000000 +0000
-+++ ntop-3.3.10/Makefile.am	2009-06-14 10:13:28.000000000 +0000
-@@ -45,7 +45,6 @@
- 
- #AM_CFLAGS =
- #AM_LDFLAGS= 
--ACLOCAL_AMFLAGS=-l m4
- 
- DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
- CLEANFILES     = $(DISTCLEANFILES) stamp-h1
 diff -Nru ntop-3.3.10.orig/configure.in ntop-3.3.10/configure.in
---- ntop-3.3.10.orig/configure.in	2009-05-06 14:55:22.000000000 +0000
-+++ ntop-3.3.10/configure.in	2009-06-14 09:48:54.000000000 +0000
+--- ntop-3.3.10.orig/configure.in	2009-05-06 16:55:22.000000000 +0200
++++ ntop-3.3.10/configure.in	2009-06-18 02:08:28.000000000 +0200
 @@ -57,6 +57,7 @@
  dnl>
  umask 002
@@ -32,9 +21,82 @@ diff -Nru ntop-3.3.10.orig/configure.in ntop-3.3.10/configure.in
  PWD=`pwd`
  
  echo
+@@ -1652,22 +1648,7 @@
+ dnl>
+ dnl> Lua - http://www.lua.org
+ dnl>
+-LUA_VERSION=lua-5.1.4
+-if test -f "$LUA_VERSION.tar.gz"; then
+-   echo "Lua already present on this machine"
+-else
+-   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
+-fi
+-
+-tar xvfz $LUA_VERSION.tar.gz
+-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
+-cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
+-#rm -f /tmp/lua.temp
+-cd $LUA_VERSION; make posix; cd ..
+-
+-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
+-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
+-INCS="${INCS} -I${LUA_LIB_DIR}"
++LIBS="-llua ${LIBS} "
+ AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
+ 
+ dnl>
+@@ -1963,39 +1944,7 @@
+ fi
+ 
+ dnl> GeoIP (http://www.maxmind.com/)
+-if test -f "GeoIP.tar.gz"; then
+-   echo "GeoIP already present on this machine"
+-else
+-   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
+-fi
+-tar xvfz GeoIP.tar.gz
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+-# OSX Fix
+-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+-if test -f $GEO_DYLIB; then
+-   ln -s $GEO_DYLIB .
+-fi
+-
+-if test -f "GeoLiteCity.dat"; then
+-   echo "GeoLiteCity.dat already present"
+-else
+-   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+-   gunzip GeoLiteCity.dat.gz
+-fi
+-
+-if test -f "GeoIPASNum.dat"; then
+-   echo "GeoIPASNum.dat already present"
+-else
+-   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+-   gunzip GeoIPASNum.dat.gz
+-fi
+-
+-
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-GEO_IP="$GEO_DIR/libGeoIP/"
+-CFLAGS="$CFLAGS -I$GEO_IP"
+-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
++LDFLAGS="$LDFLAGS -lGeoIP"
+ 
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+ 
+@@ -2161,7 +2110,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-3.3.10.orig/globals-core.c ntop-3.3.10/globals-core.c
---- ntop-3.3.10.orig/globals-core.c	2009-04-17 20:27:57.000000000 +0000
-+++ ntop-3.3.10/globals-core.c	2009-06-14 09:47:43.000000000 +0000
+--- ntop-3.3.10.orig/globals-core.c	2009-04-17 22:27:57.000000000 +0200
++++ ntop-3.3.10/globals-core.c	2009-06-18 02:08:04.000000000 +0200
 @@ -386,7 +386,7 @@
    _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
    _headerSize[DLT_ATM_RFC1483] = 0;
@@ -44,9 +106,84 @@ diff -Nru ntop-3.3.10.orig/globals-core.c ntop-3.3.10/globals-core.c
    _headerSize[DLT_RAW] = 0;
  
    /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
+@@ -503,19 +503,18 @@
+   struct stat statbuf;
+ 
+   /* Initialize GeoIP databases */
+-  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++  {
+     char path[256];
+     
+     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ 		  "%s%c%s",
+-		  myGlobals.configFileDirs[i], 
++		  myGlobals.dbPath, 
+ 		  CONST_PATH_SEP, GEO_IP_FILE);
+     revertSlashIfWIN32(path, 0);
+ 
+     if(stat(path, &statbuf) == 0) {
+       if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
+-	break;
+       }
+     }
+   }
+@@ -525,19 +524,18 @@
+   
+   /* *************************** */
+ 
+-  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++  {
+     char path[256];
+     
+     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ 		  "%s%c%s",
+-		  myGlobals.configFileDirs[i], 
++		  myGlobals.dbPath, 
+ 		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
+     revertSlashIfWIN32(path, 0);
+ 
+     if(stat(path, &statbuf) == 0) {
+       if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
+-	break;
+       }
+     }
+   }
+diff -Nru ntop-3.3.10.orig/Makefile.am ntop-3.3.10/Makefile.am
+--- ntop-3.3.10.orig/Makefile.am	2009-04-17 22:27:57.000000000 +0200
++++ ntop-3.3.10/Makefile.am	2009-06-18 02:08:04.000000000 +0200
+@@ -45,7 +45,6 @@
+ 
+ #AM_CFLAGS =
+ #AM_LDFLAGS= 
+-ACLOCAL_AMFLAGS=-l m4
+ 
+ DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
+ CLEANFILES     = $(DISTCLEANFILES) stamp-h1
+@@ -76,9 +75,7 @@
+ NTOPDATA = ntop-cert.pem \
+            $(ETTER_PASSIVE) \
+            oui.txt.gz \
+-           specialMAC.txt.gz \
+-	   GeoIPASNum.dat \
+-	   GeoLiteCity.dat
++           specialMAC.txt.gz
+ 
+ NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
+            html/*.css html/*.dtd \
+@@ -270,8 +267,6 @@
+ 
+ install: install-recursive
+ 
+-	cd @GEO_DIR@; make install
+-
+ 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+ 
+ 	@echo ""
 diff -Nru ntop-3.3.10.orig/report.c ntop-3.3.10/report.c
---- ntop-3.3.10.orig/report.c	2009-05-21 21:55:11.000000000 +0000
-+++ ntop-3.3.10/report.c	2009-06-14 09:47:43.000000000 +0000
+--- ntop-3.3.10.orig/report.c	2009-05-21 23:55:11.000000000 +0200
++++ ntop-3.3.10/report.c	2009-06-18 02:08:04.000000000 +0200
 @@ -2305,7 +2305,7 @@
    if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
      snprintf(dotPath, sizeof(dotPath), "%s", buf);
diff --git a/net-analyzer/ntop/ntop-3.3.10.ebuild b/net-analyzer/ntop/ntop-3.3.10-r1.ebuild
index 079cc41c0f56..a0e51032517c 100644
--- a/net-analyzer/ntop/ntop-3.3.10.ebuild
+++ b/net-analyzer/ntop/ntop-3.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.10.ebuild,v 1.1 2009/06/14 10:05:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.10-r1.ebuild,v 1.1 2009/06/18 00:16:36 mrness Exp $
 
 EAPI="2"
 
@@ -28,7 +28,8 @@ COMMON_DEPEND="sys-apps/gawk
 	ssl? ( dev-libs/openssl )
 	tcpd? ( sys-apps/tcp-wrappers )
 	sys-libs/zlib
-	>=dev-libs/geoip-1.4.5"
+	>=dev-libs/geoip-1.4.5
+	>=dev-lang/lua-5.1.4"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/libtool-1.4"
 
@@ -69,7 +70,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-external-geoip.patch
 	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
 	eautoreconf
 }