--- /usr/portage/net-firewall/shorewall-shell/shorewall-shell-4.0.9.ebuild	2008-02-24 19:45:36.000000000 +0100
+++ /usr/local/portage/net-firewall/shorewall-shell/shorewall-shell-4.0.9.ebuild	2008-02-25 17:11:52.000000000 +0100
@@ -1,22 +1,21 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-shell/shorewall-shell-4.0.9.ebuild,v 1.1 2008/02/24 18:45:36 pva Exp $
+# $Header: $
 
-# Choose between experimental, stable and beta:
-#MY_P_TREE="development/4.0"  # experimental and beta
-MY_P_TREE="4.0"             # stable
-#MY_P_BETA="-Beta7"           # only beta
-MY_P_BETA=""                # stable or experimental
+# Select version (stable, RC, Beta, upstream patched):
+MY_P_TREE="4.0"   # stable/devel (eg. "4.0" or "development/4.0")
+MY_P_BETA=""      # stable or experimental (eg. "-RC1" or "-Beta4")
+MY_P_PATCH=""     # upstream patch (eg. ".2")
 
 MY_P="shorewall-${PV}"
 
 DESCRIPTION="Shoreline Firewall shell-based compiler."
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}${MY_P_BETA}/${P}${MY_P_BETA}.tar.bz2"
+SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}${MY_P_BETA}/${P}${MY_P_PATCH}${MY_P_BETA}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="net-firewall/iptables
@@ -30,7 +29,7 @@
 }
 
 src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
+	cd "${WORKDIR}/${P}${MY_P_PATCH}${MY_P_BETA}"
 	PREFIX="${D}" ./install.sh || die "install.sh failed"
 
 	dodoc releasenotes.txt
@@ -40,9 +39,9 @@
 	einfo
 	einfo "Documentation is available at http://www.shorewall.net"
 	einfo
-	einfo "In order to use the shell compiler you need to add"
-	einfo "SHOREWALL_COMPILER=shell"
-	einfo "to shorewall.conf"
+	elog "In order to use the shell compiler you need to add"
+	elog "SHOREWALL_COMPILER=shell"
+	elog "to shorewall.conf unless you do not have the Perl compiler."
 	einfo
 	einfo "Please read the included release notes for more information."
 	einfo