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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 6 insertions, 136 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/Manifest b/net-firewall/firewalld/Manifest
index 09e46e4b8d3d..706e1443b789 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,8 +1,6 @@
 AUX firewalld.init 389 SHA256 17270614f049ad7662718720fa1c205b1859f9d5d7550b488fb6f35d070726ed SHA512 01213b8363eb25965f8432c9768cd351eed65994029734c20a0b86579c780dd734287ae5f038b73d85539ad21a38dcf5d63c26eb9d658dafa41e9891695bcb9a WHIRLPOOL 63a5cb71834064502806bb576dc629bdf5c7be2bc0bcc9ea7814f541bce8a0d8b296ce5d1077b5bb3236e2d476efa88ac6266375c08964062d5bd2ccea12b652
-AUX firewalld.module 681 SHA256 695dea47b5c0e82f6666928cbf19cb8d8c8141b1405f4e82c0561a3d482737e0 SHA512 8f3a04b73562f20d231614fe6e86e40c76e1500c7e8843405d536bbab1cb33bddc8da035983c093cce2cd7d0f7a8602779dd3dc77700951f09cc9e9fc86c935d WHIRLPOOL ec938906d9be0865e9bbdf4006103bf9cbee1855ec770bd209eee2be479a1a7e66310fd8ff6fb61d70ac6552233cebaf9fe09f08969a16b7ead26c6af5cdf13f
 DIST firewalld-0.2.9-190680ba.tar.xz 3948 SHA256 610d1da880269220788aaa114879f3f6bcd463ab2cca92062a1f262277fb24fd SHA512 b053e2f504f4f318246c2b14c36fe3502a933e380333cfb82a79281e0c0f5cef89a05939b5adee18a7c26fe408b90ca24b9ab46b948696c7901da2f8e8f8db7c WHIRLPOOL 78ada112953a2385be74511ae9c1601c3d6334727dbaaec2124819a16299d2184e110cabbf719dc2bf837aa3a33ef799d77394f081f2d90ef5d57e3e4fc3dd30
 DIST firewalld-0.2.9.tar.bz2 280445 SHA256 106fd985074a74bbd84a3c866fa4023693b185d0e8b3e386d0aec9627b36bfd0 SHA512 1e1518ad2b7dd8e2c987bfa7b1efc72e7735444235a240350655801dc84a05fc1f9c524ea7ba71d5cc7d16735f2f54f3ed7d8bdd4b4770036a5756e379f7d656 WHIRLPOOL 849ccf8334f39333aa3c08e317d912528c4e69ebbb4db719ecf8428cc33c5f6e0d6a24eaef0f03ffbf912ce4619807904a3fd212cf6e63700c84dd1036291674
 EBUILD firewalld-0.2.9-r1.ebuild 2103 SHA256 9d234d5e85bf2911750072ed7b901e11fdf996d1e220118d4449a2323080f70b SHA512 11c4867fa864052b73951d2c2f1bfdbaaeb918e5e69f1453f70baf588eea06c8e81c20400b84be63bac3eb7b6310d1d51ad07e4b255ca5fc67966b776ca205c2 WHIRLPOOL dc4a8a9a83cbafa8b9bb87335456219d528766c33910f0a8ee5fa067033a6b11852fc8bd63e3db6e8ba0bc277ff77324e5107f5263219d1ce5d0c6c93da63c97
-EBUILD firewalld-0.2.9.ebuild 2237 SHA256 ac9c19ec1e552a977cc554891293f3f7d3f050d27738c0ee9165d514435eda54 SHA512 a20c54c2e4e581671f0f1aeb2e5fa05d98a948087c0c3790b5686c327010a2abec72c4c56a156b0dcb535c022b0d713c76c4b57fc4202c391b14e95698cd2c2e WHIRLPOOL 81b752d559ef1d74c2621bb7607a3a732bf31245ca4937caaf93e580bd7fea4a802e59b8570aee58ffaea91eb7c905c16de1f51a6e62b741419b3b3f197b4d5c
-MISC ChangeLog 1435 SHA256 d9935f5261961b9d3db4703859040f33aaed8f2f0512b7d5d0472c4b2c84d4b3 SHA512 62520c3021e2f3b79dce23b1bce6657304cb5b06a189cd28012683d1ad72f5beb65cfadde9aa24e97281512fc5b0ab4be450367b145712e8a7f93a30ee7fb8d8 WHIRLPOOL 720ce5666880c3fb2b3400be6696e6c1e026b59a2316979340ea1dd7ed584e6ff0ad19cd9859c3335d71dcf96ae5e174978e459544a69294fcac872fe242cbb3
+MISC ChangeLog 1605 SHA256 e2d7f01915a7a2968f5ba47a120290313f52d3f112ff7d41dac76381d2bcfd5f SHA512 81afc4e61df1ac3b95b04f3debf01484925c3ab02293ea42b8ef22086dfacf5d8748f588ed579a740bd09232d816114dbe80363230b1403fdbd8be1befdf4dc8 WHIRLPOOL 3b4f23a17d93305b9665fed9eef2af7cfb0380dc485c8fff47298390c4082bbae2598b0d90350e705f86b232b1e0a49d7f4b51861cc90c3dba02b5c3beb216f3
 MISC metadata.xml 357 SHA256 ebd525995b6a8776c10d984533962fefe49a9d2e7e04ded9cc5b3efe664a58a8 SHA512 3bbc1d68b2999faf4c3a6acaf45f78621a7b612c7c691e5fdfbd7a92793be7629d67c7abf04b455c7cbef5bb0ab53214dfa15006a15df7fa40adca6689995c35 WHIRLPOOL 15b22a034a9186a4656431d20a4b64cb338ec865900fabf613e17da4c17f8e417fdf3223faaf6a9560c071b796c719157e84a8030bcf7365601f671b794461d2
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
-}