From: Constanze Hausner <constanze@gentoo.org>
Date: Sat, 6 Aug 2011 15:48:01 +0000 (+0000)
Subject: Version bump and cleanup, see bug 377473
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=357dd98c51d4a2e375bd1175cd3a7922934dea7f;p=gentoo.git

Version bump and cleanup, see bug 377473

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

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 9e57626cb4dc..76d2590170a2 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.85 2011/07/24 15:28:33 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.86 2011/08/06 15:46:48 constanze Exp $
+
+*shorewall-lite-4.4.22.1 (06 Aug 2011)
+
+  06 Aug 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-lite-4.4.19.3.ebuild, -shorewall-lite-4.4.19.4.ebuild,
+  -shorewall-lite-4.4.20.3.ebuild, -shorewall-lite-4.4.21.ebuild,
+  -shorewall-lite-4.4.21-r1.ebuild, +shorewall-lite-4.4.22.1.ebuild:
+  Version bump and cleanup, see bug #377473
 
 *shorewall-lite-4.4.21-r1 (24 Jul 2011)
 
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.19.3.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.19.3.ebuild
deleted file mode 100644
index 2da0ce91c56f..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.19.3.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.19.3.ebuild,v 1.1 2011/05/14 12:38:49 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.19.4.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.19.4.ebuild
deleted file mode 100644
index 2a7b52e648e5..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.19.4.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.19.4.ebuild,v 1.1 2011/05/21 15:06:05 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.20.3.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.20.3.ebuild
deleted file mode 100644
index 1c26a0a2c769..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.20.3.ebuild
+++ /dev/null
@@ -1,51 +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.20.3.ebuild,v 1.1 2011/06/19 14:54:50 constanze Exp $
-
-EAPI="4"
-
-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_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-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}.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_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.21.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.21.ebuild
deleted file mode 100644
index e75fa8034d12..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.21.ebuild
+++ /dev/null
@@ -1,51 +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.21.ebuild,v 1.1 2011/07/16 14:31:12 constanze Exp $
-
-EAPI="4"
-
-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_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-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}.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_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.21-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild
similarity index 94%
rename from net-firewall/shorewall-lite/shorewall-lite-4.4.21-r1.ebuild
rename to net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild
index 723e11cbb195..c073cc2119bb 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.21-r1.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.4.22.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.21-r1.ebuild,v 1.1 2011/07/24 15:28:33 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild,v 1.1 2011/08/06 15:46:48 constanze Exp $
 
 EAPI="4"
 
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 4b4670c86e1a..00b07d89e510 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,14 @@
 # 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.191 2011/08/06 15:26:11 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.192 2011/08/06 15:46:03 constanze Exp $
+
+*shorewall-4.4.22.1 (06 Aug 2011)
+
+  06 Aug 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-4.4.19.3.ebuild, -shorewall-4.4.19.4.ebuild,
+  -shorewall-4.4.20.3.ebuild, -shorewall-4.4.21.ebuild,
+  -shorewall-4.4.21-r1.ebuild, +shorewall-4.4.22.1.ebuild:
+  Version bump and cleanup, see bug #377473
 
 *shorewall-4.4.15.1-r1 (06 Aug 2011)
 
diff --git a/net-firewall/shorewall/shorewall-4.4.19.3.ebuild b/net-firewall/shorewall/shorewall-4.4.19.3.ebuild
deleted file mode 100644
index b1c2539559a9..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.19.3.ebuild
+++ /dev/null
@@ -1,64 +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.19.3.ebuild,v 1.1 2011/05/14 12:37:52 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 *
-		# 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)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.19.4.ebuild b/net-firewall/shorewall/shorewall-4.4.19.4.ebuild
deleted file mode 100644
index 6e95cb98db10..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.19.4.ebuild
+++ /dev/null
@@ -1,64 +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.19.4.ebuild,v 1.1 2011/05/21 15:05:06 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 *
-		# 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)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.20.3.ebuild b/net-firewall/shorewall/shorewall-4.4.20.3.ebuild
deleted file mode 100644
index 7ea1f387bd9c..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.20.3.ebuild
+++ /dev/null
@@ -1,60 +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.20.3.ebuild,v 1.1 2011/06/19 14:52:57 constanze Exp $
-
-EAPI="4"
-
-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_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-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}.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}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	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)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.21.ebuild b/net-firewall/shorewall/shorewall-4.4.21.ebuild
deleted file mode 100644
index f1458cf8884a..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.21.ebuild
+++ /dev/null
@@ -1,60 +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.21.ebuild,v 1.1 2011/07/16 14:30:08 constanze Exp $
-
-EAPI="4"
-
-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_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-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}.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}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	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)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.21-r1.ebuild b/net-firewall/shorewall/shorewall-4.4.22.1.ebuild
similarity index 96%
rename from net-firewall/shorewall/shorewall-4.4.21-r1.ebuild
rename to net-firewall/shorewall/shorewall-4.4.22.1.ebuild
index 2bf91b17c7af..7b7cb9935bdd 100644
--- a/net-firewall/shorewall/shorewall-4.4.21-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.4.22.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.21-r1.ebuild,v 1.1 2011/07/24 15:25:33 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.22.1.ebuild,v 1.1 2011/08/06 15:46:03 constanze Exp $
 
 EAPI="4"
 
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index ae6ece42a674..33eed16272e5 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.27 2011/07/16 14:32:32 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.28 2011/08/06 15:48:01 constanze Exp $
+
+*shorewall6-lite-4.4.22.1 (06 Aug 2011)
+
+  06 Aug 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-lite-4.4.19.3.ebuild, -shorewall6-lite-4.4.19.4.ebuild,
+  -shorewall6-lite-4.4.20.3.ebuild, -shorewall6-lite-4.4.21.ebuild,
+  +shorewall6-lite-4.4.22.1.ebuild:
+  Version bump and cleanup, see bug #377473
 
 *shorewall6-lite-4.4.21 (16 Jul 2011)
 
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.19.3.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.19.3.ebuild
deleted file mode 100644
index afa21661cddf..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.19.3.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.19.3.ebuild,v 1.1 2011/05/14 12:39:54 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.19.4.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.19.4.ebuild
deleted file mode 100644
index f2feaeb02d98..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.19.4.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.19.4.ebuild,v 1.1 2011/05/21 15:06:58 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.21.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.21.ebuild
deleted file mode 100644
index c6cddea054f3..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.21.ebuild
+++ /dev/null
@@ -1,53 +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.21.ebuild,v 1.1 2011/07/16 14:32:32 constanze Exp $
-
-EAPI="4"
-
-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_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-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}.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_pretend() {
-	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}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.20.3.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild
similarity index 95%
rename from net-firewall/shorewall6-lite/shorewall6-lite-4.4.20.3.ebuild
rename to net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild
index f7cf996bb943..612b680d79fb 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.20.3.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.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.20.3.ebuild,v 1.1 2011/06/19 14:56:54 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild,v 1.1 2011/08/06 15:48:01 constanze Exp $
 
 EAPI="4"
 
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 3f589a3a65f9..d46d1e1fc636 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.39 2011/07/24 15:26:50 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.40 2011/08/06 15:47:29 constanze Exp $
+
+*shorewall6-4.4.22.1 (06 Aug 2011)
+
+  06 Aug 2011; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-4.4.19.3.ebuild, -shorewall6-4.4.19.4.ebuild,
+  -shorewall6-4.4.20.3.ebuild, -shorewall6-4.4.21.ebuild,
+  -shorewall6-4.4.21-r1.ebuild, +shorewall6-4.4.22.1.ebuild:
+  Version bump and cleanup, see bug #377473
 
 *shorewall6-4.4.21-r1 (24 Jul 2011)
 
diff --git a/net-firewall/shorewall6/shorewall6-4.4.19.3.ebuild b/net-firewall/shorewall6/shorewall6-4.4.19.3.ebuild
deleted file mode 100644
index 8e83afe5e110..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.19.3.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.19.3.ebuild,v 1.1 2011/05/14 12:39:21 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)
-
-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-${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.19.4.ebuild b/net-firewall/shorewall6/shorewall6-4.4.19.4.ebuild
deleted file mode 100644
index 832c8c1e8f7d..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.19.4.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.19.4.ebuild,v 1.1 2011/05/21 15:06:32 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)
-
-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-${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.20.3.ebuild b/net-firewall/shorewall6/shorewall6-4.4.20.3.ebuild
deleted file mode 100644
index 6d3f6ddacc6e..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.20.3.ebuild
+++ /dev/null
@@ -1,57 +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.20.3.ebuild,v 1.1 2011/06/19 14:55:58 constanze Exp $
-
-EAPI="4"
-
-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_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_DOCS="${MY_PN}-docs-html-${PV}"
-
-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}.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.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	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}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.21.ebuild b/net-firewall/shorewall6/shorewall6-4.4.21.ebuild
deleted file mode 100644
index dcd344e7dc0f..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.21.ebuild
+++ /dev/null
@@ -1,57 +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.21.ebuild,v 1.1 2011/07/16 14:31:52 constanze Exp $
-
-EAPI="4"
-
-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_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_DOCS="${MY_PN}-docs-html-${PV}"
-
-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}.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.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	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}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.21-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild
similarity index 95%
rename from net-firewall/shorewall6/shorewall6-4.4.21-r1.ebuild
rename to net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild
index b56ddf9e7f64..a325c3384904 100644
--- a/net-firewall/shorewall6/shorewall6-4.4.21-r1.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.4.22.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.21-r1.ebuild,v 1.1 2011/07/24 15:26:50 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild,v 1.1 2011/08/06 15:47:29 constanze Exp $
 
 EAPI="4"