--- fwbuilder-2.1.14.ebuild	2007-09-30 01:04:46.000000000 +0200
+++ fwbuilder-2.1.14.ebuild	2008-04-27 16:57:24.000000000 +0200
@@ -17,24 +17,26 @@ 
 	nls? ( >=sys-devel/gettext-0.11.4 )
 	~dev-java/antlr-2.7.7
 	>=dev-libs/libxslt-1.0.7"
 
 pkg_setup() {
-	if built_with_use dev-java/antlr nocxx; then
-		eerror "dev-java/antlr can't be compiled with nocxx."
-		eerror "recompile it without that use flag set."
-		die "Need dev-java/antlr compiled without the nocxx use flag set"
+	if ! built_with_use dev-java/antlr cxx; then
+		eerror "dev-java/antlr must be compiled with cxx."
+		eerror "recompile it with that use flag set."
+		die "Need dev-java/antlr compiled with the cxx use flag set"
 	fi
 }
 
 src_compile() {
 	# 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"
+
 	# prevent install script from automatically stripping binaries - let portage do that
-	sed -i -e 's/s) stripcmd="$stripprog"$/s)/' install.sh \
-		|| die "sed install.sh failed"
+	sed -i -e 's/ -m 0755 -s/ -m 0755/' $(find . -name '*.pro') \
+		|| die  "sed for strip failed"
+
 	# documentation will be installed manually using dodoc & doman
 	rm -f doc/doc.pro
 	sed -i -e '/^SUBDIRS = po src doc/s/ doc//' fwbuilder2.pro \
 		|| die "sed fwbuilder2.pro failed"