added fix for nasty autoconf voodoo

6 files changed, 81 insertions, 10 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 0be9ab1d68d6..2a5e61372eca 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/fwbuilder
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.15 2004/01/23 11:44:21 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.16 2004/02/09 05:38:32 nerdboy Exp $
+
+*fwbuilder-1.1.1-r1 (08 Feb 2004)
+
+  08 Feb 2004; <nerdboy@gentoo.org> fwbuilder-1.1.1-r1.ebuild:
+  updated 1.1.1-r1 to fix nasty autoconf voodoo
 
 *fwbuilder-1.1.2 (23 Jan 2004)
 
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 812b7f272e8b..58b7c5927d7a 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,8 +1,10 @@
-MD5 be0c8451ba4cbbe4417c974630a05543 fwbuilder-1.0.11.ebuild 1500
+MD5 f23ae753452a973202fc65327caea3ef ChangeLog 4542
 MD5 4800976ac772a9ce2f2ba1723db4a317 fwbuilder-1.1.2.ebuild 1471
+MD5 e7cf8b5947473e47de9de8ec95969ac6 fwbuilder-1.1.1-r1.ebuild 1516
 MD5 3f3ed2631227552a89219ed9ba84318b fwbuilder-1.1.1.ebuild 1469
-MD5 f544dc1887e2adfab62716545fe88757 ChangeLog 4395
+MD5 be0c8451ba4cbbe4417c974630a05543 fwbuilder-1.0.11.ebuild 1500
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 c61d4dd60ad312374a1b44d79c9b4fb1 files/digest-fwbuilder-1.0.11 69
-MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1 68
 MD5 c1a7d072ddaa87c67e47e135f6cbd1cf files/digest-fwbuilder-1.1.2 68
+MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1 68
+MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1-r1 68
+MD5 c61d4dd60ad312374a1b44d79c9b4fb1 files/digest-fwbuilder-1.0.11 69
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1
new file mode 100644
index 000000000000..0fa1cb9d1f8b
--- /dev/null
+++ b/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1
@@ -0,0 +1 @@
+MD5 c0c86c5d0a2f6eeff388c66d49c63463 fwbuilder-1.1.1.tar.gz 1440033
diff --git a/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild b/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild
index 1f5341b14065..adf5f00ad580 100644
--- a/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild,v 1.5 2003/12/06 16:20:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild,v 1.6 2004/02/09 05:38:32 nerdboy Exp $
 
 DESCRIPTION="A firewall GUI"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..645f6d5a7407
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild,v 1.1 2004/02/09 05:38:32 nerdboy Exp $
+
+DESCRIPTION="A firewall GUI"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+HOMEPAGE="http://www.fwbuilder.org/"
+RESTRICT="nomirror"
+S=${WORKDIR}/${P}
+
+KEYWORDS="~x86 ~sparc ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static nls"
+
+DEPEND="sys-devel/autoconf
+	=x11-libs/gtk+-1.2*
+	>=media-libs/gdk-pixbuf-0.16.0
+	=dev-cpp/gtkmm-1.2*
+	=dev-libs/libsigc++-1.0*
+	nls? ( >=sys-devel/gettext-0.11 )
+	~net-libs/libfwbuilder-1.0.2"
+
+RDEPEND="sys-apps/iproute"
+
+# Added by Jason Wever <weeve@gentoo.org>
+# Fix for bug #30256.
+if [ "${ARCH}" = "sparc" ]; then
+	inherit flag-o-matic
+	replace-flags "-O3" "-O2"
+fi
+
+src_compile() {
+	local myconf
+	myconf="--with-gnu-ld"
+	use static	&&	myconf="${myconf} --enable-shared=no --enable-static=yes"
+	use nls		||	myconf="${myconf} --disable-nls"
+
+	cd ${S}
+
+	env WANT_AUTOCONF_2_5=1 ./autogen.sh \
+		--prefix=/usr \
+		--host=${CHOST}	|| die "./autogen.sh failed"
+
+	sed -i -e "s:#define HAVE_XMLSAVEFORMATFILE 1://:" config.h
+
+	if [ "`use static`" ]
+	then
+		emake LDFLAGS="-static" || die "emake LDFLAGS failed"
+	else
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+}
+
+pkg_postinst() {
+	einfo "You may have to install iproute on the machine that"
+	einfo "will run the firewall script."
+}
+
diff --git a/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
index 71bda0cd6f30..d3de80e5671f 100644
--- a/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild,v 1.2 2004/01/13 13:46:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild,v 1.3 2004/02/09 05:38:33 nerdboy Exp $
 
 DESCRIPTION="A firewall GUI"
 SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.fwbuilder.org/"
 RESTRICT="nomirror"
 S=${WORKDIR}/${P}
 
-KEYWORDS="x86 ~sparc amd64"
+KEYWORDS="~x86 ~sparc amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static nls"