Version bump; Cleaned up old versions

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

23 files changed, 48 insertions, 1082 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index fb934ca66045..aeba3bf45d25 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2011/01/11 20:09:46 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.69 2011/01/23 19:22:55 constanze Exp $
+
+*shorewall-lite-4.4.16.1 (23 Jan 2011)
+
+  23 Jan 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-lite-3.4.8.ebuild, -shorewall-lite-4.0.15.ebuild,
+  -shorewall-lite-4.2.8.ebuild, -shorewall-lite-4.2.9.ebuild,
+  -shorewall-lite-4.4.2.ebuild, -shorewall-lite-4.4.10.ebuild,
+  +shorewall-lite-4.4.16.1.ebuild:
+  Version bump; Cleaned up old versions
 
 *shorewall-lite-4.4.15.3 (11 Jan 2011)
 
diff --git a/net-firewall/shorewall-lite/shorewall-lite-3.4.8.ebuild b/net-firewall/shorewall-lite/shorewall-lite-3.4.8.ebuild
deleted file mode 100644
index b86d0f12fb59..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-3.4.8.ebuild
+++ /dev/null
@@ -1,58 +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-lite/shorewall-lite-3.4.8.ebuild,v 1.7 2009/02/28 18:41:32 pva Exp $
-
-#MY_P_TREE="development/3.9"
-MY_P_TREE="3.4"
-MY_P="shorewall-${PV}"
-MY_P_DOCS="${P/${PN}/shorewall-docs-html}"
-
-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/shorewall/${MY_P_TREE}/${MY_P}/${P}.tgz
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa 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
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	elog
-	elog "Documentation is available at http://www.shorewall.net"
-	elog "There are man pages for shorewall-lite(8) and for each"
-	elog "configuration file."
-	elog
-	elog "You should have already generated a firewall script with"
-	elog "'shorewall compile' on the administrative Shorewall."
-	elog "Please refer to"
-	elog "http://www.shorewall.net/CompiledPrograms.html"
-	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 "Note that /etc/shorewall-lite/shorewall.conf has been renamed"
-	elog "to /etc/shorewall-lite/shorewall-lite.conf"
-	elog
-	elog "Known problems:"
-	elog "http://shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.0.15.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.0.15.ebuild
deleted file mode 100644
index f13b23cade60..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.0.15.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.0.15.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.2.8.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.8.ebuild
deleted file mode 100644
index c9548d60a6f0..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.8.ebuild
+++ /dev/null
@@ -1,65 +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-lite/shorewall-lite-4.2.8.ebuild,v 1.1 2009/05/15 09:27:53 pva 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="~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.2.9.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.9.ebuild
deleted file mode 100644
index 25d54edc5f8f..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.9.ebuild
+++ /dev/null
@@ -1,65 +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-lite/shorewall-lite-4.2.9.ebuild,v 1.1 2009/05/24 22:22:41 pva 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="~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.10.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.10.ebuild
deleted file mode 100644
index 577c9be50736..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.10.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.4.10.ebuild,v 1.1 2010/06/16 14:56:00 chainsaw 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.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild
index b27ab2f6c06f..f805db14a5fb 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.4.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2010/05/29 17:44:09 armin76 Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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}"
+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/"
@@ -28,7 +28,7 @@ DEPEND="net-firewall/iptables
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	einfo "Nothing to compile."
+	:;
 }
 
 src_install() {
@@ -40,26 +40,3 @@ src_install() {
 
 	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/ChangeLog b/net-firewall/shorewall/ChangeLog
index b9d31bddea89..415a18fb0651 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,11 @@
 # 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.173 2011/01/11 20:10:27 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.174 2011/01/23 19:22:04 constanze Exp $
+
+  23 Jan 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-4.0-r1.ebuild, -shorewall-4.4.2.1.ebuild,
+  -shorewall-4.4.10.ebuild, +shorewall-4.4.16.1.ebuild:
+  Version bump; Cleaned up old versions
 
 *shorewall-4.4.15.3 (11 Jan 2011)
 
diff --git a/net-firewall/shorewall/shorewall-4.0-r1.ebuild b/net-firewall/shorewall/shorewall-4.0-r1.ebuild
deleted file mode 100644
index 1d88866f82a8..000000000000
--- a/net-firewall/shorewall/shorewall-4.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.0-r1.ebuild,v 1.1 2008/02/25 18:03:25 pva Exp $
-
-inherit eutils
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=net-firewall/shorewall-common-${PV}"
-
-pkg_setup() {
-	ewarn "Shorewall as such has been removed and split into three packages:"
-	ewarn "shorewall-common, shorewall-shell and shorewall-perl."
-	ewarn "From now on you should emerge shorewall-shell and/or shorewall-perl."
-	ewarn ""
-	ewarn "If you are upgrading from <${P} and you wish to continue using the"
-	ewarn "shell compiler then you should emerge shorewall-shell. If you decide"
-	ewarn "to move to the perl compiler then you can also emerge shorewall-perl"
-	ewarn "and specify the compiler type in shorewall.conf."
-	ewarn "If this is a new installation then you can emerge shorewall-shell"
-	ewarn "and/or shorewall-perl."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.10.ebuild b/net-firewall/shorewall/shorewall-4.4.10.ebuild
deleted file mode 100644
index dd2e7a7b1e85..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.10.ebuild
+++ /dev/null
@@ -1,100 +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/shorewall-4.4.10.ebuild,v 1.1 2010/06/16 14:44:05 chainsaw 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="${MY_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_prepare() {
-	epatch "${FILESDIR}/${PV}-underscore-not-dash.patch"
-}
-
-src_compile() {
-	einfo "Nothing to 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
-	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+."
-	elog "Check the documentation."
-	elog
-	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first."
-	elog
-	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
-	elog "Information on upgrading is available at:"
-	elog "http://www.shorewall.net/upgrade_issues.htm"
-	elog
-	elog "There is a '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_PV_TREE}/${MY_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
-	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.2.1.ebuild b/net-firewall/shorewall/shorewall-4.4.16.1.ebuild
index ae768c62bb87..00a7cd1f61bc 100644
--- a/net-firewall/shorewall/shorewall-4.4.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.4.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.2.1.ebuild,v 1.1 2009/10/09 12:22:43 pva Exp $
+# $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"
 
@@ -12,7 +12,7 @@ MY_P_BETA=""                                    # stable or experimental (eg. "-
 MY_PV_BASE=$(get_version_component_range 1-3)
 
 MY_P="${PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${MY_P/${PN}/${PN}-docs-html}"
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
 DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
 HOMEPAGE="http://www.shorewall.net/"
@@ -33,7 +33,7 @@ DEPEND=">=net-firewall/iptables-1.2.4
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	einfo "Nothing to compile."
+	:;
 }
 
 src_install() {
@@ -56,28 +56,6 @@ src_install() {
 }
 
 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+."
-	elog "Check the documentation."
-	elog
-	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first."
-	elog
-	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
-	elog "Information on upgrading is available at:"
-	elog "http://www.shorewall.net/upgrade_issues.htm"
-	elog
-	elog "There is a '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."
@@ -85,12 +63,6 @@ pkg_postinst() {
 	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_PV_TREE}/${MY_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
 	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 e2779f0fddb3..b1a79e048dce 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2011/01/11 20:08:12 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.14 2011/01/23 19:24:26 constanze Exp $
+
+*shorewall6-lite-4.4.16.1 (23 Jan 2011)
+
+  23 Jan 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-lite-4.2.8.ebuild, -shorewall6-lite-4.2.9.ebuild,
+  -shorewall6-lite-4.2.11.ebuild, -shorewall6-lite-4.4.2.ebuild,
+  -shorewall6-lite-4.4.10.ebuild, +shorewall6-lite-4.4.16.1.ebuild:
+  Version bump; Cleaned up old versions
 
 *shorewall6-lite-4.4.15.3 (11 Jan 2011)
 
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.11.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.11.ebuild
deleted file mode 100644
index a37094714f6b..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.11.ebuild
+++ /dev/null
@@ -1,63 +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.2.11.ebuild,v 1.2 2011/01/04 14:38:59 xmw 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-${MY_PV_BASE}${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() {
-	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}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall6."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.8.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.8.ebuild
deleted file mode 100644
index 03e4ab01e45f..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.8.ebuild
+++ /dev/null
@@ -1,63 +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/shorewall6-lite/shorewall6-lite-4.2.8.ebuild,v 1.1 2009/05/15 09:30:06 pva 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-${MY_PV_BASE}${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 ~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() {
-	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}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall6."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild
deleted file mode 100644
index 0f5a8f761309..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild
+++ /dev/null
@@ -1,63 +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/shorewall6-lite/shorewall6-lite-4.2.9.ebuild,v 1.2 2009/06/22 04:35:19 jer 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-${MY_PV_BASE}${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 ~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() {
-	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}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall6."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.10.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.10.ebuild
deleted file mode 100644
index e83b744a2ada..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.10.ebuild
+++ /dev/null
@@ -1,63 +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.10.ebuild,v 1.2 2011/01/04 14:38:59 xmw 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-${MY_PV_BASE}${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() {
-	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}.initd ${PN} || die
-
-	dodoc changelog.txt releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall6."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.1.ebuild
index 428768f8fc56..2bc3fa3bc1ad 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.2.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.16.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.2.ebuild,v 1.2 2011/01/04 14:38:59 xmw Exp $
+# $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
 
@@ -11,7 +11,7 @@ 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-${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/"
@@ -34,7 +34,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	einfo "Nothing to compile."
+	:;
 }
 
 src_install() {
@@ -46,18 +46,3 @@ src_install() {
 
 	dodoc changelog.txt releasenotes.txt
 }
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo "There are man pages for ${PN}(8) and for each"
-	einfo "configuration file."
-	einfo
-	einfo "You should have already generated a firewall script with"
-	einfo "'shorewall compile' on the administrative Shorewall6."
-	einfo "Please refer to"
-	einfo "http://www.shorewall.net/CompiledPrograms.html"
-	einfo
-	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-}
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 51400cb2aeab..d95224972cab 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.22 2011/01/11 20:08:59 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.23 2011/01/23 19:23:43 constanze Exp $
+
+*shorewall6-4.4.16.1 (23 Jan 2011)
+
+  23 Jan 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-4.2.8.ebuild, -shorewall6-4.2.9.ebuild,
+  -shorewall6-4.2.11.ebuild, -shorewall6-4.4.2.ebuild,
+  -shorewall6-4.4.10.ebuild, +shorewall6-4.4.16.1.ebuild:
+  Version bump; Cleaned up old versions
 
 *shorewall6-4.4.15.3 (11 Jan 2011)
 
diff --git a/net-firewall/shorewall6/shorewall6-4.2.11.ebuild b/net-firewall/shorewall6/shorewall6-4.2.11.ebuild
deleted file mode 100644
index fdddae5e0695..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.2.11.ebuild
+++ /dev/null
@@ -1,72 +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/shorewall6/shorewall6-4.2.11.ebuild,v 1.1 2009/10/09 12:06:44 pva 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 ~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}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	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.2.8.ebuild b/net-firewall/shorewall6/shorewall6-4.2.8.ebuild
deleted file mode 100644
index 010928bdb15d..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.2.8.ebuild
+++ /dev/null
@@ -1,72 +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/shorewall6/shorewall6-4.2.8.ebuild,v 1.1 2009/05/15 09:29:14 pva 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 ~ppc64 ~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}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	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.2.9.ebuild b/net-firewall/shorewall6/shorewall6-4.2.9.ebuild
deleted file mode 100644
index 982a092b2396..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.2.9.ebuild
+++ /dev/null
@@ -1,72 +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/shorewall6/shorewall6-4.2.9.ebuild,v 1.2 2009/06/22 04:33:56 jer 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 ~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}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	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.10.ebuild b/net-firewall/shorewall6/shorewall6-4.4.10.ebuild
deleted file mode 100644
index 2e62a8c99140..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.10.ebuild
+++ /dev/null
@@ -1,71 +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.10.ebuild,v 1.2 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 ~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() {
-	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}.initd ${PN} || die "doinitd failed"
-
-	dodoc releasenotes.txt
-	if use doc; then
-		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	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.2.ebuild b/net-firewall/shorewall6/shorewall6-4.4.16.1.ebuild
index 9b70201ae355..e6deb6a08d2c 100644
--- a/net-firewall/shorewall6/shorewall6-4.4.2.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.4.16.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.2.ebuild,v 1.2 2011/01/04 14:26:53 xmw Exp $
+# $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
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	einfo "Nothing to compile."
+	:;
 }
 
 src_install() {
@@ -53,19 +53,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	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
+	elog "you must have Perl 5.10+ and must emerge dev-perl/Socket6."
 }