Cleaned up old versions and added anti-dep for shorewall-core to unstable versions < 4.5

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

13 files changed, 39 insertions, 441 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 7bfd58971453..6b906a9d60d6 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.95 2012/02/24 18:52:52 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.96 2012/02/27 17:46:33 constanze Exp $
+
+*shorewall-lite-4.4.27-r1 (27 Feb 2012)
+
+  27 Feb 2012; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-lite-4.4.22.1.ebuild, -shorewall-lite-4.4.22.3.ebuild,
+  -shorewall-lite-4.4.24.1.ebuild, +shorewall-lite-4.4.27-r1.ebuild:
+  Cleaned up old versions and added anti-dep for shorewall-core to unstable
+  versions < 4.5
 
 *shorewall-lite-4.5.0.1 (24 Feb 2012)
 
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild
deleted file mode 100644
index c073cc2119bb..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild
+++ /dev/null
@@ -1,52 +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.22.1.ebuild,v 1.1 2011/08/06 15:46:48 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"
-		epatch_user
-}
-
-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.24.1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild
deleted file mode 100644
index 49ef034feef6..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild
+++ /dev/null
@@ -1,52 +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.24.1.ebuild,v 1.1 2011/10/23 09:22:30 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"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-
-src_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-		epatch_user
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-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.22.3.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild
index e18e835bf9cf..5a694d0f16c9 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.3.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.22.3.ebuild,v 1.1 2011/08/20 23:10:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:46:33 constanze Exp $
 
 EAPI="4"
 
@@ -25,7 +25,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	!net-firewall/shorewall-core"
 
 src_prepare() {
 	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index e1acb3eac4fc..f9d3b9622c02 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.202 2012/02/24 18:51:52 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.203 2012/02/27 17:45:34 constanze Exp $
+
+*shorewall-4.4.27-r1 (27 Feb 2012)
+
+  27 Feb 2012; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-4.4.15.1.ebuild, -shorewall-4.4.22.1.ebuild,
+  -shorewall-4.4.22.3.ebuild, -shorewall-4.4.24.1.ebuild,
+  +shorewall-4.4.27-r1.ebuild:
+  Cleaned up old versions and added anti-dep for shorewall-core to unstable
+  versions < 4.5
 
 *shorewall-4.5.0.1 (24 Feb 2012)
 
diff --git a/net-firewall/shorewall/shorewall-4.4.15.1.ebuild b/net-firewall/shorewall/shorewall-4.4.15.1.ebuild
deleted file mode 100644
index ecf26ce051e8..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.15.1.ebuild
+++ /dev/null
@@ -1,96 +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.15.1.ebuild,v 1.7 2011/03/21 17:04:34 xarthisius 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() {
-	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.22.1.ebuild b/net-firewall/shorewall/shorewall-4.4.22.1.ebuild
deleted file mode 100644
index 7b7cb9935bdd..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.22.1.ebuild
+++ /dev/null
@@ -1,61 +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.22.1.ebuild,v 1.1 2011/08/06 15:46:03 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
-	dodir /var/lock/subsys
-}
-
-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.24.1.ebuild b/net-firewall/shorewall/shorewall-4.4.24.1.ebuild
deleted file mode 100644
index a9639375643a..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.24.1.ebuild
+++ /dev/null
@@ -1,61 +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.24.1.ebuild,v 1.1 2011/10/23 09:06:00 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
-	dodir /var/lock/subsys
-}
-
-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.22.3.ebuild b/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild
index fba1695d046b..e5fef8fe7e52 100644
--- a/net-firewall/shorewall/shorewall-4.4.22.3.ebuild
+++ b/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.22.3.ebuild,v 1.1 2011/08/20 20:10:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:45:34 constanze Exp $
 
 EAPI="4"
 
@@ -26,9 +26,7 @@ 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"
+	!net-firewall/shorewall-core"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index fd84c6d2f239..fdbb07269e3e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.37 2012/02/24 18:54:19 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.38 2012/02/27 17:48:16 constanze Exp $
+
+*shorewall6-lite-4.4.27-r1 (27 Feb 2012)
+
+  27 Feb 2012; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-lite-4.4.22.1.ebuild, -shorewall6-lite-4.4.22.3.ebuild,
+  -shorewall6-lite-4.4.24.1.ebuild, +shorewall6-lite-4.4.27-r1.ebuild:
+  Cleaned up old versions and added anti-dep for shorewall-core to unstable
+  versions < 4.5
 
 *shorewall6-lite-4.5.0.1 (24 Feb 2012)
 
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild
deleted file mode 100644
index 612b680d79fb..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.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.22.1.ebuild,v 1.1 2011/08/06 15:48:01 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.22.3.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild
deleted file mode 100644
index 694652bf8904..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild
+++ /dev/null
@@ -1,52 +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.22.3.ebuild,v 1.1 2011/08/20 23:16:24 jer 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"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-
-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.24.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild
index 88931e16c57c..6f3091d0882b 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.24.1.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.24.1.ebuild,v 1.1 2011/10/23 09:24:27 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:48:16 constanze Exp $
 
 EAPI="4"
 
@@ -25,7 +25,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	!net-firewall/shorewall-core"
 
 pkg_pretend() {
 	if kernel_is lt 2 6 25 ; then