Add 5.0.0.3568, remove old files no longer used, and remove uneeded dep on libfwbuilder, which no longer exists. Closes #387759.

(Portage version: 2.1.10.41/cvs/Linux x86_64)

6 files changed, 74 insertions, 30 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 3471dae00a3c..29fe155e28a0 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.109 2011/11/20 19:30:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.110 2011/12/16 16:28:12 kumba Exp $
+
+*fwbuilder-5.0.0.3568 (16 Dec 2011)
+
+  16 Dec 2011; Joshua Kinard <kumba@gentoo.org>
+  -files/3.0.7-secure-mktemp.patch, fwbuilder-4.2.2.3541.ebuild,
+  +fwbuilder-5.0.0.3568.ebuild, +files/fwbuilder-5.0.0.3568-ldflags.patch,
+  -files/4.x-qmake-use-LDFLAGS.patch:
+  Add 5.0.0.3568, remove old files no longer used, and remove uneeded dep on
+  libfwbuilder, which no longer exists. Closes #387759.
 
   20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -fwbuilder-3.0.7.ebuild:
diff --git a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch b/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
deleted file mode 100644
index 1074e58f3b95..000000000000
--- a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp
---- fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp	2009-11-12 09:54:55.913414002 +0100
-+++ fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp	2009-11-12 10:06:38.086706330 +0100
-@@ -147,9 +147,9 @@
-             << "#\n#\n# ============== ROUTING RULES ============== \n#"
-             << endl;
- 
--        compiler->output << "TMPDIRNAME=\"/tmp/.fwbuilder.tempdir.$$\"" << endl;
-+        compiler->output << "TMPDIRNAME=\"$(umask 077 && mktemp --tmpdir=/tmp -d .fwbuilder.tempdir.XXXXXXXXXX)\"" << endl;
-+        compiler->output << "[ $? != 0 ] && exit 1" << endl;
-         compiler->output << "TMPFILENAME=\"$TMPDIRNAME/.fwbuilder.out\"" << endl;
--        compiler->output << "(umask 077 && mkdir $TMPDIRNAME) || exit 1" << endl;
-         compiler->output << endl;
- 
-         compiler->output << "# This function stops stdout redirection"
diff --git a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch b/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
deleted file mode 100644
index c585890f2af2..000000000000
--- a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
new file mode 100644
index 000000000000..d9df8429d390
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
@@ -0,0 +1,11 @@
+diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
+--- fwbuilder-5.0.0.3568.orig//qmake.inc.in	2011-07-25 19:27:44.000000000 -0400
++++ fwbuilder-5.0.0.3568//qmake.inc.in	2011-08-19 17:00:41.259985388 -0400
+@@ -39,6 +39,7 @@ unix {
+     QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_LFLAGS = @LDFLAGS@
+ 
+     !macx {
+ 
diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
index 1635c8e063db..9910f2c76497 100644
--- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.6 2011/08/21 09:45:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.7 2011/12/16 16:28:12 kumba Exp $
 
 EAPI=4
 
@@ -17,8 +17,7 @@ IUSE=""
 DEPEND=">=x11-libs/qt-gui-4.3
 	dev-libs/openssl
 	dev-libs/elfutils
-	sys-devel/gnuconfig
-	!net-libs/libfwbuilder"
+	sys-devel/gnuconfig"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
new file mode 100644
index 000000000000..6a589087ba88
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild,v 1.1 2011/12/16 16:28:12 kumba Exp $
+
+EAPI=4
+
+inherit eutils base 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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/qt-gui-4.3
+	dev-libs/openssl
+	dev-libs/elfutils
+	sys-devel/gnuconfig"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+	eautoreconf
+
+	# 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() {
+	eqmake4
+	econf
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	validate_desktop_entries
+
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+}