Version bump, remove old, thank Vieri for maintaining this package (bug 269929 and bug 270193).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

19 files changed, 49 insertions, 555 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 167d22df595f..628b067c9bb0 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.53 2009/05/15 09:27:53 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.54 2009/05/24 22:22:41 pva Exp $
+
+*shorewall-lite-4.2.9 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> -shorewall-lite-4.2.4.ebuild,
+  -shorewall-lite-4.2.6.ebuild, -shorewall-lite-4.2.7.ebuild,
+  +shorewall-lite-4.2.9.ebuild:
+  Version bump, remove old, thank Vieri for maintaining this package (bug
+  269929 and bug 270193).
 
 *shorewall-lite-4.2.8 (15 May 2009)
 
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.2.6.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.6.ebuild
deleted file mode 100644
index 7be82293c3ac..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.6.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.6.ebuild,v 1.1 2009/02/22 13:53:13 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.7.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.7.ebuild
deleted file mode 100644
index c830af33e775..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.7.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.7.ebuild,v 1.1 2009/04/03 10:13:32 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.4.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.2.9.ebuild
index 23c2cba3001c..25d54edc5f8f 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.2.4.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.2.9.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2009/01/22 08:25:51 pva Exp $
+# $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
 
diff --git a/net-firewall/shorewall-perl/ChangeLog b/net-firewall/shorewall-perl/ChangeLog
index 2070f9861202..feb2ed8d7c95 100644
--- a/net-firewall/shorewall-perl/ChangeLog
+++ b/net-firewall/shorewall-perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall-perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/ChangeLog,v 1.31 2009/05/15 09:25:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/ChangeLog,v 1.32 2009/05/24 22:18:48 pva Exp $
+
+*shorewall-perl-4.2.9 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> -shorewall-perl-4.2.4.6.ebuild,
+  -shorewall-perl-4.2.6.ebuild, -shorewall-perl-4.2.6.1.ebuild,
+  -shorewall-perl-4.2.7.1.ebuild, +shorewall-perl-4.2.9.ebuild:
+  Version bump, remove old, thank Vieri for maintaining this package (bug
+  269929 and bug 270193).
 
 *shorewall-perl-4.2.8.2 (15 May 2009)
 
diff --git a/net-firewall/shorewall-perl/shorewall-perl-4.2.4.6.ebuild b/net-firewall/shorewall-perl/shorewall-perl-4.2.4.6.ebuild
deleted file mode 100644
index 09b7abef7844..000000000000
--- a/net-firewall/shorewall-perl/shorewall-perl-4.2.4.6.ebuild
+++ /dev/null
@@ -1,57 +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-perl/shorewall-perl-4.2.4.6.ebuild,v 1.2 2009/02/01 17:09:48 klausman Exp $
-
-inherit versionator
-
-# 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/-perl/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall Perl-based compiler that allows faster compilation and execution."
-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=""
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	dev-lang/perl
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-PDEPEND="=net-firewall/shorewall-common-${MY_PV_BASE}*"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	dodoc releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo
-	elog "In order to use the Perl compiler you need to add"
-	elog "SHOREWALL_COMPILER=perl"
-	elog "to shorewall.conf unless you did not install the Shell compiler."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall-perl/shorewall-perl-4.2.6.1.ebuild b/net-firewall/shorewall-perl/shorewall-perl-4.2.6.1.ebuild
deleted file mode 100644
index 5391440cb649..000000000000
--- a/net-firewall/shorewall-perl/shorewall-perl-4.2.6.1.ebuild
+++ /dev/null
@@ -1,57 +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-perl/shorewall-perl-4.2.6.1.ebuild,v 1.1 2009/03/02 20:52:40 pva Exp $
-
-inherit versionator
-
-# 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/-perl/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall Perl-based compiler that allows faster compilation and execution."
-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=""
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	dev-lang/perl
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-PDEPEND="=net-firewall/shorewall-common-${MY_PV_BASE}*"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	dodoc releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo
-	elog "In order to use the Perl compiler you need to add"
-	elog "SHOREWALL_COMPILER=perl"
-	elog "to shorewall.conf unless you did not install the Shell compiler."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall-perl/shorewall-perl-4.2.7.1.ebuild b/net-firewall/shorewall-perl/shorewall-perl-4.2.7.1.ebuild
deleted file mode 100644
index 144cd170d52a..000000000000
--- a/net-firewall/shorewall-perl/shorewall-perl-4.2.7.1.ebuild
+++ /dev/null
@@ -1,57 +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-perl/shorewall-perl-4.2.7.1.ebuild,v 1.1 2009/04/03 09:40:21 pva Exp $
-
-inherit versionator
-
-# 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/-perl/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall Perl-based compiler that allows faster compilation and execution."
-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=""
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	dev-lang/perl
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-PDEPEND="=net-firewall/shorewall-common-${MY_PV_BASE}*"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	dodoc releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo
-	elog "In order to use the Perl compiler you need to add"
-	elog "SHOREWALL_COMPILER=perl"
-	elog "to shorewall.conf unless you did not install the Shell compiler."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall-perl/shorewall-perl-4.2.6.ebuild b/net-firewall/shorewall-perl/shorewall-perl-4.2.9.ebuild
index 177ad3dc951d..2597089bea42 100644
--- a/net-firewall/shorewall-perl/shorewall-perl-4.2.6.ebuild
+++ b/net-firewall/shorewall-perl/shorewall-perl-4.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/shorewall-perl-4.2.6.ebuild,v 1.1 2009/02/22 13:48:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-perl/shorewall-perl-4.2.9.ebuild,v 1.1 2009/05/24 22:18:48 pva Exp $
 
 inherit versionator
 
diff --git a/net-firewall/shorewall-shell/ChangeLog b/net-firewall/shorewall-shell/ChangeLog
index a3199383fa3a..2c0803d31b08 100644
--- a/net-firewall/shorewall-shell/ChangeLog
+++ b/net-firewall/shorewall-shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall-shell
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-shell/ChangeLog,v 1.28 2009/05/15 09:17:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-shell/ChangeLog,v 1.29 2009/05/24 22:15:19 pva Exp $
+
+*shorewall-shell-4.2.9 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> -shorewall-shell-4.2.4.ebuild,
+  -shorewall-shell-4.2.6.ebuild, -shorewall-shell-4.2.7.ebuild,
+  +shorewall-shell-4.2.9.ebuild:
+  Version bump, remove old, thank Vieri for maintaining this package (bug
+  269929 and bug 270193).
 
 *shorewall-shell-4.2.8 (15 May 2009)
 
diff --git a/net-firewall/shorewall-shell/shorewall-shell-4.2.6.ebuild b/net-firewall/shorewall-shell/shorewall-shell-4.2.6.ebuild
deleted file mode 100644
index fdac0bedafdb..000000000000
--- a/net-firewall/shorewall-shell/shorewall-shell-4.2.6.ebuild
+++ /dev/null
@@ -1,55 +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-shell/shorewall-shell-4.2.6.ebuild,v 1.1 2009/02/22 13:51:31 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)   # shorewall-common version to use (ignoring upstream "compatibility matrix" for now as it is not always updated at the same time as the software is released)
-
-MY_PN="${PN/-shell/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall shell-based compiler."
-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=""
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-PDEPEND="=net-firewall/shorewall-common-${MY_PV_BASE}*"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	dodoc releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo
-	elog "In order to use the shell compiler you need to add"
-	elog "SHOREWALL_COMPILER=shell"
-	elog "to shorewall.conf unless you do not have the Perl compiler."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall-shell/shorewall-shell-4.2.7.ebuild b/net-firewall/shorewall-shell/shorewall-shell-4.2.7.ebuild
deleted file mode 100644
index e6701d9af9d6..000000000000
--- a/net-firewall/shorewall-shell/shorewall-shell-4.2.7.ebuild
+++ /dev/null
@@ -1,55 +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-shell/shorewall-shell-4.2.7.ebuild,v 1.1 2009/04/03 09:42:11 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)   # shorewall-common version to use (ignoring upstream "compatibility matrix" for now as it is not always updated at the same time as the software is released)
-
-MY_PN="${PN/-shell/}"
-MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
-
-DESCRIPTION="Shoreline Firewall shell-based compiler."
-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=""
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	!<net-firewall/shorewall-4.0"
-RDEPEND="${DEPEND}"
-
-PDEPEND="=net-firewall/shorewall-common-${MY_PV_BASE}*"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-
-	dodoc releasenotes.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Documentation is available at http://www.shorewall.net"
-	einfo
-	elog "In order to use the shell compiler you need to add"
-	elog "SHOREWALL_COMPILER=shell"
-	elog "to shorewall.conf unless you do not have the Perl compiler."
-	einfo
-	einfo "Please read the included release notes for more information."
-	einfo
-	einfo "Known problems:"
-	einfo "http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	einfo
-}
diff --git a/net-firewall/shorewall-shell/shorewall-shell-4.2.4.ebuild b/net-firewall/shorewall-shell/shorewall-shell-4.2.9.ebuild
index f1d71e5e9594..3ccb1537255b 100644
--- a/net-firewall/shorewall-shell/shorewall-shell-4.2.4.ebuild
+++ b/net-firewall/shorewall-shell/shorewall-shell-4.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-shell/shorewall-shell-4.2.4.ebuild,v 1.1 2009/01/22 08:24:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-shell/shorewall-shell-4.2.9.ebuild,v 1.1 2009/05/24 22:15:19 pva Exp $
 
 inherit versionator
 
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 33653c7856a1..3041ebcbef65 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.5 2009/05/15 09:30:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.6 2009/05/24 22:26:52 pva Exp $
+
+*shorewall6-lite-4.2.9 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org>
+  -shorewall6-lite-4.2.4.1.ebuild, -shorewall6-lite-4.2.6.ebuild,
+  +shorewall6-lite-4.2.9.ebuild:
+  Version bump, remove old, thank Vieri for maintaining this package (bug
+  269929 and bug 270193).
 
 *shorewall6-lite-4.2.8 (15 May 2009)
 
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.4.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.4.1.ebuild
deleted file mode 100644
index bdc4f94d696f..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.4.1.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.4.1.ebuild,v 1.3 2009/02/01 17:11:11 klausman 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.6.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild
index 9b192934a38c..f3d3da3edd0e 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.2.6.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2009/02/22 14:00:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.2.9.ebuild,v 1.1 2009/05/24 22:26:52 pva Exp $
 
 inherit versionator linux-info
 
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 14bf5237aede..9fe1cdb66af5 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.7 2009/05/15 09:29:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.8 2009/05/24 22:24:47 pva Exp $
+
+*shorewall6-4.2.9 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> -shorewall6-4.2.4.1.ebuild,
+  -shorewall6-4.2.6.ebuild, +shorewall6-4.2.9.ebuild:
+  Version bump, remove old, thank Vieri for maintaining this package (bug
+  269929 and bug 270193).
 
 *shorewall6-4.2.8 (15 May 2009)
 
diff --git a/net-firewall/shorewall6/shorewall6-4.2.4.1.ebuild b/net-firewall/shorewall6/shorewall6-4.2.4.1.ebuild
deleted file mode 100644
index db2497ba2a39..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.2.4.1.ebuild
+++ /dev/null
@@ -1,71 +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.4.1.ebuild,v 1.3 2009/03/15 15:51:38 ranger 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}
-	!<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.6.ebuild b/net-firewall/shorewall6/shorewall6-4.2.9.ebuild
index edf10ce732a5..9508acc1c04a 100644
--- a/net-firewall/shorewall6/shorewall6-4.2.6.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.2.9.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.3 2009/03/16 12:18:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.2.9.ebuild,v 1.1 2009/05/24 22:24:47 pva Exp $
 
 inherit versionator linux-info