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 #335686). 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, 130 insertions, 20 deletions

diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog
index 16fe5b06ffb3..9d801d1c3ebf 100644
--- a/net-libs/libfwbuilder/ChangeLog
+++ b/net-libs/libfwbuilder/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/libfwbuilder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.93 2010/06/05 22:37:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.94 2010/09/13 01:02:23 kumba Exp $
+
+*libfwbuilder-4.1.1 (12 Sep 2010)
+*libfwbuilder-4.0.1-r1 (12 Sep 2010)
+
+  12 Sep 2010; Joshua Kinard <kumba@gentoo.org>
+  +files/4.x-qmake-use-LDFLAGS.patch, libfwbuilder-3.0.3.ebuild,
+  libfwbuilder-3.0.6.ebuild, libfwbuilder-3.0.7.ebuild,
+  libfwbuilder-4.0.1.ebuild, +libfwbuilder-4.0.1-r1.ebuild,
+  +libfwbuilder-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 #335686). Per repoman, changed all
+  the ebuilds to use the qt4-r2 eclass over the deprecated qt4 eclass.
 
 *libfwbuilder-4.0.1 (05 Jun 2010)
 
diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
index c8af2e157d24..0ca7e56f741c 100644
--- a/net-libs/libfwbuilder/Manifest
+++ b/net-libs/libfwbuilder/Manifest
@@ -1,10 +1,14 @@
+AUX 4.x-qmake-use-LDFLAGS.patch 498 RMD160 adac2b014b9f2958d241352f2f6491c603d6087a SHA1 4faa288c07ece8b49fc05ac487e8f771458d37f9 SHA256 9844f9c294d9ce8ae8a9c84e61c307dfd622773b2c8a8e383afbcd59a7026a07
 DIST libfwbuilder-3.0.3.tar.gz 532994 RMD160 e522e9a726d8d159bda03b33bd6364243183dc3a SHA1 d49ec3650c2d54842b370bbaf24225bbfc69b1fc SHA256 71d5fef1e4a3668c6da6a3640bc1a55de30f8ee5a4d2c86fbc2af099df66d76c
 DIST libfwbuilder-3.0.6.tar.gz 541962 RMD160 ea1668bea1849b23db723ec3e4f4419e157cbba1 SHA1 d76ef78bf0169e2f9c4cccdfe82ef05e091e31cc SHA256 264b7f3171e870f905a9f1adb815f878e85ef135d2dc9c1800cbc351b61ce911
 DIST libfwbuilder-3.0.7.tar.gz 540834 RMD160 91b798f352d7b42490f2f64583ed6817ba9e41c7 SHA1 d923541e52d1919eaa56575bdea6ab01e81ab36a SHA256 b6dedda5af79e4594d5a13fa24c861da36adf33636c0e9586ad5744a272d6fde
 DIST libfwbuilder-4.0.1.tar.gz 376936 RMD160 df066d624891e8be56b4de71e2ba5f883f8facbe SHA1 7a0a07eb5573ce76aa2cdd9851ff483f2abbe554 SHA256 07c793b37819a5e323f06e501105b9cb1c752c469437d959cdd816423eca1f38
-EBUILD libfwbuilder-3.0.3.ebuild 1298 RMD160 a4585a1fb50f751b1137e5c817c75fa5c85a28fc SHA1 279eb2fe0b813dd06fba8719a460a2b888462ec6 SHA256 b2cce516f5e8d8241e7c49793094e071292d6d6370c165f04df1370939d39f65
-EBUILD libfwbuilder-3.0.6.ebuild 1321 RMD160 f693ea6c0816e203f5034fe7719c4695de3e3fc1 SHA1 8fc154155cc332ae5b702c982b008d61d6105129 SHA256 4a521fb66feac71127dc211795b50a84d772f3ee67d3cc529ee5aa359ab2c8fa
-EBUILD libfwbuilder-3.0.7.ebuild 1316 RMD160 2d45ffbafa8c43e388f93a5b09c058c2fa13ad3b SHA1 ac57039c94e7bf8acde5a8bf1c5f85b021504787 SHA256 5b030b09b9dd81a42104d42ab3d65deb539f04bfc9b1fdf6f999e9d6bbb06a70
-EBUILD libfwbuilder-4.0.1.ebuild 1125 RMD160 6000d6841d52cb80543d134b1809ca80bd9cb758 SHA1 a4fb44560c8fc45a24fc48c2508d5036c51100a9 SHA256 87a01cc4e43994f6dab13d62c3d078a4f041f7b3a56b729477fd120099787ef6
-MISC ChangeLog 13935 RMD160 0c45a09f80228b1d75731bae33b8cfb8499bfec6 SHA1 3156b77cb40492b2d318e3e566595a460510b345 SHA256 e975694a413e0fe9cde663c960d59d2a6d93999d9704c5d5c2da94e90d952f97
+DIST libfwbuilder-4.1.1.tar.gz 378640 RMD160 02e53764f054b5a0444bb1e37bcd08ccfd50faf6 SHA1 7412a1e7223bc60c1119736d001ba13e0f0ff601 SHA256 506820ce7f3254f5c1cad3c52e9cb27dec174430946e4b90d327556aab7fefff
+EBUILD libfwbuilder-3.0.3.ebuild 1303 RMD160 6692010fc0c87ca8b6c9b65ec5a12ff1c87e0411 SHA1 9384c7c98677ad13555a0444edf8d132293178a2 SHA256 f84f126d62e38f34cf56d0ca914558c32e668ee71b746c41e26a15efabf0e455
+EBUILD libfwbuilder-3.0.6.ebuild 1325 RMD160 ea0fdd7ce81f71273e3a4785197a6baac418a860 SHA1 bb8c040f0985c14328d6013836f2516196e770d3 SHA256 0664ea78b43537bae2a78dd8b1a6ff1463f9c02112030064a15c10581577e81a
+EBUILD libfwbuilder-3.0.7.ebuild 1321 RMD160 93b9e2b151ff259329f5fd961e7028536e1ae2c6 SHA1 1f3b9e5353262071baa3b4d4711fec8814ebfd7a SHA256 4ea88445bb26cfcccc21d3939b2c39f460033ea269b6704b1289382edac9b365
+EBUILD libfwbuilder-4.0.1-r1.ebuild 1184 RMD160 157606a051c11a98f2ab574673b72d0e4b5cab83 SHA1 cd4e3c7dd2eb133a2895a6c0fa3d5b75d9d4874c SHA256 ba3dd6e911f45f9a79629ca686dc26e97b64617b935912aebb8907e46d743ec2
+EBUILD libfwbuilder-4.0.1.ebuild 1131 RMD160 95bfff9b9f6a2a0e43e325aa150074a98a482d50 SHA1 0e394ccbf4a349d663ad4c8afeca22d9a5f4dde9 SHA256 3bf96df3fbbfb1da7bccfa23d2028bc768ddb6d4e02d8ddf788014a751c2765b
+EBUILD libfwbuilder-4.1.1.ebuild 1197 RMD160 5c11153187d07fe13bff8adfc96e574eff4db0c6 SHA1 a2adfa6c6499469c11d369ae05ab0009dcaa052a SHA256 90a000e69ff18dd18d8636b8d974444383b888329ec667c5ebfaba616c160138
+MISC ChangeLog 14564 RMD160 f8737d73f6f0660b9b43e5cbe38f177a91868e7d SHA1 f83489a812b1e9863d4af18a3e192ca4fe12680a SHA256 60609651606a61ea68946e8987079bfef6b25a9b3973cdaf376ead0451fa3657
 MISC metadata.xml 436 RMD160 8f3005de9e1109c7d69a739a6267440a9988e503 SHA1 911eef44f8dd6ca7c80a9729e4089297a7362c8b SHA256 6c4fb09705f90fef7b67ec779645b20c964bc52e9c015b79cfcdcfce921a5359
diff --git a/net-libs/libfwbuilder/files/4.x-qmake-use-LDFLAGS.patch b/net-libs/libfwbuilder/files/4.x-qmake-use-LDFLAGS.patch
new file mode 100644
index 000000000000..7e00cdc57bc5
--- /dev/null
+++ b/net-libs/libfwbuilder/files/4.x-qmake-use-LDFLAGS.patch
@@ -0,0 +1,11 @@
+diff -Naurp libfwbuilder-4.1.1.orig//qmake.inc.in libfwbuilder-4.1.1//qmake.inc.in
+--- libfwbuilder-4.1.1.orig//qmake.inc.in	2010-02-27 21:23:02.000000000 -0500
++++ libfwbuilder-4.1.1//qmake.inc.in	2010-09-12 16:00:45.669648366 -0400
+@@ -40,6 +40,7 @@ unix {
+          QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+          QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+          QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
++         QMAKE_LFLAGS = @LDFLAGS@
+     }
+ }
+ 
diff --git a/net-libs/libfwbuilder/libfwbuilder-3.0.3.ebuild b/net-libs/libfwbuilder/libfwbuilder-3.0.3.ebuild
index d9b592f99700..e8a4481bd840 100644
--- a/net-libs/libfwbuilder/libfwbuilder-3.0.3.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-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-libs/libfwbuilder/libfwbuilder-3.0.3.ebuild,v 1.7 2009/07/26 13:49:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-3.0.3.ebuild,v 1.8 2010/09/13 01:02:23 kumba Exp $
 
 EAPI="2"
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="Firewall Builder 3.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	sed -i \
 		-e '/COPYING/d' -e '/INSTALL/d' \
diff --git a/net-libs/libfwbuilder/libfwbuilder-3.0.6.ebuild b/net-libs/libfwbuilder/libfwbuilder-3.0.6.ebuild
index 9f5137aa6132..2f2d3f164d05 100644
--- a/net-libs/libfwbuilder/libfwbuilder-3.0.6.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-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-libs/libfwbuilder/libfwbuilder-3.0.6.ebuild,v 1.1 2009/09/01 10:38:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-3.0.6.ebuild,v 1.2 2010/09/13 01:02:23 kumba Exp $
 
 EAPI="2"
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="Firewall Builder 3.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	sed -i \
 		-e '/COPYING/d' -e '/INSTALL/d' \
diff --git a/net-libs/libfwbuilder/libfwbuilder-3.0.7.ebuild b/net-libs/libfwbuilder/libfwbuilder-3.0.7.ebuild
index 00db448460dd..66fe39869639 100644
--- a/net-libs/libfwbuilder/libfwbuilder-3.0.7.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-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-libs/libfwbuilder/libfwbuilder-3.0.7.ebuild,v 1.5 2010/03/09 21:54:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-3.0.7.ebuild,v 1.6 2010/09/13 01:02:23 kumba Exp $
 
 EAPI="2"
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="Firewall Builder 3.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 
 	sed -i \
 		-e '/COPYING/d' -e '/INSTALL/d' \
diff --git a/net-libs/libfwbuilder/libfwbuilder-4.0.1-r1.ebuild b/net-libs/libfwbuilder/libfwbuilder-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..412f6adde5d1
--- /dev/null
+++ b/net-libs/libfwbuilder/libfwbuilder-4.0.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-4.0.1-r1.ebuild,v 1.1 2010/09/13 01:02:23 kumba Exp $
+
+EAPI="2"
+
+inherit qt4-r2 autotools
+
+DESCRIPTION="Firewall Builder 4.0 API library and compiler framework"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE="snmp"
+
+DEPEND=">=dev-libs/libxml2-2.4.10
+	>=dev-libs/libxslt-1.0.7
+	snmp? ( net-analyzer/net-snmp )
+	>=x11-libs/qt-core-4.3"
+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() {
+	use snmp || export with_ucdsnmp="no"
+	econf || die "econf failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+}
diff --git a/net-libs/libfwbuilder/libfwbuilder-4.0.1.ebuild b/net-libs/libfwbuilder/libfwbuilder-4.0.1.ebuild
index 84f7ec476a8d..6996eb9e0636 100644
--- a/net-libs/libfwbuilder/libfwbuilder-4.0.1.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-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-libs/libfwbuilder/libfwbuilder-4.0.1.ebuild,v 1.1 2010/06/05 22:37:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-4.0.1.ebuild,v 1.2 2010/09/13 01:02:23 kumba Exp $
 
 EAPI="2"
 
-inherit qt4 autotools
+inherit qt4-r2 autotools
 
 DESCRIPTION="Firewall Builder 4.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -21,7 +21,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	qt4_src_prepare
+	qt4-r2_src_prepare
 	eautoreconf || die "eautoreconf failed"
 
 	# This package fundamentally changed its build system.  We have to
diff --git a/net-libs/libfwbuilder/libfwbuilder-4.1.1.ebuild b/net-libs/libfwbuilder/libfwbuilder-4.1.1.ebuild
new file mode 100644
index 000000000000..5a81827e414e
--- /dev/null
+++ b/net-libs/libfwbuilder/libfwbuilder-4.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-4.1.1.ebuild,v 1.1 2010/09/13 01:02:23 kumba Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2 multilib autotools
+
+DESCRIPTION="Firewall Builder 4.0 API library and compiler framework"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE="snmp"
+
+DEPEND=">=dev-libs/libxml2-2.4.10
+	>=dev-libs/libxslt-1.0.7
+	snmp? ( net-analyzer/net-snmp )
+	>=x11-libs/qt-core-4.3"
+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() {
+	use snmp || export with_ucdsnmp="no"
+	econf || die "econf failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+}