Updated ebuild from bug #187545 thx to Davide Pesavento. Also dropped alpha and sparc keyword, see bug #187186

(Portage version: 2.1.2.12)

2 files changed, 33 insertions, 11 deletions

diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog
index 67f76ea4da4f..c0d4afdc502c 100644
--- a/net-libs/libfwbuilder/ChangeLog
+++ b/net-libs/libfwbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libfwbuilder
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.68 2007/07/30 21:34:10 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.69 2007/09/06 00:29:38 r3pek Exp $
+
+  06 Sep 2007; Carlos Silva <r3pek@gentoo.org>
+  libfwbuilder-2.1.13-r1.ebuild:
+  Updated ebuild from bug #187545 thx to Davide Pesavento. Also dropped alpha
+  and sparc keyword, see bug #187186
 
 *libfwbuilder-2.1.13-r1 (30 Jul 2007)
 
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild
index b543750c4083..26b2f95b585d 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild,v 1.1 2007/07/30 21:34:10 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild,v 1.2 2007/09/06 00:29:38 r3pek Exp $
 
-inherit eutils autotools
+inherit eutils qt3
 
 DESCRIPTION="Firewall Builder 2.1 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -10,29 +10,46 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp ssl"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="snmp ssl stlport"
 
 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*"
+	stlport? ( dev-libs/STLport )
+	$(qt_min_version 3)"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-gcc42.patch
+	epatch "${FILESDIR}"/${P}-gcc42.patch
 }
 
 src_compile() {
-	export QMAKE="${QTDIR}/bin/qmake"
-	econf `use_with ssl openssl` `use_with snmp ucdsnmp` --without-stlport \
-		--without-lwres || die "Configuration failed"
+	# we'll use our eqmake instead of bundled script to process qmake files
+	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \
+		|| die "sed configure failed"
+
+	econf   $(use_with ssl openssl) \
+		$(use_with snmp ucdsnmp) \
+		$(use_with stlport stlport) \
+		|| die "configure failed"
+
+	# use eqmake to generate Makefiles
+	eqmake3 ${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
+	done
+
 	emake || die "Compilation failed"
 }
 
 src_install() {
-	emake DDIR="${D}" install || die "Install failed"
+	emake install DDIR="${D}" || die "Install failed"
+
+	cd "${D}"/usr/share/doc/${PF}
+	rm COPYING INSTALL
 	prepalldocs
 }