Version bump (bug #503376), which mostly solves py3k-compat (bug #459198).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

4 files changed, 152 insertions, 18 deletions

diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index 27c46e47151b..90bebf46283a 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/firewalld
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.13 2013/02/24 11:29:56 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.14 2014/06/17 12:50:57 dev-zero Exp $
+
+*firewalld-0.3.10 (17 Jun 2014)
+
+  17 Jun 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/firewalld-0.3.10-py3k-compat.patch, +firewalld-0.3.10.ebuild:
+  Version bump (bug #503376), which mostly solves py3k-compat (bug #459198).
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> firewalld-0.2.9-r1.ebuild:
   Stable for x86, wrt bug #458688
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 334bd9ee4bf5..9c87038357f6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX firewalld-0.3.10-py3k-compat.patch 1060 SHA256 985ae246d2a86e9019d81804bfb33a1ce7ed443e9d6ff894fc7e8e45b58f6fc2 SHA512 62ffd0f63ea5817f9ec41830dc87f190f8c616633fb3db6ac16dc14332555c73f3416b47e21bd00aa033b0c1d6b00ecbcd9ed9c307c519c8ccb47b0b021a59de WHIRLPOOL fe45c125d08637ac5de5d3fcb0a6405cbdce8b3b373888844139b336a77dc6e21144dfbbdffaf9f7e7f3dc76a6a2a0a81f73b10a98c92b7f7b771e34bf8d4fa0
 AUX firewalld.init 389 SHA256 17270614f049ad7662718720fa1c205b1859f9d5d7550b488fb6f35d070726ed SHA512 01213b8363eb25965f8432c9768cd351eed65994029734c20a0b86579c780dd734287ae5f038b73d85539ad21a38dcf5d63c26eb9d658dafa41e9891695bcb9a WHIRLPOOL 63a5cb71834064502806bb576dc629bdf5c7be2bc0bcc9ea7814f541bce8a0d8b296ce5d1077b5bb3236e2d476efa88ac6266375c08964062d5bd2ccea12b652
 DIST firewalld-0.2.12.tar.bz2 370144 SHA256 02da3b1660ba87056615f64714dcdcc13694e953d07fb415b1b23d57d94b3071 SHA512 2ebd773dbb1eb831b49c2fc402bd09fa9be0ff706ff4194bcdd44b0d16b33296f9cb015ff3db0050e5688fcb64a8acced40507d9870d13e35aa4608705f92a03 WHIRLPOOL 92c22549143aaa9c8f46ff89bfeeff41e03c3160d7af9dea08f786e0fc54e4becb4cd293268d2caaba62594bb9b11f195b2d64eb551203489ac95cdf37a9cfcc
 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
+DIST firewalld-0.3.10.tar.bz2 548013 SHA256 0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b SHA512 3fb3363959203d90d51b2c9b7b7819a4f3521a51a10a59d73d65054018e1fe90d0fdd2e31d0b83a3d38e2b2fd6e92fccd6dd2a30ec7f1be3f98a018a5a49aeac WHIRLPOOL fc6d1ceeb4e5ba91b072526ffa2dd7a790d883176104bec6e7e547b9035757ff22743746389f50edd32d646a07e9bf311b109f89b8c59acfa350e71176d0bd3c
 EBUILD firewalld-0.2.12.ebuild 2102 SHA256 2aa1a3fa8ae2f4b14d45bb34fd4f405d2e557185d6e7e6a92e7205092e5fd431 SHA512 ca254e71eb1143efd806a3620dbf243223164879097801b6a14f31016b798c054784ce1877c7b97522098e9e0e3fd8530644f2c14f91a154edfdf1559780259d WHIRLPOOL 20b352abd504512345b612d4d8014db4dc503887ca1b7726f0d15f61a600320dfe01914521697cdd9a8f32dd8e00dcbc18923a65968b2d9b962097941e26764c
 EBUILD firewalld-0.2.9-r1.ebuild 2098 SHA256 4091cf7b05868b7e6a13b4eac3faced9ebca708bf9f8be8717abb6a8d0b3a4d8 SHA512 8aa740be0579017e215a90b2a3b3841dfa96c96eaa97b7c469761c8ae7759a45ebb3a86df7231056bbeb6305a420ee4c3070dc475c57c57ae907a3f012c015e9 WHIRLPOOL 8a59ca5e98f1a4c8b53244dae7cb8dbaf2f34a9f5bfc6b32de19b2ecccf45bc8bd4532e866607c21a8165f046efbaa0de8fa23bdad9e73cb7af73c7a95e1ef51
-MISC ChangeLog 2082 SHA256 b1ae8e214042e1e641bb01972b4235ed9518e19e032db577b131d3f330f7196c SHA512 05b867d87deaa47f96e9ef5ba70a97157cd48d9fd904ddb09036a67c7526356450e60664a56b94997f3e6286d36e6ea1fd22d5ab687335e2984f73385a992d9e WHIRLPOOL f7b4f9adfa799d054dc21b0e37037dcb1ed4d8ec98cdd966830155f01f51b5d614d5e215763575fce0f29ec86900a0d4a4169961bd83cbf0d1b976bd758613bd
+EBUILD firewalld-0.3.10.ebuild 2645 SHA256 8694942f60bc5a4ba6c2d1c1e634c4f574cfd19d72969313c81ac36f71ea0930 SHA512 59513b433afcdf2908773ed1aa14810d8d510a45b24df02bd8214b4476832088191aa298da518756fc60fe54963ea955eaa58c79cd6af973365e443df7d00045 WHIRLPOOL b4b6abbca53f3ece450d5abe7ef38fa1bef5b938323bd8e3c772ac488a7027c65a6f3ef362bb8fc973559659904628ab217ac845ab428785c084f52458f852ba
+MISC ChangeLog 2322 SHA256 b89b70d4ab1e30c0a849ac9891120c33654f38999cdf0f87815c50e69b48a1b8 SHA512 d5385c662c1caadb275f77ce4bd01f80962b11921fa10fe51a306bdc30078bbb7c01fe9c670fdc1e7aa50259cf1d366a250b7e3d44bb858f2c23c2e387a84257 WHIRLPOOL 0c9cd9ea0cdd15d9f6f8eed46a4aaf725f4c42aa66896f3a29356eb19d296df1db93f646a9e67573ebcd4153d8dc6e61b8c1f172d7c3702d3c1db4efab2e6030
 MISC metadata.xml 357 SHA256 ebd525995b6a8776c10d984533962fefe49a9d2e7e04ded9cc5b3efe664a58a8 SHA512 3bbc1d68b2999faf4c3a6acaf45f78621a7b612c7c691e5fdfbd7a92793be7629d67c7abf04b455c7cbef5bb0ab53214dfa15006a15df7fa40adca6689995c35 WHIRLPOOL 15b22a034a9186a4656431d20a4b64cb338ec865900fabf613e17da4c17f8e417fdf3223faaf6a9560c071b796c719157e84a8030bcf7365601f671b794461d2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRKfm0AAoJELp701BxlEWfOrUQALJl+h2xf61dwBcnwTtztuKJ
-StVueM7W32J6MaPXc8jiaPU+8QBFw2sXUnU/dkh8gxg15jy2QIB5zSKebot2+Zcf
-0kENTOkY9+XyTu4PlxjHgL7ylwfGLviPCCd6qEAtrX2bbFuspovfabM+5GHWbofH
-6h895Dy1M+dQ8NaR+NgSH69JEqwjJuKpQSGKrjrSnGZBHdmbBifqQvVdkqRIxquT
-kqn0il0YXW0WdQXdw4KAta2EbUeB2Efd3dRnUnrcrooEmllnJHAMkvwVy6h9MDk+
-UxP+twYLdaFHosLzVDJ34QmpqQXA8YhJEVRtM497VStv4MTB7um8syPGedszR3NQ
-7EwNx4kR3tpen4lNZ8dnF3t4vRIP7SMCjrwP5VsB4LtybDBBwHcEDuXaakULD826
-5eyIi9ZOjuuL5Y43QhWdScFVHIl5MP/hPhgFUyoxdBwGOKH8MgB5xzYYCjeCIHno
-rSraljJstwAeZZ8cZT8yISpz/g3xJCB4NuK9oM3tSr+IDc1SKhkt3boMUA0CCAfB
-az55b8dKei9yjDJ64PuV0Yy9b3V0dKDjdkEjtXUUbo9dFLA1tC816WvcXza5Jnqr
-PPWpljmAVYkdapIEb9cmfCsATsUcxtiZQQxOt6KAkQRxIxkCFHVNvy40JPk7u7KZ
-ePLB2tzd6eOFqMspzUma
-=lZ4+
+iQJ8BAEBCABmBQJToDmyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9WL8QAIyzO9Tg8ZSJTxMzHMaOXbF6
+YoQ/5Q6s0sMSryCMxsNXrpZ+NH4QX3Hp06POZixCxSIgmyH/qODu/A/l2x1aTBpq
+YLEIZkNXbaC5IGGAsNuMALTAJiz+fW6I8rRjFCgymrckYOcVeWpT/soNfGs3GXl6
+Mn8beJAQcbkdVW0AFZhDT1kQNfNRb42lVIqaXubjD9Hgvk6wR662LzTPh6bRT0uT
+g+LSXl6gGkiLo3Eh9ZOR7TrKERxCSgFjf5G8QuMquJc3WRV4NkyBYkEy0EPMdNbi
+eKMzgmjLFWFYxhsW2RQ1FTLKFvbZvBTQEWl9V+nj05KLeLBX/hsZxhRXF1eo9GIV
+xZY+2060kzyJNoO1OP3Eatc6RlprYBiqlLrQIHUzPlZGbtL2y/PGe3Rxm0zKiQl2
+eU7D7saN/G9rR5Dj/WVcNGk20OrHu3HqLMYE/x2exBaETnX/O6+DKy0RMueoZiv6
+ix9MUWvwSiJQ7/ql5dSiWaiihIxtXu0YkbfeGojcVPVYu33bbcNOxrOiGL4TliVi
+HewatWPbECY0a0arkyJYVJmJCo2OWvYolGNK6TgMKwk1OyZwdGV3AQNuvPitc1g/
+4x9ilClBo17QrvDa9NQ+RMRgGK/zAh9128RjX5crqti/CRkydiZkgmeIubudijcf
+CS1I9cxCDnLCvV7P1NHy
+=3oj+
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch b/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
new file mode 100644
index 000000000000..e91590f1cff6
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
@@ -0,0 +1,24 @@
+diff --git a/src/firewall/core/io/direct.py b/src/firewall/core/io/direct.py
+index b698e4c..6b80201 100644
+--- a/src/firewall/core/io/direct.py
++++ b/src/firewall/core/io/direct.py
+@@ -295,8 +295,8 @@ class Direct(IO_Object):
+             if len(self.passthroughs[ipv]) == 0:
+                 del self.passthroughs[ipv]
+         else:
+-            raise ValueError, "Passthrough '%s' for ipv '%s'" % \
+-                ("',".join(args), ipv) + "not in list"
++            raise ValueError("Passthrough '%s' for ipv '%s'" % \
++                ("',".join(args), ipv) + "not in list")
+ 
+     def query_passthrough(self, ipv, args):
+         return (ipv in self.passthroughs and args in self.passthroughs[ipv])
+@@ -305,7 +305,7 @@ class Direct(IO_Object):
+         if ipv in self.passthroughs:
+             return self.passthroughs[ipv]
+         else:
+-            raise ValueError, "No passthroughs for ipv '%s'" % (ipv)
++            raise ValueError("No passthroughs for ipv '%s'" % (ipv))
+ 
+     def get_all_passthroughs(self):
+         return self.passthroughs
diff --git a/net-firewall/firewalld/firewalld-0.3.10.ebuild b/net-firewall/firewalld/firewalld-0.3.10.ebuild
new file mode 100644
index 000000000000..8fd61583cfd7
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.3.10.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.10.ebuild,v 1.1 2014/06/17 12:50:57 dev-zero Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+#BACKPORTS=190680ba
+
+inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
+
+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[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6]
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? ( 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 "${FILESDIR}/${P}-py3k-compat.patch"
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--enable-systemd \
+		"$(systemd_with_unitdir 'systemd-unitdir')" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	# manually split up the installation to avoid "file already exists" errors
+	emake -C config DESTDIR="${ED}" install
+	emake -C po DESTDIR="${ED}" install
+	emake -C shell-completion DESTDIR="${ED}" install
+
+	install_python() {
+		emake -C src DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${ED}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${ED}/usr/sbin/firewalld"
+
+	# 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
+}
+
+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
+}