Version bump and cleanup, see bug 377473

(Portage version: 2.1.10.3/cvs/Linux x86_64)

5 files changed, 10 insertions, 151 deletions

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