co-maintain package; version bump; also install man pages, bug #540108 reported by 'dE', also thanks to Jeroen Roovers

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

5 files changed, 133 insertions, 12 deletions

diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index f73f505cf29d..c5137fee5ae6 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/firewalld
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.16 2015/04/13 06:32:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.17 2015/05/25 20:58:45 tamiko Exp $
+
+*firewalld-0.3.13 (25 May 2015)
+
+  25 May 2015; Matthias Maier <tamiko@gentoo.org> +firewalld-0.3.13.ebuild,
+  firewalld-0.3.10.ebuild, metadata.xml:
+  co-maintain package; version bump; also install man pages, bug #540108
+  reported by 'dE', also thanks to Jeroen Roovers
 
   13 Apr 2015; Ian Delaney <idella4@gentoo.org> firewalld-0.3.10.ebuild:
   add py3.4 support, update python_export_best to python_setup, no need for
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d26e8e9825a7..b9fcd2789ab1 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -7,15 +7,27 @@ DIST firewalld-0.2.12.tar.bz2 370144 SHA256 02da3b1660ba87056615f64714dcdcc13694
 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
+DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
 EBUILD firewalld-0.2.12.ebuild 2096 SHA256 2b385baef111fce428ea8cd0e280fdc661222badbefce6604833c43e07ec032b SHA512 66ad0fcc383f49625e9deb6834f6a0d43a7626da8a67e5ddbcdd2d4222c37d721f10cf4517be24702bc3bc3b11f96b44cf8771c300ac0f260afaad775cd57b25 WHIRLPOOL 675744791498c29274b64f6a49605e623cea1729411284c50eadaff783d07dbdc64d20749cdeea8c8cbc6989acf615514986c7263580a0a4d98325c2dec070ea
 EBUILD firewalld-0.2.9-r1.ebuild 2095 SHA256 8a5e4b59f4e5a971154b978ecbe84c35c8b9959f91f894b93ffca64013144ba6 SHA512 5abaf09215da761de9d3899ebf52a3104aa46594b2d1708f5d8cb35424e2bb4606539532552f95d553244b311ab5d7e35db7de3736b4237345981962cacc35b0 WHIRLPOOL 8ab7dfd789bcf3d798eb1ff407cbfc77d3993b2b9fc6044ff95b9c62546365d4ff12e3d1d9e0c5b0c247badd664cd9fba2941c956e61c03fe14ebc2adfbdcfc7
-EBUILD firewalld-0.3.10.ebuild 2628 SHA256 33414d752c03253a1156d17390ae894b0e2b51f41fd85a3d282f2a6d35ca9206 SHA512 b35647a489e705e548b0df8edd438d696cc68c22928ebd30ae54d2fb89619e5af18a8b6ac48ead14127af5becccdfa882db738f6c8dcd7ccc19cb656bfef9424 WHIRLPOOL b4c23471984099a01271ce037e6ec6fa4968fcebf6f02239e20cb33201b08290463bcc0c7b0868933c2adb82cbf3121eac7b511a07102795a222582fa3e41a4c
-MISC ChangeLog 2647 SHA256 7582aa2d161cf82e7ff3d70e164db2103aa07e33463744d2c172af9d9d530453 SHA512 051cdb39760bdda108ab9f706539600a04efa1160e43ef2af03b3cfc46ab03bd62edfe47607d91cbebc5e37439008e42040d11af4a5dcbf5b7c9fbc651aa4905 WHIRLPOOL d22b263810c23e899e3d3def1379759f65b7bf571c21b38910e63d3d458721dc4e8551df53debfef244fa6a3593b7d959c25b462c0dc385000e721954de8aefa
-MISC metadata.xml 357 SHA256 ebd525995b6a8776c10d984533962fefe49a9d2e7e04ded9cc5b3efe664a58a8 SHA512 3bbc1d68b2999faf4c3a6acaf45f78621a7b612c7c691e5fdfbd7a92793be7629d67c7abf04b455c7cbef5bb0ab53214dfa15006a15df7fa40adca6689995c35 WHIRLPOOL 15b22a034a9186a4656431d20a4b64cb338ec865900fabf613e17da4c17f8e417fdf3223faaf6a9560c071b796c719157e84a8030bcf7365601f671b794461d2
+EBUILD firewalld-0.3.10.ebuild 2586 SHA256 49172fd502dc7fcd5815bb3579a3558f601f49e2a04d8e8019b44137bb6adaa8 SHA512 def14a7e96124edea91698b455c2f57dd50e58bcee1402f4a2cbc688d3b8f686653cb31496fa23ec16ed62836b750348cd30b3d4c06e340df9ea1b6b48ca403f WHIRLPOOL b08e03dc14b03aef52ec1088f8321b7a9fb02a3f13b9506b81ede5c304f17c62614c7c731eaae86ceac2ca97766248f3b7d9b0e5db286685b7701457cc0edeee
+EBUILD firewalld-0.3.13.ebuild 2586 SHA256 5edbde95bcb771d0a80d43420ba4fc99c8c078682349f08eafc1b021328d9eae SHA512 5cd2d6314fe509f06ee311c81ddefb61187bf0beb1e80b075152b4bc0f133f8bcdf4ac13de7c61b8a7206ed644b3ac9c6233c38f07c9eccf63ea3f6359c02551 WHIRLPOOL d13a77bc93cdc7e5f031c205e11d9c890e37602b275165abf062679b0ceab08b4f8defc6c3ca830e85acef87745732eda5b28ba03d8de1ce110a857268cad5c9
+MISC ChangeLog 2920 SHA256 d3a0f7ffc52995540490d3315168083602388470666176780266046ee678226d SHA512 54e54f43736e7cc0c626871373605560448607e45c30c672fb7abd01f6e218b7aa173b14787570100f37af039accc1db31664734508dbb3266cd10b46a8a7e79 WHIRLPOOL a70a94e56394e21fae41603d5a16425924a26c0f49e5f0e2359868a264bf8c4ff2250a66e972d7089a6c6ced1e6ebe5c7db4ffb76d2bbc56215f1350a41f8e98
+MISC metadata.xml 505 SHA256 999c7c22332b5d65770713881cb5a3f7f24a86e42eee59f2e0f7771a07c560c2 SHA512 3e808ab1fb859bba30e6cf0f4bdb87ff71140a292d151d8f97785329ad2fc3033362d5a82a17cb6cecc6ffe9ac4ac5a7513814336ed4e4c67d57972fbb178d09 WHIRLPOOL 878352416ebdeda1419fe944517b14c31d6a02f5fc8472d4b0c9c9995f69df5e8f2a5e67b9ccb872e2d28fe1b1f9150e321f1b8ef2e3fbd4120cdf90ce8a468b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlUrYvEACgkQso7CE7gHKw0jRwCgmud0gAPGdmTgs0vVQRwl/36s
-Ad4An1IdCVjAeJGGJo8P8NckJLn8KPFX
-=TgCn
+iQIcBAEBCAAGBQJVY40DAAoJELhOzYlK7nn/WtQQAKJAVcVwbMrLVQHHdXJ1i8Yg
+1xFZfs6+u1Ya37XMk6zBpC8ABBi+LHee+rdZPFZaXbri5P6bHRbS8ykY6cl85I35
+g+Xe6zb+kyzbQrTomJEPuPQn+oyVtxcAyf3fZlB81D7KX7lJFUy+OiC8zh55Gmtg
+2PaFe2Be2DDJihSWisq9CZlNIwSSzXzvjDiwq4p4LQoKJp7CkHYq+xMjxXyxKAmj
+n53F2qSfJHMS/5MVEvXkRItsA8trF7G8/sxIRplTvlVOACf7m+dOToEK9OtjHXd6
+Dl1h4Feu+80TT2YGuo3caU355IHjznYaOkYVytw+KTCgjOvGLP7+7gAq0B7XXJ6M
+Z2ugVgjcCEN0E8WM79G7UvqlSfJwJQ0uyUSucAh7bwFe0UGVOFWdI4nc0T0jZy4d
+eDPtEVHQehN0wl/KBjBmu3aTo+M5bFocFB8ZZKh9k0FV9lyUoFBNSp0ExBcIUfr+
+rAz9ENZFtsXpAdGwL7kulWqdaTVfmq7OrN0vnsmvLOZ4RyF6JbqB5fAc5pfoGlwi
+D3VVBOpnTMxQqmNQd6sp3em9Z8tXHY9AsSiFzukOFUcQ/MFgHKNRo9PKkf6BTDJ0
+VHZ3feZqmSEsnbUkWgKNY3j3Soq9REyrmSYyyZwQOX+G+62Uagp23V3r5l9l+4/o
+pmBaJRC/JYv4za6Jgzrq
+=Bz/R
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/firewalld/firewalld-0.3.10.ebuild b/net-firewall/firewalld/firewalld-0.3.10.ebuild
index 4aa99438c19b..914c04940880 100644
--- a/net-firewall/firewalld/firewalld-0.3.10.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.2 2015/04/13 06:32:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.10.ebuild,v 1.3 2015/05/25 20:58:45 tamiko Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -56,6 +56,7 @@ src_install() {
 	emake -C config DESTDIR="${D}" install
 	emake -C po DESTDIR="${D}" install
 	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
 
 	install_python() {
 		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
@@ -67,8 +68,6 @@ src_install() {
 	python_replicate_script "${D}/usr/sbin/firewalld"
 
 	# Get rid of junk
-	rm -f "${D}/etc/rc.d/init.d/firewalld"
-	rm -f "${D}/etc/sysconfig/firewalld"
 	rm -rf "${D}/etc/rc.d/"
 	rm -rf "${D}/etc/sysconfig/"
 
diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
new file mode 100644
index 000000000000..c66d03dfe1dc
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.3.13.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.13.ebuild,v 1.1 2015/05/25 20:58:45 tamiko Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+#BACKPORTS=
+
+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}/${PN}-0.3.10-py3k-compat.patch"
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	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="${D}" install
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/icons"
+		rm -rf "${D}/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
+}
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 499286b8714a..773fdd88c2cb 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>virtualization</herd>
+	<maintainer>
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+		<description>Please assign bugs to me</description>
+	</maintainer>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
+	<herd>virtualization</herd>
 	<use>
 		<flag name='gui'>Builds and installs GUI configurator and GTK+ applet</flag>
 	</use>