Apply patch to move away from gksu and switch to distutils-r1. Remove old ebuild. Patch by Sławomir Nizio <slawomir.nizio@sabayon.org>. Bug #486450

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 117 insertions, 10 deletions

diff --git a/net-firewall/ufw-frontends/ChangeLog b/net-firewall/ufw-frontends/ChangeLog
index b77d6e0d8dbd..80cb149e32de 100644
--- a/net-firewall/ufw-frontends/ChangeLog
+++ b/net-firewall/ufw-frontends/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/ufw-frontends
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ChangeLog,v 1.7 2013/02/16 12:49:46 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ChangeLog,v 1.8 2014/02/15 10:34:57 hwoarang Exp $
+
+*ufw-frontends-0.3.2-r1 (15 Feb 2014)
+
+  15 Feb 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/org.gentoo.pkexec.ufw-gtk.policy, +ufw-frontends-0.3.2-r1.ebuild,
+  metadata.xml:
+  Apply patch to move away from gksu and switch to distutils-r1. Remove old
+  ebuild. Patch by Sławomir Nizio <slawomir.nizio@sabayon.org>. Bug #486450
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #96436
diff --git a/net-firewall/ufw-frontends/Manifest b/net-firewall/ufw-frontends/Manifest
index 15b4bba18235..99f08a4ac105 100644
--- a/net-firewall/ufw-frontends/Manifest
+++ b/net-firewall/ufw-frontends/Manifest
@@ -1,14 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ufw-frontends-0.3.2.tar.gz 85472 SHA256 7ff838d1f20a122307ef5e2bc94f6cbb5ea019a1d3d7ec72f7493c5f8c0a7910
+AUX org.gentoo.pkexec.ufw-gtk.policy 778 SHA256 abeae0fbfffbc09f6f208c713612e8425d8a11268baeae774fd12ee8aacae1c0 SHA512 f2b47a01535d565d2d3f40266f61b5b0ee3ad5befa4aa9f704000000f111980ac219eccea7d22fe3b0995d91aa794c278daa4f6a6d36649cd0db7b53772bd61f WHIRLPOOL 7119bad2f11779a3beb8c2267c918d31048eb9d70e949cb14b0e3068594b148ca88fca46cd46ff3b6e17216c1be208596eee1be9d8d182396769dac1d892c8fd
+DIST ufw-frontends-0.3.2.tar.gz 85472 SHA256 7ff838d1f20a122307ef5e2bc94f6cbb5ea019a1d3d7ec72f7493c5f8c0a7910 SHA512 9f311596a3bad71562ca98acb8bf4d0d55990520cb5373c299dad05d1a1986e791eac984385013a511af4693a9988351ec37d8735ae6748818a9570db416b274 WHIRLPOOL 8b12a19c3338210d388b3d5ed24e22cbb49357d9fa9c768ad7b9ff8bcb6481cf4888048ec4c60266915a69095a90e2ce776a81f92f0f9692d8c2ef3fc4b669ed
+EBUILD ufw-frontends-0.3.2-r1.ebuild 1712 SHA256 6ab3dade8132c7083e7a5caf7a3df654269cb08e29877ab82ddaa0b9dfe242e4 SHA512 1b95587f17741675e57a310d5d0266dae627a4009b01dc4799a9f3e250b4510ed91afa2ad0331421ad9479a01dc5ed8d91638d6b319382f28ce8fc36bded2c34 WHIRLPOOL 95deabfb066174789586b8b853af32f39667dc010741230838de76f9e6dfa1784af52da727c1a975c9c769fa8b74e93c988b06e678d5e2221bbd797e903a66f5
 EBUILD ufw-frontends-0.3.2.ebuild 919 SHA256 8c6a027fd74f4ff5be568885a893c887d39a84081506b08460d6cf15c933a6df SHA512 bf54a2895a9e08e0c65be4afcf2d983333ead46be5b5640e85641e11ce5201f8212821523e760b2fbb5cc169a40971502e014761eafeeb5c6230d050f0272048 WHIRLPOOL baefa5d2f678fbd28419da52c6833943ca3080d0e90b438617b8ffca806b50698d237084aacd98bee44de09dcbd204dea9116df2280e50d7b3f5c98e44e8b9e6
-MISC ChangeLog 1268 SHA256 265bc4ad6eadf234c2fe5ac2c17b535588658b73cf5d5f2df4b18fe38ef666ad SHA512 0abb16fe5943fb1f68623e118eb38858a51ce35b9f87fbbc4766af810863475e106b71181dbdff1a12cb02504569ba5962425cea7448010c1661c84451bd0c1b WHIRLPOOL 3cba8e97920c5203155331dc3980555f6d1be6100f476bff830269c58c9ba5ffee4f7171ccf6923fc95d194ef04ebe607747232ac8ba5c1ecb0373bdcae5367b
-MISC metadata.xml 621 SHA256 af1521f64718293587ccd6ee90ca591646b174ced11c984d0b7cbde5475d014b SHA512 0a3f47dc897d928a3dbc62ef994ca21fe29976e10fdf4b08ab2a4e27ca72d4d8f917dd895de6ca46505e35da73760d016ff34cdbef4bd0943a69de54a49841b8 WHIRLPOOL ed77ed2644f2c2ac8de51aa2a65c395b4bface3e12e5657a8e1cc123e80f9daaecebf0186c4ef2c409cdef0341f2447be259a9ea860fd43655e38b08c80c9116
+MISC ChangeLog 1608 SHA256 de2bb6f0a2f34228579b4e7f9e50aa7ab5b6220b4dcc7dd6eb00948394bb7460 SHA512 806feb0863924154fa0b0bed331d6445a6b34242309ba78d6e36edb07149e75ff21771e048efeb8b3c4076a70ac4fad638b1fdc9b9e788e2ce3d6f55448e2905 WHIRLPOOL 140928ae3a7abcc552320a82d2bdcb59afa2b4d5d2628c321fe7809de3297e813f05ed6366cc6118b5bf351b327d4d01a5637b372699fd1cddb4e14f7ee239c6
+MISC metadata.xml 822 SHA256 4252988eb484e7ab30f1b8cce97e4ad793d437ec40bd6920b111bf59cfc44fde SHA512 b5394fbb4d959861fa83e8fcdc5c9c1c0ddf4063d5a96b834d3f47d6cb75ed3bfdd9a096a1a15651bc9401934ba76100cba726945ba391ba3833c05e517d124e WHIRLPOOL c45ea1994ae42a7fd4931b877f64dbbf5e3c4ec2ba5945b21d93c0fb9d1f0fa0baa68af5f5370ced31b73e97fc4cbc4d18a8452042badf94ef5d9f2629b45686
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEfgGsACgkQCaWpQKGI+9SOfACbBi396sV5ljnsZLZu9Ss99hS3
-Oa4An0/SeMqsICQNEIlzmaifULIhabvR
-=vAR6
+iQJ8BAEBCABmBQJS/0KbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88uD0QANEkV9rjBioutXD4aNQFnE2T
+CCa0cBKYSfpJtnMdspt+hyxlcOsxhdCg6S5yC6lO3qKkVFBY/bmzEgXrcMJeLMJ3
+4rJ/DhmWFI+E9XxEBqxrAMupEfNNCuGsU0Am7ccR07nGSiHnhWnF/cip6iBqPPsI
+xVu6aF8kOGLn7yJ4rbxePT0pmhFZ0yeickssarGzImcl5oIJN0bZHTfbGgU9WCPX
+8pSYRVs+Iindwf5QbWzgV7jsc3N1u2jon2sEE/lUXRcGaCHFS7OgjR+hEVM1yFZ3
+8xmy6kYDwGIX7D6aNElEXzHCiapNVjx2wi6xbi5Dl8AZlgRQjERbKQ+U5zD+4OIt
+oEcjfDhVZpOE0VA4R5NyZbj5DVFWsn1KG1lpyCFLn1mCKMKpZwoAy3/PuPeLBo72
+Q/LDGrxsTfRdClUHvvE93AeSXNcRJikgxCjhOlkwAGmmI59Oe/U/rRzWfmSYTNZP
+MXfQPXnOnYNsRcyxPQNp4oYHEUYjNQAmH0fOnb6yfRBk9DOsiW1PAztv8KgYZitE
+0lBNImvcZz0tNtGY3AwP+XR2+FY0jTCZmsOpLSPl85raVboZt55fUY/SmdKIMP0d
+K9n1h9yZ0Sy9yckiyNbw3Fu77fgMiuynDWmrkRxbQPeiTmyLGKlCrpjbK5rPNIPT
+6TbGCjmV3SBY3fwg4vxl
+=2ASy
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy b/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy
new file mode 100644
index 000000000000..7410debbc818
--- /dev/null
+++ b/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>Gentoo</vendor>
+  <vendor_url>http://www.gentoo.org/</vendor_url>
+
+  <action id="org.gentoo.pkexec.ufw-gtk">
+    <message>Authentication is required to run the ufw configuration tool</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/ufw-gtk</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml
index 8467ba497e78..9558d7412c05 100644
--- a/net-firewall/ufw-frontends/metadata.xml
+++ b/net-firewall/ufw-frontends/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>slawomir.nizio@sabayon.org</email>
 		<name>Sławomir Nizio</name>
@@ -12,4 +12,6 @@
 	<upstream>
 		<remote-id type="google-code">ufw-frontends</remote-id>
 	</upstream>
+	<use><flag name="policykit">Use pkexec to gain root privileges</flag></use>
+	<use><flag name="kde">Use kdesu to gain root privileges (note: the flag has lower priority than "policykit")</flag></use>
 </pkgmetadata>
diff --git a/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r1.ebuild b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..5487cdbed40d
--- /dev/null
+++ b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r1.ebuild,v 1.1 2014/02/15 10:34:57 hwoarang Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Provides graphical frontend to ufw"
+HOMEPAGE="http://code.google.com/p/ufw-frontends/"
+SRC_URI="http://ufw-frontends.googlecode.com/files/${P}.tar.gz"
+
+# CC-BY-NC-SA-3.0 is for a png file
+LICENSE="GPL-3 CC-BY-NC-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde policykit"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	net-firewall/ufw
+	!policykit? (
+		kde? ( kde-base/kdesu ) )
+	policykit? ( sys-auth/polkit )
+"
+
+python_prepare_all() {
+	if use policykit; then
+		sed -i 's/^Exec=su-to-root -X -c/Exec=pkexec/' \
+			share/ufw-gtk.desktop || die
+	elif use kde; then
+		sed -i 's/^Exec=su-to-root -X -c/Exec=kdesu/' \
+			share/ufw-gtk.desktop || die
+	fi
+
+	# don't try to override run() to install the script
+	# under /usr/sbin; it does not work with distutils-r1
+	# and so it is handled differently (in python_install)
+	sed -i '/cmdclass=/d' setup.py || die
+
+	# Qt version is unusable
+	rm gfw/frontend_qt.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --install-scripts="/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use policykit; then
+		insinto /usr/share/polkit-1/actions/
+		doins "${FILESDIR}"/org.gentoo.pkexec.ufw-gtk.policy
+	elif ! use kde; then
+		rm "${D}usr/share/applications/ufw-gtk.desktop" || die
+	fi
+}