--- libfwbuilder-2.1.18.ebuild	2008-07-27 18:06:41.000000000 -0430
+++ libfwbuilder-3.0.1.ebuild	2008-10-28 20:40:20.000000000 -0430
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.18.ebuild,v 1.2 2008/07/27 22:06:20 carlo Exp $
+# $Header: $
 
-EAPI=1
+EAPI=2
 
-inherit eutils qt3
+inherit eutils qt4
 
-DESCRIPTION="Firewall Builder 2.1 API library and compiler framework"
+DESCRIPTION="Firewall Builder 3.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
 SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
@@ -20,17 +20,13 @@
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( dev-libs/openssl )
 	stlport? ( dev-libs/STLport )
-	x11-libs/qt:3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
+	|| ( ( x11-libs/qt-core:4
+		x11-libs/qt-gui:4 )
+		x11-libs/qt:4 )"
 
-src_compile() {
+src_configure() {
 	# we'll use our eqmake instead of bundled script to process qmake files
-	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \
+	sed -i -e 's:^.* ./runqmake.sh$:echo:' configure \
 		|| die "sed configure failed"
 
 	econf   $(use_with ssl openssl) \
@@ -39,17 +35,17 @@
 		|| die "configure failed"
 
 	# use eqmake to generate Makefiles
-	eqmake3 ${PN}.pro
+	eqmake4 ${PN}.pro
 	for subdir in src src/fwbuilder src/fwcompiler src/test src/confscript \
 			etc doc migration; do
-		eqmake3 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
+		# avoid prestrip binaries in generated Makefiles - let portage do that
+		echo -e "\nQMAKE_STRIP =" >> "${subdir}/${subdir##*/}.pro"
+		eqmake4 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
 	done
-
-	emake || die "Compilation failed"
 }
 
 src_install() {
-	emake install DDIR="${D}" || die "Install failed"
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "Install failed"
 
 	cd "${D}"/usr/share/doc/${PF}
 	rm COPYING INSTALL