Version bump and cleanup, see bug 377473

(Portage version: 2.1.10.3/cvs/Linux x86_64)

6 files changed, 10 insertions, 188 deletions

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
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"