proposed diff for ebuild for net-firewall/fwbuilder-3.0.1

fwbuilder-3.0.1.diff (text/plain), 2.59 KB, created by Cesar Garcia on 2008-10-29 01:35:49 UTC

--- fwbuilder-2.1.18.ebuild	2008-10-01 13:07:59.000000000 -0430
+++ fwbuilder-3.0.1.ebuild	2008-10-28 20:37:04.000000000 -0430
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild,v 1.3 2008/10/01 17:31:34 betelgeuse Exp $
+# $Header: $
 
 EAPI=2
 
-inherit eutils qt3 autotools
+inherit eutils qt4 autotools
 
 DESCRIPTION="A firewall GUI"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -22,39 +22,38 @@
 
 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"
 	# 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"
+	sed -i -e '/^SUBDIRS = src doc/s/ doc//' fwbuilder3.pro \
+		|| die "sed fwbuilder3.pro failed"
 
 	econf $(use_enable nls) || die "configure failed"
 
 	# use eqmake to generate Makefiles
-	eqmake3 fwbuilder2.pro
-	for subdir in po src src/res src/tools src/gui \
-			src/fwblookup src/fwbedit src/ipt src/pflib \
-			src/pf src/ipf src/ipfw src/parsers; do
-		eqmake3 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
+	eqmake4 fwbuilder3.pro
+	for subdir in src src/res src/fwbedit src/gui src/ipt \
+			src/pflib src/pf src/ipf src/ipfw src/tools \
+			src/cisco_lib src/iosacl src/pix src/parsers; do
+			# 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
 }
 
 src_install() {
-	emake install DDIR="${D}" || die "install failed"
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "Install failed"
 
 	cd doc
 	dodoc AUTHORS ChangeLog Credits README* \
 		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
-	newdoc ReleaseNotes_${PV}.txt ReleaseNotes
+	# release notes for 3.0.1 not found in doc dir :/
+	#newdoc ReleaseNotes_${PV}.txt ReleaseNotes
 	doman fwb*.1
-	cd ..
-
-	newicon src/gui/icons/firewall_64.png ${PN}.png
-	make_desktop_entry fwbuilder "Firewall Builder" ${PN} "System;Security;Qt"
 }
 
 pkg_postinst() {