Cleaning up old versions; version bump

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

23 files changed, 41 insertions, 903 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 6a36ab1aafab..1a4aa498d22c 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.77 2011/03/21 17:05:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.78 2011/03/27 11:01:11 constanze Exp $
+
+*shorewall-lite-4.4.18.1 (27 Mar 2011)
+
+  27 Mar 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-lite-4.2.11.ebuild, -shorewall-lite-4.4.15.3.ebuild,
+  -shorewall-lite-4.4.16.1.ebuild, -shorewall-lite-4.4.17.ebuild,
+  +shorewall-lite-4.4.18.1.ebuild:
+  Cleaning up old versions; version bump
 
   21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   shorewall-lite-4.4.15.1.ebuild:
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.2.11.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.11.ebuild
deleted file mode 100644
index a11f1ac1b95f..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.2.11.ebuild,v 1.7 2010/05/07 18:04:05 armin76 Exp $
-
-inherit versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_PN}-docs-html-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for shorewall-lite(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	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 "Note that /etc/shorewall-lite/shorewall.conf has been renamed"
-	einfo "to /etc/shorewall-lite/shorewall-lite.conf"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild
deleted file mode 100644
index f805db14a5fb..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild,v 1.1 2011/01/23 19:22:55 constanze Exp $
-
-inherit versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}${MY_P_BETA}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.17.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.17.ebuild
deleted file mode 100644
index 36ce7db4ac07..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.17.ebuild,v 1.1 2011/02/12 16:35:09 constanze Exp $
-
-inherit versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}${MY_P_BETA}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.15.3.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.18.1.ebuild
index 1dbda9ebcc57..30a16398c0f5 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.15.3.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.4.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.15.3.ebuild,v 1.1 2011/01/11 20:09:46 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.18.1.ebuild,v 1.1 2011/03/27 11:01:11 constanze Exp $
 
 inherit versionator
 
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 74e1d4f093ac..12582cc9c63f 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.182 2011/03/21 17:04:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.183 2011/03/27 11:00:00 constanze Exp $
+
+*shorewall-4.4.18.1 (27 Mar 2011)
+
+  27 Mar 2011; Constanze Hausner <constanze@gentoo.org>
+  -files/4.4.10-underscore-not-dash.patch, -shorewall-3.4.8.ebuild,
+  -shorewall-4.4.15.3.ebuild, -shorewall-4.4.16.1.ebuild,
+  -shorewall-4.4.17.ebuild, +shorewall-4.4.18.1.ebuild, -files/shorewall-r1,
+  -files/shorewall-r2:
+  Cleaning up old versions; version bump
 
   21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   shorewall-4.4.15.1.ebuild:
diff --git a/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch b/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch
deleted file mode 100644
index 15e3671aa59a..000000000000
--- a/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr shorewall-4.4.10.ORIG//install.sh shorewall-4.4.10/install.sh
---- shorewall-4.4.10.ORIG//install.sh	2010-06-16 15:32:46.000000000 +0100
-+++ shorewall-4.4.10/install.sh	2010-06-16 15:33:29.000000000 +0100
-@@ -745,7 +745,7 @@
- #
- # Install the  Makefiles
- #
--install-file Makefile-lite ${DESTDIR}/usr/share/shorewall/configfiles/Makefile 0644
-+install_file Makefile-lite ${DESTDIR}/usr/share/shorewall/configfiles/Makefile 0644
- 
- if [ -z "$SPARSE" ]; then
-     run_install $OWNERSHIP -m 0600 Makefile ${DESTDIR}/etc/shorewall
diff --git a/net-firewall/shorewall/files/shorewall-r1 b/net-firewall/shorewall/files/shorewall-r1
deleted file mode 100644
index 548b4d95c01d..000000000000
--- a/net-firewall/shorewall/files/shorewall-r1
+++ /dev/null
@@ -1,47 +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-r1,v 1.1 2006/02/19 02:33:35 vanquirius Exp $
-
-opts="start stop restart clear"
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	ebegin "Starting firewall"
-	/sbin/shorewall -f 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"
-	if [ -f /var/lib/shorewall/restore ] ; then
-		/sbin/shorewall restore
-	else
-		/sbin/shorewall restart 1>/dev/null
-	fi
-	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/files/shorewall-r2 b/net-firewall/shorewall/files/shorewall-r2
deleted file mode 100644
index ddcdd521a7f2..000000000000
--- a/net-firewall/shorewall/files/shorewall-r2
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall-r2,v 1.1 2006/09/18 12:25:40 strerror Exp $
-
-opts="start stop restart clear reset refresh check"
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	ebegin "Starting firewall"
-	/sbin/shorewall -f 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"
-	if [ -f /var/lib/shorewall/restore ] ; then
-		/sbin/shorewall restore
-	else
-		/sbin/shorewall restart 1>/dev/null
-	fi
-	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 $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the firewall"
-	/sbin/shorewall reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing firewall rules"
-	/sbin/shorewall refresh
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking configuration files"
-	/sbin/shorewall check
-	eend $?
-}
diff --git a/net-firewall/shorewall/shorewall-3.4.8.ebuild b/net-firewall/shorewall/shorewall-3.4.8.ebuild
deleted file mode 100644
index ea554463066b..000000000000
--- a/net-firewall/shorewall/shorewall-3.4.8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.4.8.ebuild,v 1.9 2009/03/08 14:27:33 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils
-
-#MY_P_TREE="development/3.9"
-MY_P_TREE="3.4"
-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://www1.shorewall.net/pub/${PN}/${MY_P_TREE}/${P}/${P}.tgz
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_P_TREE}/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]"
-RDEPEND="${DEPEND}"
-
-# When we're ready for 3.9.x...
-#RDEPEND="|| (
-#	>=net-firewall/shorewall-shell-3.9.1
-#	>=net-firewall/shorewall-perl-3.9.1
-#	)"
-
-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 || die
-
-	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() {
-	elog
-	if use doc ; then
-		elog "Documentation is available at /usr/share/doc/${PF}/html."
-		elog "Please read the Release Notes in /usr/share/doc/${PF}."
-		elog "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		elog "Documentation is available at http://www.shorewall.net"
-	fi
-	elog "There are man pages for shorewall(8) and for each configuration file."
-	elog
-	elog "Bridging configuration has changed with kernel 2.6.20+. Check the documentation."
-	elog
-	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	elog "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	elog
-	elog "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	elog "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	elog "or install kernel 2.6.16+ as well as a recent Netfilter iptables"
-	elog "and compile it with support for policy match."
-	elog
-	elog "Be aware that version ${MY_P_TREE} differs substantially from previous releases."
-	elog "Information on upgrading is available at:"
-	elog "http://www.shorewall.net/upgrade_issues.htm"
-	elog
-	elog "If you are upgrading to ${MY_P_TREE} you should at least:"
-	elog "* check that /etc/shorewall/rfc1918 does not contain non-RFC1918 private"
-	elog "  addresses. If it does, rename it to rfc1918.old"
-	elog "* remove /etc/shorewall/modules and use the one in /usr/share/shorewall/"
-	elog "* review IMAP LDAP NNTP POP3 SMTP and WEB macros as they have changed"
-	elog "* move any policy's default action specifications"
-	elog "  from /etc/shorewall/actions to /etc/shorewall/shorewall.conf"
-	elog "* remove or rename custom version of Limit action (if any)"
-	elog "* entries in /etc/shorewall/providers require specific procedure at startup"
-	elog
-	elog "There is a new 'shorewall compile' command to generate scripts to run"
-	elog "on systems with Shorewall Lite installed."
-	elog "Please refer to http://www.shorewall.net/CompiledPrograms.html"
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-	elog
-	elog "Known problems:"
-	elog "http://shorewall.net/pub/${PN}/${MY_P_TREE}/${P}/known_problems.txt"
-	elog
-	elog "Whether upgrading or installing you should run shorewall check,"
-	elog "correct any errors found and run shorewall restart|start."
-	elog
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.15.3.ebuild b/net-firewall/shorewall/shorewall-4.4.15.3.ebuild
deleted file mode 100644
index 3042662713d2..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.15.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.15.3.ebuild,v 1.1 2011/01/11 20:10:27 constanze Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}${MY_P_BETA}"
-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://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-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[-minimal]
-	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt || die
-
-	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}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-	elog
-	elog "${PN} now uses Perl only. The shell compiler is obsolete."
-	elog "shorewall-common, shorewall-shell and shorewall-perl have been removed."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.16.1.ebuild b/net-firewall/shorewall/shorewall-4.4.16.1.ebuild
deleted file mode 100644
index 00a7cd1f61bc..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.16.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.16.1.ebuild,v 1.1 2011/01/23 19:22:04 constanze Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}${MY_P_BETA}"
-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://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-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[-minimal]
-	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt || die
-
-	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}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-	elog
-	elog "${PN} now uses Perl only. The shell compiler is obsolete."
-	elog "shorewall-common, shorewall-shell and shorewall-perl have been removed."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.17.ebuild b/net-firewall/shorewall/shorewall-4.4.18.1.ebuild
index e8e1a6ab2d2c..6297fdd6137d 100644
--- a/net-firewall/shorewall/shorewall-4.4.17.ebuild
+++ b/net-firewall/shorewall/shorewall-4.4.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.17.ebuild,v 1.1 2011/02/12 16:34:19 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.18.1.ebuild,v 1.1 2011/03/27 11:00:00 constanze Exp $
 
 EAPI="2"
 
@@ -49,7 +49,6 @@ src_install() {
 		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}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
 	fi
@@ -62,7 +61,4 @@ pkg_postinst() {
 	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
 	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
 	elog "in /etc/make.conf (man make.conf)."
-	elog
-	elog "${PN} now uses Perl only. The shell compiler is obsolete."
-	elog "shorewall-common, shorewall-shell and shorewall-perl have been removed."
 }
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index b9ff2cae965c..2a4ad5b27a83 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall6-lite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.20 2011/03/13 11:48:05 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.21 2011/03/27 11:02:12 constanze Exp $
+
+*shorewall6-lite-4.4.18.1 (27 Mar 2011)
+
+  27 Mar 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-lite-4.4.15.3.ebuild, -shorewall6-lite-4.4.16.1.ebuild,
+  -shorewall6-lite-4.4.17.ebuild, +shorewall6-lite-4.4.18.1.ebuild:
+  Cleaning up old versions; version bump
 
 *shorewall6-lite-4.4.18 (13 Mar 2011)
 
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.1.ebuild
deleted file mode 100644
index 2bc3fa3bc1ad..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.1.ebuild,v 1.1 2011/01/23 19:24:26 constanze Exp $
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}${MY_P_BETA}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.17.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.17.ebuild
deleted file mode 100644
index e2af4b69f1aa..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.17.ebuild,v 1.1 2011/02/12 16:36:27 constanze Exp $
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}${MY_P_BETA}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.15.3.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.18.1.ebuild
index 57bc01f7f79f..3831b92ec780 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.15.3.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.15.3.ebuild,v 1.1 2011/01/11 20:08:12 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.18.1.ebuild,v 1.1 2011/03/27 11:02:12 constanze Exp $
 
 inherit versionator linux-info
 
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 543f95059242..41fd4ededb40 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.31 2011/03/21 17:09:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.32 2011/03/27 11:01:48 constanze Exp $
+
+*shorewall6-4.4.18.1 (27 Mar 2011)
+
+  27 Mar 2011; Constanze Hausner <constanze@gentoo.org>
+  -files/shorewall6.initd2, -shorewall6-4.2.11-r1.ebuild,
+  -shorewall6-4.4.15.3.ebuild, -shorewall6-4.4.16.1.ebuild,
+  -shorewall6-4.4.17.ebuild, +shorewall6-4.4.18.1.ebuild:
+  Cleaning up old versions; version bump
 
   21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> shorewall6-4.4.18.ebuild:
   Marked ~ppc
diff --git a/net-firewall/shorewall6/files/shorewall6.initd2 b/net-firewall/shorewall6/files/shorewall6.initd2
deleted file mode 100644
index 804e040794ab..000000000000
--- a/net-firewall/shorewall6/files/shorewall6.initd2
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd2,v 1.1 2010/04/13 13:29:58 chainsaw Exp $
-
-opts="start stop restart clear reset refresh check"
-
-depend() {
-	before net
-	provide firewall
-}
-
-start() {
-	ebegin "Starting firewall"
-	/sbin/shorewall6 -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping firewall"
-	/sbin/shorewall6 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/shorewall6 status >/dev/null
-	if [ $? != 0 ] ; then
-	    svc_start
-	else
-	    if [ -f /var/lib/shorewall6/restore ] ; then
-		/sbin/shorewall6 restore
-	    else
-		/sbin/shorewall6 restart 1>/dev/null
-	    fi
-	fi
-	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/shorewall6 clear
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the firewall"
-	/sbin/shorewall6 reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing firewall rules"
-	/sbin/shorewall6 refresh
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking configuration files"
-	/sbin/shorewall6 check
-	eend $?
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild
deleted file mode 100644
index a5e712b37b1e..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild,v 1.8 2011/01/04 14:26:53 xmw Exp $
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""      				# stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
-
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-perl-${MY_PV_BASE}
-	dev-perl/Socket6
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "You should *not* use the detect option on interfaces"
-	ewarn "as shorewall will now start *before* net."
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8)."
-	einfo "For additional information, see"
-	einfo "http://www.shorewall.net/IPV6Support.html"
-	use doc && einfo "Sample configuration files are in /usr/share/doc/${PF}."
-	einfo
-	elog "If you wish to include DNS names in your IPv6 configuration files,"
-	elog "you must have Perl 5.10 and must emerge dev-perl/Socket6."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.16.1.ebuild b/net-firewall/shorewall6/shorewall6-4.4.16.1.ebuild
deleted file mode 100644
index e6deb6a08d2c..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.16.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.16.1.ebuild,v 1.1 2011/01/23 19:23:43 constanze Exp $
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""      				# stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to include DNS names in your IPv6 configuration files,"
-	elog "you must have Perl 5.10+ and must emerge dev-perl/Socket6."
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.17.ebuild b/net-firewall/shorewall6/shorewall6-4.4.17.ebuild
deleted file mode 100644
index 5ee2dfd232e5..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.17.ebuild,v 1.1 2011/02/12 16:35:48 constanze Exp $
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""      				# stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to include DNS names in your IPv6 configuration files,"
-	elog "you must have Perl 5.10+ and must emerge dev-perl/Socket6."
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.15.3.ebuild b/net-firewall/shorewall6/shorewall6-4.4.18.1.ebuild
index ca5c6cb80a86..2f1fa4054ea8 100644
--- a/net-firewall/shorewall6/shorewall6-4.4.15.3.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.4.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.15.3.ebuild,v 1.1 2011/01/11 20:08:59 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.18.1.ebuild,v 1.1 2011/03/27 11:01:48 constanze Exp $
 
 inherit versionator linux-info
 
@@ -18,7 +18,7 @@ SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc"