Drop old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

11 files changed, 10 insertions, 443 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 4c6ed23b2cfa..00b174dd8333 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.158 2014/11/18 11:15:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.159 2014/11/18 13:08:20 xmw Exp $
+
+  18 Nov 2014; Michael Weber <xmw@gentoo.org>
+  -files/4.5.18-r1/shorewall-lite.initd,
+  -files/4.5.18-r1/shorewall-lite.systemd, -files/4.5.18-r1/shorewallrc_new,
+  -files/4.5.21.7/10-releasenotes.patch, -files/4.5.21.7/shorewall-lite.confd,
+  -files/4.5.21.7/shorewall-lite.initd, -files/4.5.21.7/shorewall-lite.systemd,
+  -files/4.5.21.7/shorewallrc, -shorewall-lite-4.5.18-r1.ebuild,
+  -shorewall-lite-4.5.21.7.ebuild:
+  Drop old.
 
 *shorewall-lite-4.5.21.10-r1 (18 Nov 2014)
 
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd
deleted file mode 100644
index 3511ba19408c..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd,v 1.1 2013/09/22 13:17:02 constanze Exp $
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# 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 shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-	    svc_start
-	else
-		/sbin/shorewall-lite restart 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.systemd
deleted file mode 100644
index aeb89b5abccb..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.systemd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
-#
-#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
-#
-[Unit]
-Description=Shorewall IPv4 firewall (lite)
-After=syslog.target
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/shorewall-lite
-StandardOutput=syslog
-ExecStart=/sbin/shorewall-lite $OPTIONS start
-ExecStop=/sbin/shorewall-lite $OPTIONS stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewallrc_new b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewallrc_new
deleted file mode 100644
index 0f9301cfeb49..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/files/4.5.21.7/10-releasenotes.patch b/net-firewall/shorewall-lite/files/4.5.21.7/10-releasenotes.patch
deleted file mode 100644
index 908b9fdb605b..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.7/10-releasenotes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch will update the version number in the release notes.
-
-See http://thread.gmane.org/gmane.comp.security.shorewall/30808
-
---- shorewall-lite-4.5.21.7.old/releasenotes.txt	2014-03-08 16:35:39.000000000 +0100
-+++ shorewall-lite-4.5.21.7/releasenotes.txt	2014-03-09 14:38:19.503337459 +0100
-@@ -1,5 +1,5 @@
- ----------------------------------------------------------------------------
--	            S H O R E W A L L  4 . 5 . 2 1 . 6
-+	            S H O R E W A L L  4 . 5 . 2 1 . 7
-                    ------------------------------------
-                       M a r c h  0 8 ,  2 0 1 4
- ----------------------------------------------------------------------------
diff --git a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.initd
deleted file mode 100644
index 441c63fbef3c..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.initd,v 1.1 2014/03/15 22:58:10 hwoarang Exp $
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# 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 shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.systemd
deleted file mode 100644
index a7c932418a9c..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.7/shorewall-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall lite
-Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall-lite
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.21.7/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.7/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.7/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
deleted file mode 100644
index 55ec4c408bed..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 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.5.18-r1.ebuild,v 1.9 2014/06/12 14:20:53 tomwij Exp $
-
-EAPI="5"
-
-inherit eutils prefix systemd 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
-	=net-firewall/shorewall-core-${PVR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc_new "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	systemd_newunit "${FILESDIR}"/${PVR}/shorewall-lite.systemd 'shorewall-lite.service'
-
-	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.5.21.7.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild
deleted file mode 100644
index c9a63f85bd1b..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 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.5.21.7.ebuild,v 1.2 2014/06/12 14:20:53 tomwij Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-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/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PVR}/10-releasenotes.patch
-
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}