assure Qt 3 is used to build, version bump

(Portage version: 2.0.51.22-r1)

12 files changed, 108 insertions, 25 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 62051ae0f186..46ae96719136 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.44 2005/05/12 23:36:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.45 2005/07/11 10:57:31 carlo Exp $
+
+*fwbuilder-2.0.8 (11 Jul 2005)
+
+  11 Jul 2005; Carsten Lohrke <carlo@gentoo.org> fwbuilder-2.0.6.ebuild,
+  fwbuilder-2.0.7.ebuild, +fwbuilder-2.0.8.ebuild:
+  assure Qt 3 is used to build, version bump
 
 *fwbuilder-2.0.7 (12 May 2005)
 
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 0b7978afa1ff..7379943467ab 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e2df34fc756a575873ac78515138dbc7 ChangeLog 7882
+MD5 3ec9581b8131788ef765a2225e5112d0 fwbuilder-2.0.7.ebuild 1068
+MD5 11e6f232f520cdf75476e709f2b3bc7e fwbuilder-1.1.2.ebuild 1390
+MD5 b647f07aa0909cb6bb16e38d2e38fe43 fwbuilder-2.0.6.ebuild 900
+MD5 5a3a72d37dca725832ab9a3697190836 fwbuilder-2.0.8.ebuild 959
+MD5 3820633591c876330435e43bb763dbc1 ChangeLog 8084
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
 MD5 c1a7d072ddaa87c67e47e135f6cbd1cf files/digest-fwbuilder-1.1.2 68
 MD5 70fea7193b1f73a34e3cf49a2ac9c9c7 files/digest-fwbuilder-2.0.6 68
 MD5 99c3ff5a964d751686899517a6b90485 files/digest-fwbuilder-2.0.7 68
-MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
-MD5 11e6f232f520cdf75476e709f2b3bc7e fwbuilder-1.1.2.ebuild 1390
-MD5 c2edd172a89072c676e7ef34c80e7f7f fwbuilder-2.0.6.ebuild 865
-MD5 c6c8c4c3cd885caf042b756497d00d77 fwbuilder-2.0.7.ebuild 1033
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0CkfI1lqEGTUzyQRAhp9AKDHJAey6ubqa0FtlK+9Dd+GmdXt5gCfT+Az
-u3mPWNPmg7BgkBJdlfSfpMo=
-=ceSv
------END PGP SIGNATURE-----
+MD5 1675a2e188765ced03b1eefd161a103f files/digest-fwbuilder-2.0.8 68
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.8 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.8
new file mode 100644
index 000000000000..3502ff51f390
--- /dev/null
+++ b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.8
@@ -0,0 +1 @@
+MD5 37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz 1299625
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild
index 220362ea1872..cb651c75163d 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild,v 1.7 2005/07/09 19:44:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild,v 1.8 2005/07/11 10:57:31 carlo Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 
 src_compile() {
 	export QMAKESPEC="linux-g++"
+	export QMAKE="${QTDIR}/bin/qmake"
 
 	econf `use_enable nls` || die
 
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
index 6fe269d003c8..b2bf27dd90e4 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild,v 1.2 2005/07/09 19:44:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild,v 1.3 2005/07/11 10:57:31 carlo Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 
 src_compile() {
 	export QMAKESPEC="linux-g++"
+	export QMAKE="${QTDIR}/bin/qmake"
 
 	econf `use_enable nls` || die
 
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild
new file mode 100644
index 000000000000..df3bd3bb51d1
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild,v 1.1 2005/07/11 10:57:31 carlo Exp $
+
+inherit eutils
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64"
+IUSE="nls"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	nls? ( >=sys-devel/gettext-0.11.4 )
+	>=dev-libs/libxslt-1.0.7"
+
+src_compile() {
+	export QMAKESPEC="linux-g++"
+	export QMAKE="${QTDIR}/bin/qmake"
+
+	econf `use_enable nls` || die
+
+	addwrite "${QTDIR}/etc/settings"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DDIR=${D} install || die
+	insinto /usr/share/pixmaps
+	doins src/gui/icons/firewall_64.png
+	make_desktop_entry fwbuilder "Firewall Builder" "/usr/share/pixmaps/firewall_64.png" "System;Qt"
+}
+
+pkg_postinst() {
+	echo
+	einfo "You need to emerge iproute2 on the machine that"
+	einfo "will run the firewall script."
+	echo
+}
diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog
index 325edbbaddd7..5c725324a722 100644
--- a/net-libs/libfwbuilder/ChangeLog
+++ b/net-libs/libfwbuilder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libfwbuilder
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.48 2005/07/07 04:54:38 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.49 2005/07/11 10:55:37 carlo Exp $
+
+*libfwbuilder-2.0.8 (11 Jul 2005)
+
+  11 Jul 2005; Carsten Lohrke <carlo@gentoo.org> libfwbuilder-2.0.6.ebuild,
+  libfwbuilder-2.0.7.ebuild, +libfwbuilder-2.0.8.ebuild:
+  assure Qt 3 is used to build, version bump
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> libfwbuilder-2.0.6.ebuild,
   libfwbuilder-2.0.7.ebuild:
diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
index 42cca563c966..e69ba9862ddd 100644
--- a/net-libs/libfwbuilder/Manifest
+++ b/net-libs/libfwbuilder/Manifest
@@ -1,9 +1,11 @@
-MD5 d23ba5db1d68cf647392d226160f0f5f libfwbuilder-2.0.7.ebuild 769
+MD5 393cd61a7529f0dc87f74a9f16ab35a1 libfwbuilder-2.0.8.ebuild 696
+MD5 22afd307692f3ff322768a0b2a7dc1ce libfwbuilder-2.0.7.ebuild 804
 MD5 f60ab3583d0ba938926acb6d0b04e916 libfwbuilder-1.0.2-r2.ebuild 954
-MD5 82dd3f2aeb2b275c22cc9fb2de928a18 ChangeLog 7466
+MD5 0ec473d5a456b040c8efdc5f952534e6 ChangeLog 7680
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 97e5fbf1194b674c56a9b43fe47631ae libfwbuilder-2.0.6.ebuild 764
+MD5 619d6f788ae63f334b42094683a54373 libfwbuilder-2.0.6.ebuild 799
 MD5 18d017187b228dd614d7ae00283f788a files/digest-libfwbuilder-1.0.2-r2 72
 MD5 bd7f345d52b044e87b5cea9d1017f4bf files/libfwbuilder-1.0.2-libxml2.patch 2166
 MD5 318eed1dc99e8153d2dfdfd9cca6923e files/digest-libfwbuilder-2.0.6 70
 MD5 5814377092615185560afd95d6514ffe files/digest-libfwbuilder-2.0.7 70
+MD5 d41e02a2b604af59172850a3c1a4d60f files/digest-libfwbuilder-2.0.8 70
diff --git a/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.8 b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.8
new file mode 100644
index 000000000000..6bda5a86c67b
--- /dev/null
+++ b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.8
@@ -0,0 +1 @@
+MD5 a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz 281404
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild
index bd2d37e1bbc9..54ed9de9cb7b 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild,v 1.7 2005/07/07 04:54:38 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild,v 1.8 2005/07/11 10:55:37 carlo Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -18,6 +18,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 	=x11-libs/qt-3*"
 
 src_compile() {
+	export QMAKE="${QTDIR}/bin/qmake"
 	econf `use_with ssl openssl` `use_with snmp ucdsnmp` || die
 	emake || die
 }
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild
index cdbe671b08fb..430461f9ba7c 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild,v 1.2 2005/07/07 04:54:38 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild,v 1.3 2005/07/11 10:55:37 carlo Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -18,6 +18,7 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 	=x11-libs/qt-3*"
 
 src_compile() {
+	export QMAKE="${QTDIR}/bin/qmake"
 	econf `use_with ssl openssl` `use_with snmp ucdsnmp` || die
 	emake || die
 }
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild
new file mode 100644
index 000000000000..d527b3ba0043
--- /dev/null
+++ b/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild,v 1.1 2005/07/11 10:55:37 carlo Exp $
+
+DESCRIPTION="Firewall Builder 2.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="~x86 ~amd64 ~sparc ~ppc ~ppc64"
+IUSE="snmp ssl"
+
+DEPEND=">=dev-libs/libxml2-2.4.10
+	>=dev-libs/libxslt-1.0.7
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl )
+	=x11-libs/qt-3*"
+
+src_compile() {
+	export QMAKE="${QTDIR}/bin/qmake"
+	econf `use_with ssl openssl` `use_with snmp ucdsnmp` || die
+	emake || die
+}
+
+src_install() {
+	make DDIR=${D} install || die
+	prepalldocs
+}