Removed the mktemp patch from 4.0.1-r1 (solves #329177) and introduced a new upstream release, 4.1.1. Both also include a fix to include the system LDFLAGS value into the build (solves #335221). Per repoman, changed all the ebuilds to use the qt4-r2 eclass over the deprecated qt4 eclass.

(Portage version: 2.1.9.4/cvs/Linux x86_64)

8 files changed, 138 insertions, 15 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index cc0ceced9051..77d74ba64db7 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.95 2010/06/05 22:42:19 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.96 2010/09/13 06:28:01 kumba Exp $
+
+*fwbuilder-4.1.1 (12 Sep 2010)
+*fwbuilder-4.0.1-r1 (12 Sep 2010)
+
+  12 Sep 2010; Joshua Kinard <kumba@gentoo.org>
+  +files/4.x-qmake-use-LDFLAGS.patch, fwbuilder-3.0.3.ebuild,
+  fwbuilder-3.0.6.ebuild, fwbuilder-3.0.7.ebuild, fwbuilder-4.0.1.ebuild,
+  +fwbuilder-4.0.1-r1.ebuild, +fwbuilder-4.1.1.ebuild:
+  Removed the mktemp patch from 4.0.1-r1 (solves #329177) and introduced a
+  new upstream release, 4.1.1. Both also include a fix to include the system
+  LDFLAGS value into the build (solves #335221). Per repoman, changed all
+  the ebuilds to use the qt4-r2 eclass over the deprecated qt4 eclass.
 
 *fwbuilder-4.0.1 (05 Jun 2010)
 
diff --git a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch b/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
new file mode 100644
index 000000000000..c585890f2af2
--- /dev/null
+++ b/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
@@ -0,0 +1,11 @@
+diff -Naurp fwbuilder-4.1.1.orig//qmake.inc.in fwbuilder-4.1.1//qmake.inc.in
+--- fwbuilder-4.1.1.orig//qmake.inc.in	2010-07-21 00:42:00.000000000 -0400
++++ fwbuilder-4.1.1//qmake.inc.in	2010-09-12 15:47:10.189648845 -0400
+@@ -67,6 +67,7 @@ unix {
+         QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+         QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+         QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++        QMAKE_LFLAGS = @LDFLAGS@
+ 
+     }
+ }
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild
index 3605026c224d..900e043b5d5b 100644
--- a/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild,v 1.7 2009/07/26 13:49:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild,v 1.8 2010/09/13 06:28:01 kumba Exp $
 
 EAPI="2"
 
-inherit qt4 multilib
+inherit qt4-r2 multilib
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -20,7 +20,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	# Remove bundled antlr
 	rm -rf src/antlr
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild
index 9844de927a20..8ec5ffe930d6 100644
--- a/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild,v 1.1 2009/09/01 10:40:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild,v 1.2 2010/09/13 06:28:01 kumba Exp $
 
 EAPI="2"
 
-inherit qt4 multilib
+inherit qt4-r2 multilib
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -20,7 +20,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	# Remove bundled antlr
 	rm -rf src/antlr
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
index ba2e463a099e..db4d53382f2d 100644
--- a/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild,v 1.5 2010/03/09 21:57:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild,v 1.6 2010/09/13 06:28:01 kumba Exp $
 
 EAPI="2"
 
-inherit eutils qt4 multilib
+inherit eutils qt4-r2 multilib
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -20,7 +20,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	epatch "${FILESDIR}/${PV}-secure-mktemp.patch"
 
diff --git a/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..2987dac1fdda
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild,v 1.1 2010/09/13 06:28:01 kumba Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2 multilib autotools
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE=""
+#IUSE="+pch"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	>=x11-libs/qt-gui-4.3
+	dev-libs/openssl
+	dev-libs/elfutils
+	sys-devel/gnuconfig
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt4-r2_src_prepare
+	epatch "${FILESDIR}/4.x-qmake-use-LDFLAGS.patch"
+	eautoreconf || die "eautoreconf failed"
+
+	# This package fundamentally changed its build system.  We have to
+	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
+	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
+		|| die "failed to copy config.{sub,guess}"
+}
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	validate_desktop_entries
+
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+}
diff --git a/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild
index c4051263aefe..1a3805772478 100644
--- a/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild,v 1.1 2010/06/05 22:42:19 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild,v 1.2 2010/09/13 06:28:01 kumba Exp $
 
 EAPI="2"
 
-inherit eutils qt4 multilib autotools
+inherit eutils qt4-r2 multilib autotools
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -24,7 +24,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 	epatch "${FILESDIR}/${PV}-secure-mktemp.patch"
 	eautoreconf || die "eautoreconf failed"
 
diff --git a/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild
new file mode 100644
index 000000000000..314c8bec6fa5
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild,v 1.1 2010/09/13 06:28:01 kumba Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2 multilib autotools
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE=""
+#IUSE="+pch"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	>=x11-libs/qt-gui-4.3
+	dev-libs/openssl
+	dev-libs/elfutils
+	sys-devel/gnuconfig
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt4-r2_src_prepare
+	epatch "${FILESDIR}/4.x-qmake-use-LDFLAGS.patch"
+	eautoreconf || die "eautoreconf failed"
+
+	# This package fundamentally changed its build system.  We have to
+	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
+	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
+		|| die "failed to copy config.{sub,guess}"
+}
+
+src_configure() {
+	econf || die "econf failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	validate_desktop_entries
+
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+}