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

Package-Manager: portage-2.1.2.12

6 files changed, 178 insertions, 54 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/Manifest b/net-firewall/fwbuilder/Manifest
index 27a74534b3a6..3dc74346cb4e 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fwbuilder-2.1.13-build-with-external-antlr.patch 2231 RMD160 9356ee2f594189bda1e5b3e9776258ea9358fa9f SHA1 e4c906033690160437b6722038d58ab94b2d36a8 SHA256 8f5e490b90ad1a30104c0103cbd23c6cc66739fb152b0263beea5e56678f8599
+MD5 1a1e27fd3c64f079ec031516bcd36f80 files/fwbuilder-2.1.13-build-with-external-antlr.patch 2231
+RMD160 9356ee2f594189bda1e5b3e9776258ea9358fa9f files/fwbuilder-2.1.13-build-with-external-antlr.patch 2231
+SHA256 8f5e490b90ad1a30104c0103cbd23c6cc66739fb152b0263beea5e56678f8599 files/fwbuilder-2.1.13-build-with-external-antlr.patch 2231
 DIST fwbuilder-2.0.12.tar.gz 1389953 RMD160 7d3ae613ac015650333d2e9f980c8d688e320cd2 SHA1 5947236e365ef085ebebd4fec85935cb99b9b64c SHA256 a1132c207eb8296301b21e6025fe36435354ff9b3a90a6dc18145307b9c9162d
 DIST fwbuilder-2.1.13.tar.gz 1703948 RMD160 56ce94c774605f37fc709ac7ce229c64c7fe4c0c SHA1 00d9b1993224464dfa49581b059c103d11bb16ac SHA256 2060d413fba4b883bfaaa2af29766c6220057be368f7feb6bc3e292dfb5bf316
 EBUILD fwbuilder-2.0.12.ebuild 1067 RMD160 a0260318f8aa1646ca006eadb8a6828db035b861 SHA1 ee3642c2aef1d8cf997f022aa655fbbcebd66fdd SHA256 f809ea706451a15294d030e0b5492bcfc92587e11fe640c492136ef5ec229af7
 MD5 6168a0c1ca26c83650a55591ea73223c fwbuilder-2.0.12.ebuild 1067
 RMD160 a0260318f8aa1646ca006eadb8a6828db035b861 fwbuilder-2.0.12.ebuild 1067
 SHA256 f809ea706451a15294d030e0b5492bcfc92587e11fe640c492136ef5ec229af7 fwbuilder-2.0.12.ebuild 1067
-EBUILD fwbuilder-2.1.13.ebuild 1071 RMD160 508ffad0765590aba606221abe053a0f2c12757b SHA1 52610be548cccef9c211d3d19ae4c27f09a4f92e SHA256 ebd2adce5356e028045c3cbcf471f84f65015a471b24facfb0d91e68ffe2f690
-MD5 7ee5a45ee4099cbe9129be93e21baa41 fwbuilder-2.1.13.ebuild 1071
-RMD160 508ffad0765590aba606221abe053a0f2c12757b fwbuilder-2.1.13.ebuild 1071
-SHA256 ebd2adce5356e028045c3cbcf471f84f65015a471b24facfb0d91e68ffe2f690 fwbuilder-2.1.13.ebuild 1071
-MISC ChangeLog 10348 RMD160 ce0d328b63ddb70b1508c57715186f40e666d7e7 SHA1 618b25e67dd06c6078cb41ce88fc154e7abc8e32 SHA256 e1b1b5ca63aae863573d8411f22b83387171df1c6555c0a17ebe9b0fae90b9dc
-MD5 e31a5ee9d299024541548872022f7cd7 ChangeLog 10348
-RMD160 ce0d328b63ddb70b1508c57715186f40e666d7e7 ChangeLog 10348
-SHA256 e1b1b5ca63aae863573d8411f22b83387171df1c6555c0a17ebe9b0fae90b9dc ChangeLog 10348
+EBUILD fwbuilder-2.1.13-r1.ebuild 2311 RMD160 f38938ff78b28870ff043dd74118f925733eac39 SHA1 ccd76ffdd682678c53060b734a7d03442c9cdede SHA256 2cae972206808c012dacdfcd724464a5d80faa9a66339c10350835a52e98c3d8
+MD5 d78bb0767ff58675cb965a0534d3cae9 fwbuilder-2.1.13-r1.ebuild 2311
+RMD160 f38938ff78b28870ff043dd74118f925733eac39 fwbuilder-2.1.13-r1.ebuild 2311
+SHA256 2cae972206808c012dacdfcd724464a5d80faa9a66339c10350835a52e98c3d8 fwbuilder-2.1.13-r1.ebuild 2311
+MISC ChangeLog 10728 RMD160 a43a2fea7f767be5c14a64cb3511029ca4bbeff5 SHA1 ad4715977b165808fa4b7de7a39c6c83fc2b8838 SHA256 6a84a668d61bda514c2edf5337f8216388633d0fec0a8eb1853eb55e4bef7392
+MD5 7888a82a91be19c23dd51cfdc480db00 ChangeLog 10728
+RMD160 a43a2fea7f767be5c14a64cb3511029ca4bbeff5 ChangeLog 10728
+SHA256 6a84a668d61bda514c2edf5337f8216388633d0fec0a8eb1853eb55e4bef7392 ChangeLog 10728
 MISC metadata.xml 221 RMD160 53b8a5f1a719c020040bb39b48416c4358a3bcfd SHA1 c78a00e362d7c2e938a145e70a08f07bc307a533 SHA256 adc57871d27ab4e3aec6331df8fcd29661f0e00f6edb26915adb8db95610ec77
 MD5 78c1b34edd1399c24d7d9e59212bc17a metadata.xml 221
 RMD160 53b8a5f1a719c020040bb39b48416c4358a3bcfd metadata.xml 221
@@ -19,6 +26,13 @@ SHA256 adc57871d27ab4e3aec6331df8fcd29661f0e00f6edb26915adb8db95610ec77 metadata
 MD5 f5c1dac8d20dbc3728ae0ffd4aa779a5 files/digest-fwbuilder-2.0.12 253
 RMD160 1585ebe523c640205c1bc8bebcd3a405787b1760 files/digest-fwbuilder-2.0.12 253
 SHA256 d1c5b61c4610f9cddfda15d0dc2ad0346fec9d94951758f7062bc932be202027 files/digest-fwbuilder-2.0.12 253
-MD5 c77a2890d89829932435769d1cc261a4 files/digest-fwbuilder-2.1.13 253
-RMD160 dffd204ab3441e43ae6547d547ba66d0e9bf0814 files/digest-fwbuilder-2.1.13 253
-SHA256 c5f070711ec0235c5362acc8e71ea4c373b95ed7a5f3f047e7e6f15873332b1f files/digest-fwbuilder-2.1.13 253
+MD5 c77a2890d89829932435769d1cc261a4 files/digest-fwbuilder-2.1.13-r1 253
+RMD160 dffd204ab3441e43ae6547d547ba66d0e9bf0814 files/digest-fwbuilder-2.1.13-r1 253
+SHA256 c5f070711ec0235c5362acc8e71ea4c373b95ed7a5f3f047e7e6f15873332b1f files/digest-fwbuilder-2.1.13-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG30z8ttk+BQds59QRAjq0AKCGpYb0L+zkCN3Gbk1sVV2FFACIgACfax24
+kP6cgfsbVLFVZHmFNJvKOGk=
+=HuBL
+-----END PGP SIGNATURE-----
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
-}