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.

Package-Manager: portage-2.1.9.4/cvs/Linux x86_64

9 files changed, 147 insertions, 20 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/Manifest b/net-firewall/fwbuilder/Manifest
index a928d96a25ae..20d907ece995 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,12 +1,16 @@
 AUX 3.0.7-secure-mktemp.patch 987 RMD160 612e42ee68253b7d248afd8b039d97e25db0713d SHA1 cb68c5339e28fd13aa3f1b8ca11a2ca76ebf0162 SHA256 02c0811786b268d609b9ecac5b78135c53d32752c1846c63f23716b5de2617a8
 AUX 4.0.1-secure-mktemp.patch 701 RMD160 18fcbe371922d545563980ff644e35172433a798 SHA1 c5aab2e1d60ca4df5da9b6e040179fb972f760ad SHA256 3a8d9a5c0daa5c6c3646c11add91b10f3a5074eb41e0bf6bc39b5332009de6ea
+AUX 4.x-qmake-use-LDFLAGS.patch 460 RMD160 e2ca41d40105ff63611019af3e9b15b5468fe5e6 SHA1 7b8d2482a00c5d109249815a3ae9f068cd27ece5 SHA256 56c62f025b01f6ecf6c298909c4f64f5890524f8688199187139e354e801ce30
 DIST fwbuilder-3.0.3.tar.gz 2342286 RMD160 aeca268daa0bc1d47a05add6590910ae3da15b0e SHA1 04df912936aecd5e6de8b2cde07077565191ab74 SHA256 95d31f53752b12530c29fc349a7dd827016337441769a799557406cc832cd5fc
 DIST fwbuilder-3.0.6.tar.gz 2477171 RMD160 685e1468deddaeb8ff2f0d5e02107f6c98a78eba SHA1 c1c4cf069ba35cbc1a377ba1b3572fab7e53ab97 SHA256 a01fce8c8bd46f8be8dfa7e66ecf8f2aa0795d9454c398ea271b93c4daa346d1
 DIST fwbuilder-3.0.7.tar.gz 2486382 RMD160 c57150a3de136add28a48fbc3b79aa1006b46963 SHA1 c08411bcf5b686ef86e1da6f0954d8685bf49d61 SHA256 bb827f54a77c0f8a9b471200eda3801c9ff3f2a576647ca6a576e546e20ac254
 DIST fwbuilder-4.0.1.tar.gz 5532239 RMD160 a7dd540ac46ccdf0ee9fc75fa786a3cfab6b8484 SHA1 6b4cedd225637da8ebda6cdb9fe50111b6dd2f61 SHA256 d8bb7867df703b30a5d74728a8497a2fa1b1089184bd6d01e974705e5aad766c
-EBUILD fwbuilder-3.0.3.ebuild 1810 RMD160 83755f5a50c24e489440ea4d767d850832e434cd SHA1 e5067e342979d5ef978c4037c6b0297b1dce0ac2 SHA256 8ee4841d160bede8f59f153b29f79b9cdce3e3111997861cb10b05e717806ba6
-EBUILD fwbuilder-3.0.6.ebuild 1832 RMD160 d73172910b12a6790ef813abc17bd9c7edc78143 SHA1 a3abbca236a10420f58b551121cbdcdf93c29875 SHA256 590fe364783820d2108b2ab68387ee3e6bc9767869f4acb7d54a072b3348781c
-EBUILD fwbuilder-3.0.7.ebuild 1883 RMD160 154751bb0e2655e05648a964e94ce56198c4e32e SHA1 fcf60d8b8ff40647ea99157bd64196b3ab538ba0 SHA256 28d2b9b01e4c8443a1df7a69b0a72aa51b365f5b95fa94dd85572802a557e67e
-EBUILD fwbuilder-4.0.1.ebuild 1270 RMD160 416e18fc303a33e67c44d1a359502daf4e80b6b1 SHA1 d008ca13cdfb22c76ee4d4627d4f781723d94b63 SHA256 af58303ccbc09d1c8d1971058004f7b6e0e6a393e841af67646a901de052bda8
-MISC ChangeLog 15228 RMD160 417ff297cdc394ded5573031e373cb210a3ae8ac SHA1 0538d99ea4a2c85eb4ec9637794e347f74585c81 SHA256 dff6ed5c2bd2074bca5919b78a8aeb2e9f4a990dfec495442575231454a0673b
+DIST fwbuilder-4.1.1.tar.gz 5757379 RMD160 4076929e247609cca2d16a31448fee67447b0b3a SHA1 bd327c56bae596f5d92c8b3186e574980b216189 SHA256 7b2d817665fefd9979ac07a468b98449733d8648aa3605b24e288364a26a0290
+EBUILD fwbuilder-3.0.3.ebuild 1815 RMD160 2bac24d6255b3c57d2d2a27d822698dddee12cf9 SHA1 f6e4a52d205846f8aeabc7cd021014526d110e03 SHA256 da4f876884ec13195d371eeb04d4eaa3b4efb471f086341835b3a20b9232315f
+EBUILD fwbuilder-3.0.6.ebuild 1836 RMD160 f213582a01ff6dd91c3d76650558cc67fe533ac4 SHA1 7fbc9112b6cf22fefdc8a198a7e1918992d1c71a SHA256 251ccaaadfc8013c96bb69f50b0a9ce7a24048242f122ce6a678d0c4d302d5f4
+EBUILD fwbuilder-3.0.7.ebuild 1888 RMD160 218520cf2b4a6b5303079ce545152aab3c36c89d SHA1 1dc69bc20ff2d72ba359b0475d7b2b34ddf89944 SHA256 7f49b3c3f3c4c28b97446e68a10a89bddc74b63e5a4e86a5e8573cd80d1a8f11
+EBUILD fwbuilder-4.0.1-r1.ebuild 1281 RMD160 0e3f7afd67414f61f4ac9acf4e453a174d51919e SHA1 3d19007c34991594cc4af7826cfae5511ca0cc7d SHA256 b1e912ba34f2282d246f0b71971021bfab7ac0af18aace3a305794a68697ea45
+EBUILD fwbuilder-4.0.1.ebuild 1276 RMD160 0ace0b99c6157b60093f207697b9c37c316f6a47 SHA1 4f7cda04d5e38c37a14ad7919377d1b1aa22419e SHA256 d0d3fa79e69e5f24b632e16cfd18df963d23dbdf24dfef162e9a50f5e5c4ed63
+EBUILD fwbuilder-4.1.1.ebuild 1278 RMD160 c1c5e6c4c030ffbf0514347f05714e4b56c7dc3d SHA1 79337bdf0c8a6864b265e321623f01b3159ea005 SHA256 9079fe3ecfa16dee3e6283c0bc1eaf5737f516425cc1a09a1f3bc3fc235bac1a
+MISC ChangeLog 15831 RMD160 60f2888cc4669451c307361abfd056aabe28ec74 SHA1 8f5bfe542a24864b29e0be36caa6e23cac66b872 SHA256 77f32bccf73de375e0ac027c44f03ad9faa0ab266655e438a25ffe1d426200c7
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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."
+}