Removed unused patch.

(Portage version: 2.1.6.8/cvs/Linux x86_64)

2 files changed, 5 insertions, 64 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 580c7f686810..163e11ca9680 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.76 2009/03/08 14:23:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.77 2009/03/17 15:37:35 dev-zero Exp $
+
+  17 Mar 2009; Tiziano Müller <dev-zero@gentoo.org>
+  -files/fwbuilder-2.1.13-build-with-external-antlr.patch:
+  Removed unused patch.
 
   08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   -fwbuilder-2.1.13-r2.ebuild, -fwbuilder-2.1.14.ebuild:
diff --git a/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch b/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch
deleted file mode 100644
index 256c5c8e6521..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur fwbuilder-2.1.13/configure.in fwbuilder-2.1.13_external_antlr/configure.in
---- fwbuilder-2.1.13/configure.in	2007-06-07 03:33:53.000000000 +0100
-+++ fwbuilder-2.1.13_external_antlr/configure.in	2007-07-29 13:38:44.000000000 +0100
-@@ -248,11 +248,31 @@
- 
- AC_LANG_CPLUSPLUS
- 
-+AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH])
-+AC_MSG_CHECKING(antlr)
- HAVE_ANTLR_RUNTIME="1"
--ANTLR_INCLUDEPATH="`pwd`/src/"
--ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
-+HAVE_EXTERNAL_ANTLR="0";
-+if test x$ANTLR_CONFIG = x; then
-+  ANTLR_INCLUDEPATH="`pwd`/src/"
-+  ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
-+  AC_MSG_RESULT(using provided)
-+else
-+  ANTLR_VERSION="`$ANTLR_CONFIG --version`"
-+  if test x$ANTLR_VERSION != x2.7.7; then
-+    ANTLR_INCLUDEPATH="`pwd`/src/"
-+    ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
-+    AC_MSG_RESULT(using provided)
-+  else
-+    ANTLR_INCLUDEPATH="`$ANTLR_CONFIG --cflags`"
-+    ANTLR_LIBS="`$ANTLR_CONFIG --libs`"
-+    HAVE_EXTERNAL_ANTLR="1"
-+    AC_MSG_RESULT(using external version $ANTLR_VERSION)
-+  fi
-+fi
- AC_DEFINE_UNQUOTED(HAVE_ANTLR_RUNTIME, 1)
-+AC_DEFINE_UNQUOTED(HAVE_EXTERNAL_ANTLR, $HAVE_EXTERNAL_ANTLR)
- AC_SUBST(HAVE_ANTLR_RUNTIME) 
-+AC_SUBST(HAVE_EXTERNAL_ANTLR) 
- AC_SUBST(ANTLR_LIBS)
- AC_SUBST(ANTLR_INCLUDEPATH)
- 
-diff -Naur fwbuilder-2.1.13/qmake.inc.in fwbuilder-2.1.13_external_antlr/qmake.inc.in
---- fwbuilder-2.1.13/qmake.inc.in	2007-05-18 04:16:09.000000000 +0100
-+++ fwbuilder-2.1.13_external_antlr/qmake.inc.in	2007-07-29 13:38:44.000000000 +0100
-@@ -11,6 +11,7 @@
- UI_DIR        = ui
- 
- HAVE_ANTLR_RUNTIME = @HAVE_ANTLR_RUNTIME@
-+HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@
- 
- unix {
- 	ANTLR_INCLUDEPATH =  @ANTLR_INCLUDEPATH@
-diff -Naur fwbuilder-2.1.13/src/src.pro fwbuilder-2.1.13_external_antlr/src/src.pro
---- fwbuilder-2.1.13/src/src.pro	2007-06-07 03:33:54.000000000 +0100
-+++ fwbuilder-2.1.13_external_antlr/src/src.pro	2007-07-29 13:38:52.000000000 +0100
-@@ -12,7 +12,10 @@
- # NOTE: 2.1 does not install scripts from src/tools ( fwb_install , fwb_compile_all)
- 
- contains( HAVE_ANTLR_RUNTIME, 1 ) {
--  SUBDIRS += antlr parsers
-+  SUBDIRS += parsers
-+  contains ( HAVE_EXTERNAL_ANTLR, 0 ) {
-+    SUBDIRS += antlr
-+  }
- }
- 
- SUBDIRS += gui ipt pflib pf ipf ipfw