Cleanup; Version bump bug 472434; Clearify init.d output bug 472790;

Remove keepdir/dodir bug 459316

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)

7 files changed, 21 insertions, 253 deletions

diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 24a7f4e09a4f..96140d3b21ef 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.74 2013/06/30 20:29:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.75 2013/07/13 14:12:23 constanze Exp $
+
+*shorewall6-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org> files/shorewall6.initd,
+  -shorewall6-4.4.23.2.ebuild, -shorewall6-4.5.8.2.ebuild,
+  -shorewall6-4.5.8.2-r1.ebuild, -shorewall6-4.5.11.2.ebuild,
+  -shorewall6-4.5.11.2-r1.ebuild, +shorewall6-4.5.18.ebuild:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall6-4.5.15.ebuild:
   Stable for ppc64, wrt bug #470544
diff --git a/net-firewall/shorewall6/files/shorewall6.initd b/net-firewall/shorewall6/files/shorewall6.initd
index 299b02ef7d50..0ab2f6bd12bf 100644
--- a/net-firewall/shorewall6/files/shorewall6.initd
+++ b/net-firewall/shorewall6/files/shorewall6.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd,v 1.3 2012/10/21 12:56:33 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd,v 1.4 2013/07/13 14:12:23 constanze Exp $
 
 extra_commands="check clear"
 extra_started_commands="refresh reset"
@@ -20,13 +20,13 @@ depend() {
 
 start() {
     checkconfig
-	ebegin "Starting firewall"
+	ebegin "Starting shorewall6"
 	/sbin/shorewall6 -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	ebegin "Stopping shorewall6"
 	/sbin/shorewall6 stop 1>/dev/null
 	eend $?
 }
@@ -37,7 +37,7 @@ restart() {
 	# restart function, so refrain from calling svc_stop/svc_start
 	# here.  Note that this comment is required to fix bug 55576;
 	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting firewall"
+	ebegin "Restarting shorewall6"
 	/sbin/shorewall6 status >/dev/null
 	if [ $? != 0 ] ; then
 	    svc_start
@@ -55,7 +55,7 @@ clear() {
 	# clear will remove all the rules and bring the system to an unfirewalled
 	# state. (21 Nov 2004 eldad)
 
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	ebegin "Clearing all shorewall6 rules and setting policy to ACCEPT"
 	/sbin/shorewall6 clear
 	eend $?
 }
@@ -63,7 +63,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall6"
 	/sbin/shorewall6 reset
 	eend $?
 }
@@ -73,7 +73,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall6 rules"
 	/sbin/shorewall6 refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild b/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild
deleted file mode 100644
index 68322e1caefa..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild,v 1.6 2012/05/20 08:42:57 halcy0n 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"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-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
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild
deleted file mode 100644
index f56d42ae05bf..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild,v 1.1 2013/01/18 12:19:24 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"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || 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
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.11.2-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
index c99e5db046dc..f7df82c32b31 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.11.2-r1.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.11.2-r1.ebuild,v 1.1 2013/03/17 09:31:45 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.18.ebuild,v 1.1 2013/07/13 14:12:23 constanze Exp $
 
 EAPI="4"
 
-inherit versionator linux-info
+inherit linux-info systemd 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)"
@@ -50,6 +50,7 @@ src_install() {
 	cd "${WORKDIR}/${P}"
 	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_newunit "${FILESDIR}"/shorewall6.systemd 'shorewall6.service' || die
 
 	dodoc changelog.txt releasenotes.txt
 	if use doc; then
@@ -57,5 +58,4 @@ src_install() {
 		cd "${WORKDIR}/${MY_P_DOCS}"
 		dohtml -r *
 	fi
-	dodir /var/lock/subsys
 }
diff --git a/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild
deleted file mode 100644
index 2fcc7b853d9d..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild,v 1.8 2013/02/12 20:27:22 ago 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"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || 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
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild
deleted file mode 100644
index 5176002904b4..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild,v 1.1 2012/10/12 18:17:00 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"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || 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
-	keepdir /var/lock/subsys
-}