Revision bump to add a patch to make use of an externel antlr. Updated ebuild from bug #187545 thx to Davide Pesavento. Also dropped alpha and sparc keyword, see bug #187186

(Portage version: 2.1.2.12)

5 files changed, 153 insertions, 43 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 8fde46f69147..61a3a792d472 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.63 2007/07/25 18:43:43 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.64 2007/09/06 00:40:27 r3pek Exp $
+
+*fwbuilder-2.1.13-r1 (06 Sep 2007)
+
+  06 Sep 2007; Carlos Silva <r3pek@gentoo.org>
+  +files/fwbuilder-2.1.13-build-with-external-antlr.patch,
+  -fwbuilder-2.1.13.ebuild, +fwbuilder-2.1.13-r1.ebuild:
+  Revision bump to add a patch to make use of an externel antlr. Updated
+  ebuild from bug #187545 thx to Davide Pesavento. Also dropped alpha and
+  sparc keyword, see bug #187186
 
 *fwbuilder-2.1.13 (25 Jul 2007)
 
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.1.13 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.1.13-r1
index 7afc38dadede..7afc38dadede 100644
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.1.13
+++ b/net-firewall/fwbuilder/files/digest-fwbuilder-2.1.13-r1
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
new file mode 100644
index 000000000000..256c5c8e6521
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-2.1.13-build-with-external-antlr.patch
@@ -0,0 +1,63 @@
+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
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.13-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.13-r1.ebuild
new file mode 100644
index 000000000000..88d5d05400fa
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-2.1.13-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.13-r1.ebuild,v 1.1 2007/09/06 00:40:27 r3pek Exp $
+
+inherit eutils qt3
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	nls? ( >=sys-devel/gettext-0.11.4 )
+	~dev-java/antlr-2.7.7
+	>=dev-libs/libxslt-1.0.7"
+
+pkg_setup() {
+	if built_with_use dev-java/antlr nocxx; then
+		eerror "dev-java/antlr can't be compiled with nocxx."
+		eerror "recompile it without that use flag set."
+		die "Need dev-java/antlr compiled without the nocxx use flag set"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-build-with-external-antlr.patch
+}
+
+src_compile() {
+	# we'll use our eqmake instead of bundled script to process qmake files
+	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \
+		|| die "sed configure failed"
+	# prevent install script from automatically stripping binaries - let portage do that
+	sed -i -e 's/s) stripcmd="$stripprog"$/s)/' install.sh \
+		|| die "sed install.sh failed"
+	# documentation will be installed manually using dodoc & doman
+	rm -f doc/doc.pro
+	sed -i -e '/^SUBDIRS = po src doc/s/ doc//' fwbuilder2.pro \
+		|| die "sed fwbuilder2.pro failed"
+
+	econf $(use_enable nls) || die "configure failed"
+
+	# use eqmake to generate Makefiles
+	eqmake3 fwbuilder2.pro
+	for subdir in po src src/res src/tools src/antlr src/gui \
+			src/fwblookup src/fwbedit src/ipt src/pflib \
+			src/pf src/ipf src/ipfw src/parsers; do
+		eqmake3 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
+	done
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake install DDIR="${D}" || die "install failed"
+
+	cd doc
+	dodoc AUTHORS ChangeLog Credits README* \
+		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
+	newdoc ReleaseNotes_${PV}.txt ReleaseNotes
+	doman fwb*.1
+	cd ..
+
+	newicon src/gui/icons/firewall_64.png ${PN}.png
+	make_desktop_entry fwbuilder "Firewall Builder" ${PN} "System;Security;Qt"
+}
+
+pkg_postinst() {
+	echo
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+	echo
+}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.13.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.13.ebuild
deleted file mode 100644
index 7753f09bfcdf..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.1.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.13.ebuild,v 1.1 2007/07/25 18:43:43 r3pek Exp $
-
-inherit eutils
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )
-	>=dev-libs/libxslt-1.0.7"
-
-src_compile() {
-	export QMAKESPEC="linux-g++"
-	export QMAKE="${QTDIR}/bin/qmake"
-
-	econf `use_enable nls` || die
-
-	addwrite "${QTDIR}/etc/settings"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DDIR=${D} install || die
-	insinto /usr/share/pixmaps
-	doins src/gui/icons/firewall_64.png
-	make_desktop_entry fwbuilder "Firewall Builder" "/usr/share/pixmaps/firewall_64.png" "System;Qt"
-}
-
-pkg_postinst() {
-	echo
-	elog "You need to emerge iproute2 on the machine that"
-	elog "will run the firewall script."
-	echo
-}