Version bump and cleanup, intention is to call for stable on 3.2.8 after 30day period

(Portage version: 2.1.2-r1)

15 files changed, 27 insertions, 401 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 985d393b4ba8..bf7dc5eafb42 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.121 2007/01/08 07:47:30 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.122 2007/02/01 16:58:52 jokey Exp $
+
+*shorewall-3.2.8 (01 Feb 2007)
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -files/shorewall,
+  -shorewall-2.4.2.ebuild, -shorewall-3.0.4.ebuild, -shorewall-3.0.6.ebuild,
+  -shorewall-3.0.9.ebuild, -shorewall-3.2.3.ebuild, -shorewall-3.2.4.ebuild,
+  +shorewall-3.2.8.ebuild:
+  Version bump and cleanup, intention is to call for stable on 3.2.8 after
+  30day period
 
   06 Jan 2007; Stephanie Lockwood-Childs <wormo@gentoo.org>
   shorewall-3.2.4.ebuild:
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.2 b/net-firewall/shorewall/files/digest-shorewall-2.4.2
deleted file mode 100644
index b1a06250f6aa..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.4.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ff6adb5b81633684fbf2c44da53f847e shorewall-2.4.2.tgz 132141
-RMD160 450a5e35cba936b9985a7d688f59016f178a3a8e shorewall-2.4.2.tgz 132141
-SHA256 baf89f7a2d92f2131034dcb77e5e7f094347d774d13a4755fe4eec0955f3ca10 shorewall-2.4.2.tgz 132141
-MD5 e27c9f2ffaf5860e56e24088a0e4c351 shorewall-docs-html-2.4.2.tgz 2609552
-RMD160 b7fad02a801079a6c10162ad8676378ebc4833ec shorewall-docs-html-2.4.2.tgz 2609552
-SHA256 41451957862e97ee89c6d6a6f85273845b235c1d03aed1de7d7acd6f2be4e725 shorewall-docs-html-2.4.2.tgz 2609552
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.4 b/net-firewall/shorewall/files/digest-shorewall-3.0.4
deleted file mode 100644
index 54799af585ed..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.0.4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6f5c00e9806a928387e49419f87a46f8 shorewall-3.0.4.tgz 189506
-RMD160 4bd702b510e132731ca119e02e3fa6baaf4598cb shorewall-3.0.4.tgz 189506
-SHA256 ff85de91fb9575a71f1a11195d75c1de76b5fdda39eb23b8577d0a1f61c90646 shorewall-3.0.4.tgz 189506
-MD5 10b16287ec08383b8eee442e10d008fa shorewall-docs-html-3.0.4.tgz 3281011
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.6 b/net-firewall/shorewall/files/digest-shorewall-3.0.6
deleted file mode 100644
index 5631502b5e6d..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.0.6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6989b3aa3b19ae45e8ed1c88e0ef6141 shorewall-3.0.6.tgz 202443
-RMD160 dbd77ca668cdfa01fd4ef41bb6ba6e5a39f48c79 shorewall-3.0.6.tgz 202443
-SHA256 6f70cbd244e56f34898c2a951a0bacec3e90eedf406dd94d12e93f8b5bf8a7f1 shorewall-3.0.6.tgz 202443
-MD5 2a6dd2b2369d653e076ae14c80b77e67 shorewall-docs-html-3.0.6.tgz 3323714
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.9 b/net-firewall/shorewall/files/digest-shorewall-3.0.9
deleted file mode 100644
index 21e39f851bf4..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.0.9
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d669260ca54df6b377dac3e489191424 shorewall-3.0.9.tgz 205895
-RMD160 ee02d23bd20a8a3f7af9c1cc05a07ed41e44c042 shorewall-3.0.9.tgz 205895
-SHA256 054823fea6f1796ea63ae3c4cb11062bd153f40f1a6333df9b248f05d8b50a0a shorewall-3.0.9.tgz 205895
-MD5 01b40462f0c7e14c79fea0aeb97769ac shorewall-docs-html-3.0.9.tgz 3706962
-RMD160 bfbf718425296807da00c8f2191cfba0179c702d shorewall-docs-html-3.0.9.tgz 3706962
-SHA256 442864d3cf79cafcea4a52ef18495cc47b5badd6ed0ce936fb417a7a12b61370 shorewall-docs-html-3.0.9.tgz 3706962
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.2.3 b/net-firewall/shorewall/files/digest-shorewall-3.2.3
deleted file mode 100644
index de8ceab94e88..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.2.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 23253356edc5a50c91ff00ee5669f397 shorewall-3.2.3.tgz 234309
-RMD160 167fd93ea26afd7a6161a43240d62e508a6e89eb shorewall-3.2.3.tgz 234309
-SHA256 a318aef786f4ba128396728f169f86b0a0025a2b6b2d187c97508d18ac87eae5 shorewall-3.2.3.tgz 234309
-MD5 a63a1959b11016eb0754068ae27eaabf shorewall-docs-html-3.2.3.tgz 3700263
-RMD160 4a4b00d21984598166d69036f3a8b759f03680c0 shorewall-docs-html-3.2.3.tgz 3700263
-SHA256 ffcc0141fc03a517690df62b2c232aeeadc70cad33b564865c15355843970d44 shorewall-docs-html-3.2.3.tgz 3700263
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.2.4 b/net-firewall/shorewall/files/digest-shorewall-3.2.4
deleted file mode 100644
index 174c339bd712..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.2.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bd32ceda6f2152a27bc781a7aa9ec0a0 shorewall-3.2.4.tgz 231147
-RMD160 a188f134ca287738bc6ddac31ebe7cfe59273def shorewall-3.2.4.tgz 231147
-SHA256 060d87791cdf2e44e421c3d5d0de7673f7a7e1d958e0c46d842331319fe75e22 shorewall-3.2.4.tgz 231147
-MD5 e9de823c8b7ecae92d31ed7d4466637d shorewall-docs-html-3.2.4.tgz 3701744
-RMD160 fbc4adb4b0d19c63901d79a2ff41593d0fc3ed86 shorewall-docs-html-3.2.4.tgz 3701744
-SHA256 74fe92892689864b2cff2fa674a84794028eb931054dfb22873c99e20e73a556 shorewall-docs-html-3.2.4.tgz 3701744
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.2.8 b/net-firewall/shorewall/files/digest-shorewall-3.2.8
new file mode 100644
index 000000000000..855059e08627
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.2.8
@@ -0,0 +1,6 @@
+MD5 e8f595b7e792c7bba5858718a98a55ac shorewall-3.2.8.tgz 236795
+RMD160 90c3b256d7a37ea272b5fd7cc62e9cb6e0cd2341 shorewall-3.2.8.tgz 236795
+SHA256 3c9f961bdb109bf9df5e52aedd56ad15c7c687d3b9cf4fee9d00caf7f44982e3 shorewall-3.2.8.tgz 236795
+MD5 028d4330844428dda9e7a0f643937581 shorewall-docs-html-3.2.8.tgz 2073635
+RMD160 a932b68ec6eb775e5b1f508ebe6f516c8b62b20c shorewall-docs-html-3.2.8.tgz 2073635
+SHA256 c2ee9b2f43698094193585d221e5f595ec680eaa2f383da5d2b278fbbd8bfb1e shorewall-docs-html-3.2.8.tgz 2073635
diff --git a/net-firewall/shorewall/files/shorewall b/net-firewall/shorewall/files/shorewall
deleted file mode 100644
index b6693689064d..000000000000
--- a/net-firewall/shorewall/files/shorewall
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall,v 1.8 2005/07/20 02:17:12 gustavoz Exp $
-
-opts="start stop restart clear"
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	ebegin "Starting firewall"
-	/sbin/shorewall start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping firewall"
-	/sbin/shorewall stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting firewall"
-	/sbin/shorewall restart 1>/dev/null
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
-	/sbin/shorewall clear
-	eend $?
-}
diff --git a/net-firewall/shorewall/shorewall-2.4.2.ebuild b/net-firewall/shorewall/shorewall-2.4.2.ebuild
deleted file mode 100644
index 93d07d916cfb..000000000000
--- a/net-firewall/shorewall/shorewall-2.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.5 2005/09/14 19:02:18 ferdy Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.4/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd ${FILESDIR}/shorewall || die "doinitd failed"
-
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo
-}
diff --git a/net-firewall/shorewall/shorewall-3.0.4.ebuild b/net-firewall/shorewall/shorewall-3.0.4.ebuild
deleted file mode 100644
index 62e4aa363ee6..000000000000
--- a/net-firewall/shorewall/shorewall-3.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.4.ebuild,v 1.7 2006/05/07 20:12:57 corsair Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/3.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/3.0/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd "${FILESDIR}"/shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		# install documentation
-		dohtml -r *
-		dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
-		# install samples
-		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html."
-		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo
-	einfo "Be aware that version 3 differs substantially from previous releases."
-	einfo "Information on upgrading is available at:"
-	einfo "http://www.shorewall.net/upgrade_issues.htm"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${PN}/3.0/${P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall/shorewall-3.0.6.ebuild b/net-firewall/shorewall/shorewall-3.0.6.ebuild
deleted file mode 100644
index 453915500f03..000000000000
--- a/net-firewall/shorewall/shorewall-3.0.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.6.ebuild,v 1.5 2006/05/30 15:41:25 gustavoz Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/3.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/3.0/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall-r1 shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		# install documentation
-		dohtml -r *
-		dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
-		# install samples
-		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html."
-		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo "or install kernel 2.6.16+ and compile it with support for policy match."
-	einfo
-	einfo "Be aware that version 3 differs substantially from previous releases."
-	einfo "Information on upgrading is available at:"
-	einfo "http://www.shorewall.net/upgrade_issues.htm"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${PN}/3.0/${P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall/shorewall-3.0.9.ebuild b/net-firewall/shorewall/shorewall-3.0.9.ebuild
deleted file mode 100644
index 2f098a4a10bb..000000000000
--- a/net-firewall/shorewall/shorewall-3.0.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.9.ebuild,v 1.1 2006/10/08 19:58:52 jokey Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/3.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/3.0/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall-r1 shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		# install documentation
-		dohtml -r *
-		dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
-		# install samples
-		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html."
-		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo "or install kernel 2.6.16+ and compile it with support for policy match."
-	einfo
-	einfo "Be aware that version 3 differs substantially from previous releases."
-	einfo "Information on upgrading is available at:"
-	einfo "http://www.shorewall.net/upgrade_issues.htm"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${PN}/3.0/${P}/known_problems.txt"
-	einfo
-	einfo "Whether upgrading or installing you should run shorewall check,"
-	einfo "correct any errors found and run shorewall restart|start"
-}
diff --git a/net-firewall/shorewall/shorewall-3.2.3.ebuild b/net-firewall/shorewall/shorewall-3.2.3.ebuild
deleted file mode 100644
index 77507538857d..000000000000
--- a/net-firewall/shorewall/shorewall-3.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.3.ebuild,v 1.1 2006/09/18 12:25:40 strerror Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/3.2/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/3.2/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall-r2 shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		# install documentation
-		dohtml -r *
-		## dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
-		# install samples
-		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html."
-		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo "or install kernel 2.6.16+ as well as a recent Netfilter iptables"
-	einfo "and compile it with support for policy match."
-	einfo
-	einfo "Be aware that version 3.2 differs substantially from previous releases."
-	einfo "Information on upgrading is available at:"
-	einfo "http://www.shorewall.net/upgrade_issues.htm"
-	einfo
-	einfo "If you are upgrading to 3.2 you should at least:"
-	einfo "* check that /etc/shorewall/rfc1918 does not contain non-RFC1918 private"
-	einfo "  addresses. If it does, rename it to rfc1918.old"
-	einfo "* remove /etc/shorewall/modules and use the one in /usr/share/shorewall/"
-	einfo "* if you want to use xtables (kernel 2.6.16+) then"
-	einfo "  cp -f /usr/share/shorewall/xmodules /etc/shorewall/modules"
-	einfo "* review IMAP LDAP NNTP POP3 SMTP and WEB macros as they have changed"
-	einfo
-	einfo "There is a new 'shorewall compile' command to generate scripts to run"
-	einfo "on systems with Shorewall Lite installed."
-	einfo "Please refer to http://www.shorewall.net/CompiledPrograms.html"
-	einfo "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	einfo "own 'export directories'. However, whenever you upgrade Shorewall you"
-	einfo "should check for changes in configfiles and manually update your exports."
-	einfo "Alternatively, if you only have one Shorewall-Lite system in your network"
-	einfo "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	einfo "in /etc/make.conf (man make.conf)."
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${PN}/3.2/${P}/known_problems.txt"
-	einfo
-	einfo "Whether upgrading or installing you should run shorewall check,"
-	einfo "correct any errors found and run shorewall restart|start."
-}
diff --git a/net-firewall/shorewall/shorewall-3.2.4.ebuild b/net-firewall/shorewall/shorewall-3.2.8.ebuild
index 693d4ec24a0f..e6e5b5b8c596 100644
--- a/net-firewall/shorewall/shorewall-3.2.4.ebuild
+++ b/net-firewall/shorewall/shorewall-3.2.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.4.ebuild,v 1.6 2007/01/08 07:47:30 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.8.ebuild,v 1.1 2007/02/01 16:58:52 jokey Exp $
+
+inherit eutils
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
@@ -11,12 +13,18 @@ SRC_URI="http://shorewall.net/pub/${PN}/3.2/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=net-firewall/iptables-1.2.4
 	sys-apps/iproute2"
 
+pkg_setup() {
+	if built_with_use sys-apps/iproute2 minimal; then
+	    die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
+	fi
+}
+
 src_compile() {
 	einfo "Nothing to compile."
 }
@@ -42,6 +50,7 @@ pkg_postinst() {
 	einfo
 	if use doc ; then
 		einfo "Documentation is available at /usr/share/doc/${PF}/html."
+		einfo "Please read the Release Notes in /usr/share/doc/${PF}."
 		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
 	else
 		einfo "Documentation is available at http://www.shorewall.net"