2.2.3 stable x86; cleanup

(Portage version: 2.0.51.22-r1)

8 files changed, 7 insertions, 172 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index a17794048977..e77493445e5d 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.71 2005/06/17 20:46:31 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.72 2005/06/20 15:57:56 smithj Exp $
+
+  20 Jun 2005; Jonathan Smith <smithj@gentoo.org> -shorewall-1.4.10f.ebuild,
+  -shorewall-2.0.4.ebuild, -shorewall-2.2.2.ebuild, shorewall-2.2.3.ebuild:
+  2.2.3 stable x86; cleanup
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   shorewall-2.0.7.ebuild:
diff --git a/net-firewall/shorewall/files/digest-shorewall-1.4.10f b/net-firewall/shorewall/files/digest-shorewall-1.4.10f
deleted file mode 100644
index 6f150a301d3f..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-1.4.10f
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 217011c68ea56503913cd7dbac84ae57 shorewall-1.4.10f.tgz 87883
-MD5 4526fd09bc6d79853d7bf975c04328db shorewall-docs-html-1.4.10f.tgz 2257263
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.4 b/net-firewall/shorewall/files/digest-shorewall-2.0.4
deleted file mode 100644
index 92463c752b9a..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a76a7796fd3b76493a51521b8a94772 shorewall-2.0.4.tgz 99812
-MD5 f6d5486312e3d07b5b39866353462e6f shorewall-docs-html-2.0.4.tgz 2411374
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.2 b/net-firewall/shorewall/files/digest-shorewall-2.2.2
deleted file mode 100644
index 643604c3d83d..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 eb0ad1ad0867299e372e7f2522092751 shorewall-2.2.2.tgz 124958
-MD5 d394eb7edb07a10fda70b92e3177a340 shorewall-docs-html-2.2.2.tgz 2548525
diff --git a/net-firewall/shorewall/shorewall-1.4.10f.ebuild b/net-firewall/shorewall/shorewall-1.4.10f.ebuild
deleted file mode 100644
index 9046d799dbcf..000000000000
--- a/net-firewall/shorewall/shorewall-1.4.10f.ebuild
+++ /dev/null
@@ -1,38 +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-1.4.10f.ebuild,v 1.8 2005/01/22 15:18:01 kloeri Exp $
-
-IUSE="doc"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${P}.tgz
-	doc? ( ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${PN}-docs-html-${PV}.tgz )"
-#RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~amd64"
-
-DEPEND="virtual/libc
-	net-firewall/iptables
-	sys-apps/iproute2"
-
-src_install() {
-	keepdir /var/lib/shorewall
-	PREFIX=${D} ./install.sh /etc/init.d || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${PN}-docs-html-${PV}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "and edit the files in /etc/shorewall before starting the firewall"
-}
diff --git a/net-firewall/shorewall/shorewall-2.0.4.ebuild b/net-firewall/shorewall/shorewall-2.0.4.ebuild
deleted file mode 100644
index 6d6fa9d924cf..000000000000
--- a/net-firewall/shorewall/shorewall-2.0.4.ebuild
+++ /dev/null
@@ -1,59 +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.0.4.ebuild,v 1.6 2005/01/22 15:18:01 kloeri Exp $
-
-IUSE="doc"
-
-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.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.0/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~amd64"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd ${WORKDIR}/${P}
-	PREFIX=${D} ./install.sh || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
-	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
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.2.ebuild b/net-firewall/shorewall/shorewall-2.2.2.ebuild
deleted file mode 100644
index 1036613be1e0..000000000000
--- a/net-firewall/shorewall/shorewall-2.2.2.ebuild
+++ /dev/null
@@ -1,66 +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.2.2.ebuild,v 1.1 2005/03/24 00:47:52 vanquirius 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.2/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.2/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-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() {
-	echo
-
-	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 "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	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/"
-	echo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.3.ebuild b/net-firewall/shorewall/shorewall-2.2.3.ebuild
index 0b3162479131..04efe1ad5484 100644
--- a/net-firewall/shorewall/shorewall-2.2.3.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2.3.ebuild,v 1.1 2005/04/20 12:35:25 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.2.3.ebuild,v 1.2 2005/06/20 15:57:56 smithj Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
@@ -11,7 +11,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="doc"
 
 DEPEND="virtual/libc