Don't depend on shorewall-shell by default, bug #211321, thank you Stefan Wimmer for report and Vieri for the fix.

Package-Manager: portage-2.1.4.4

2 files changed, 16 insertions, 12 deletions

diff --git a/net-firewall/shorewall-perl/ChangeLog b/net-firewall/shorewall-perl/ChangeLog
index 002f79141be0..551cde07ccbc 100644
--- a/net-firewall/shorewall-perl/ChangeLog
+++ b/net-firewall/shorewall-perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/shorewall-perl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/ChangeLog,v 1.11 2008/02/24 18:49:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/ChangeLog,v 1.12 2008/02/25 18:10:27 pva Exp $
+
+  25 Feb 2008; <pva@gentoo.org> shorewall-perl-4.0.9.ebuild:
+  Don't depend on shorewall-shell by default, bug #211321, thank you Stefan
+  Wimmer for report and Vieri for the fix.
 
 *shorewall-perl-4.0.9 (24 Feb 2008)
 
diff --git a/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild b/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild
index 614aeb7d223d..055f044a8b32 100644
--- a/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild
+++ b/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild,v 1.1 2008/02/24 18:49:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/shorewall-perl-4.0.9.ebuild,v 1.2 2008/02/25 18:10:27 pva Exp $
 
-# 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 Perl-based compiler that allows faster compilation and execution."
 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="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
 IUSE=""
 
 DEPEND="net-firewall/iptables
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 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
@@ -41,9 +41,9 @@ pkg_postinst() {
 	einfo
 	einfo "Documentation is available at http://www.shorewall.net"
 	einfo
-	einfo "In order to use the Perl compiler you need to add"
-	einfo "SHOREWALL_COMPILER=perl"
-	einfo "to shorewall.conf"
+	elog "In order to use the Perl compiler you need to add"
+	elog "SHOREWALL_COMPILER=perl"
+	elog "to shorewall.conf unless you did not install the Shell compiler."
 	einfo
 	einfo "Please read the included release notes for more information."
 	einfo