Remove older version now that we've got a newer OpenRC released.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 133 deletions

diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index ee681d9ffd5e..91204e1a4948 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/firewalld
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.8 2012/11/18 05:30:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.9 2012/11/21 16:37:36 cardoe Exp $
+
+  21 Nov 2012; Doug Goldstein <cardoe@gentoo.org> -firewalld-0.2.9.ebuild,
+  -files/firewalld.module:
+  Remove older version now that we've got a newer OpenRC released.
 
 *firewalld-0.2.9-r1 (18 Nov 2012)
 
diff --git a/net-firewall/firewalld/files/firewalld.module b/net-firewall/firewalld/files/firewalld.module
deleted file mode 100644
index ae83c575b3c1..000000000000
--- a/net-firewall/firewalld/files/firewalld.module
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2012 Doug Goldstein <cardoe@cardoe.com>
-# Released under the 2-clause BSD license.
-
-firewalld_depend()
-{
-	after interface
-	before dhcp
-	program firewall-cmd
-	[ "$IFACE" != "lo" ] && need firewalld
-}
-
-_config_vars="$_config_vars firewalld_zone"
-
-firewalld_post_start()
-{
-	local firewalld_zone=
-	eval firewalld_zone=\$firewalld_zone_${IFVAR}
-
-	_exists || return 0
-
-	if [ "${IFACE}" != "lo" ]; then
-		firewall-cmd --zone="${firewalld_zone}" \
-			--change-interface="${IFACE}" > /dev/null 2>&1
-	fi
-
-	return 0
-}
-
-firewalld_pre_stop()
-{
-	_exists || return 0
-
-	if [ "${IFACE}" != "lo" ]; then
-		firewall-cmd --remove-interface="${IFACE}" > /dev/null 2>&1
-	fi
-
-	return 0
-}
diff --git a/net-firewall/firewalld/firewalld-0.2.9.ebuild b/net-firewall/firewalld/firewalld-0.2.9.ebuild
deleted file mode 100644
index cbb10b730f93..000000000000
--- a/net-firewall/firewalld/firewalld-0.2.9.ebuild
+++ /dev/null
@@ -1,94 +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/firewalld/firewalld-0.2.9.ebuild,v 1.7 2012/11/18 05:30:51 cardoe Exp $
-
-EAPI=4
-PYTHON_COMPAT=( python{2_6,2_7} )
-BACKPORTS=190680ba
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://fedorahosted.org/firewalld"
-SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
-	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python
-	dev-python/decorator
-	>=dev-python/python-slip-0.2.7[dbus]
-	dev-python/pygobject:3
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6]
-	|| ( <sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		dev-python/pygtk:2
-		>=x11-libs/gtk+-2.6:2
-		x11-libs/gtk+:3
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	python_export_best
-
-	econf \
-		--enable-systemd
-		"$(systemd_with_unitdir 'systemd-unitdir')"
-}
-
-src_install() {
-	python_foreach_impl \
-		emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
-
-	# Get rid of junk
-	rm -f "${ED}/etc/rc.d/init.d/firewalld"
-	rm -f "${ED}/etc/sysconfig/firewalld"
-	rm -rf "${ED}/etc/rc.d/"
-	rm -rf "${ED}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -f "${ED}/usr/bin/firewall-applet"
-		rm -f "${ED}/usr/bin/firewall-config"
-		rm -rf "${ED}/usr/share/icons"
-		rm -rf "${ED}/usr/share/applications"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Work around until OpenRC starts carrying our module
-	insinto $(get_libdir)/rc/net
-	newins "${FILESDIR}"/firewalld.module firewalld.sh
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}