Version bump, fix pkexec usage to make it work (#450544 by Carlos Silva), remove old.

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 73 insertions, 123 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index b8139f578449..10c2f36fc619 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/gparted
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.119 2012/12/02 22:24:40 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.120 2013/01/13 10:49:42 pacho Exp $
+
+*gparted-0.14.1 (13 Jan 2013)
+
+  13 Jan 2013; Pacho Ramos <pacho@gentoo.org> +files/gparted-pkexec,
+  +files/org.gentoo.pkexec.gparted.policy, +gparted-0.14.1.ebuild,
+  -gparted-0.11.0.ebuild, -gparted-0.13.1.ebuild:
+  Version bump, fix pkexec usage to make it work (#450544 by Carlos Silva),
+  remove old.
 
   02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> gparted-0.11.0.ebuild,
   gparted-0.12.0.ebuild, gparted-0.13.1.ebuild, gparted-0.14.0.ebuild:
@@ -489,4 +497,3 @@
   23 Jun 2005; Simon Stelling <blubb@gentoo.org> +metadata.xml,
   +gparted-0.0.8.ebuild:
   Initial import, bug 61828
-
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index d0d0209cfb8b..52828c760088 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gparted-0.11.0.tar.bz2 1661266 SHA256 eee28bc8d169e50f39f244d4524801c3aaf76e0cbe34bdc856d033d61f25dcb4
+AUX gparted-pkexec 42 SHA256 c666be6fbcbcafa660e3b875a31f6f565989086cec620ff675f90f7d19b814a3 SHA512 ecc34719a6fdf3739f87d3d2174a56b02c33c69e77d9811f4a043024d2f0479d077214e36fa6081d9717dc55d51dc3b8e0b51f86d95162422438841af24f7b35 WHIRLPOOL 9f0538db9d9008ef6fff9855b3fffe654614a27be9c318005bde49f85a7303110e9ecbaee9f44f34d53f722ddf33063d1be13e285e71a5b43357e000b5024869
+AUX org.gentoo.pkexec.gparted.policy 815 SHA256 8fac3302c7c4daa670656212161e79de0c7485c163534ba3ab50d9b9f570c6a0 SHA512 56a4c6906c721322a2530de4832f422f1a6dda2a049b8fbbf7536cfd798e0f1557148130af8f489c12687cd301b11563667150e3a703e8e3b01a4e0135ced845 WHIRLPOOL d6a098aa8e44ef1d48ba83556961892d13c939088e23d8c06eb11c09c1e8face1dad1f46ea9926a9bb87aceb2530739f1e6aa6c3e0dd4a08f26c64b25d8048c9
 DIST gparted-0.12.0.tar.bz2 1715113 SHA256 2c2f4ac580f322abf5b028092a4316792e3f18ef4de4785c9d97fc9ad12d6a6d SHA512 24721a116912f2d9601c4e5221b76059bb980a6db27d8dcd00c1102ae2b66ebf562670c9a443cc0ab846cbecd5c25da859f442f60977efd7cc6e3de8fff64415 WHIRLPOOL 716baa03ffde677390c2f46dc144a595c3c08c57e566334453f7a3a4338eab774332b4377ec3b6c5488776f1d3d6aaa770019ea7abb935c3937f71e2f1c5fac1
-DIST gparted-0.13.1.tar.bz2 1808005 SHA256 67c3830c26bc8ce4386e62a4a8e347c21dbefe3d5362b9b6a320e36df23d5272 SHA512 a0a6af764f5be094ba88057ceb10cd0ed9204fbedd6b8d25fae8e35cb0fec347f90fb0b2054f6d41dd3fc362fafa7a03beedb96b602a1b9c6ac32d060768da9d WHIRLPOOL 348ce2304c3213e1e022749240e1e44ac303b234e9496275cc7e544264e8ce6e5ac76bcee99d316d10bd9ac8411f442170aa417af95c0462d70d2797470e0b97
 DIST gparted-0.14.0.tar.bz2 1845309 SHA256 ab82da741ed8af3fca16dd0928da26c92e2665fa02709631634a04b017b60b1b SHA512 db728338c9c38ed384f364b44b51f989f4f442d75ae8ce56e121b33c372303cb980447491f8377ab5ff1b473cdbc3867dd78ad77b7701903a5fed5f05e257379 WHIRLPOOL cf0450f654ec1ae270b9df48e099b579c87a9696a2637193305e56a34fa803c97a52f8d7be9be6b209aed9a3bc6dba9a885f85059b266f62f6a2ba2d2bbe2f84
-EBUILD gparted-0.11.0.ebuild 2052 SHA256 617e80aa8c312223e9ad3a0fc16341bba9585317a64c582d69460fa4a42428b7 SHA512 dfc436061f1af45be8ebe4b41fbf674df38490713d7a1f718000e5474ae563d69419c82d20e50c9d73ff4e63f4c8da6ff1cc633cfb486ebb8011fb5aecae42a8 WHIRLPOOL f76b8a2b931283c9f20f8e8aed6d496794e45bff22dc295e1992fc219bd65455596944c9fd77fd1890ef7ba07cc72a3aa70de5ab69349fe2f2f798a5bee8214a
+DIST gparted-0.14.1.tar.bz2 1873316 SHA256 b1b53c5acb37ff908434cff174dd42600e79937ec8cc9590b12ce9d504d62719 SHA512 b73508ad205f5ac048f110100f8cb42d4338f61a3303fbeb12277b7ce07057d83918a6e421dc8de5365bbce3126f78388e9beebdf4f7b901e1f8c8c8502d5e3d WHIRLPOOL 0402717d0aba0621be426d378ae9973d519fc3f529810e825ba72010ee1a29ab445145af77d496f9bbfd49c3c0f8fd2cec392b5cc58d9b70b8a1f5295c910939
 EBUILD gparted-0.12.0.ebuild 2046 SHA256 fd8e6de9456bd0b4b347465ac2e2dba612a0e49395ecea7200a9038936b6d5a4 SHA512 b0f49aaaee4f6ab01f165031dcae0b41f98e98269a96f859214946ead1a827a286338af52685e65ff7e9a5d04ceb96ceb4b5b8695cac3230f3f7da58460ffb83 WHIRLPOOL 2b255e6a2ee2669e4b541a822bb1816dc2aa3acedee51edb8bf6427a348b894656628f2454fa59a4527fc4b3f48d1f3873d735d76ebaed2c94b740914f889695
-EBUILD gparted-0.13.1.ebuild 2063 SHA256 2a08975d56ef69c9d4e54bb2b497afa1ea9ea49fa74c467021e7748d674528c7 SHA512 303b044d68acebeb3b064916df0079abff4e2e1aba035c018f6ceb0fa72c3d0f72067f9c477416ae7f28d6bae2a6693e1804b823c4150c926202196fa4032082 WHIRLPOOL f0222f290d80c4780d01b101ebc046affff2f98a4e55f2eb47d4c7c57e3cdd317e178d7cae04781a76c71ad798310c359f4cf42e7ddf5304bc473b101f53be71
 EBUILD gparted-0.14.0.ebuild 2264 SHA256 e00f78def2d2d6b571733a25044b1ac0ea568a44f35925fafefb0dd0836d92d3 SHA512 aeb4178f0e69897321802727a80f101f6687d874a3d30405db1e1ff5e0fa0e5e2642379b98ef9fcbff6a032ca098dce1810a466cef1c37bdf367508a31651acb WHIRLPOOL ebe05df285e986013eee9ae0ee74c935f81e72644962578a103b7b6f455240311f92107c70dd68a1bc127785abf911da43b0139cc990c90406a5734d8ee17a79
-MISC ChangeLog 16587 SHA256 046fbe8464fce7982ec414927d3fa02db2a37498aa706b987ebe819a17c01ed7 SHA512 8e0fc20f3dd39313ae21f33d3f974e98ea36587242d8b176c959859de1c28f481f672cb7b0a1025c049e6224204ba466f4c794fc6fc3d483f9a9e63d8d9f56a6 WHIRLPOOL ce53b14d25b19ba973a98335789cfda53bc53a7c4194c71d459d40865f0659d14bc2c1458a5ae6a6525407f1f28139b37e8368ad504b6865a401a6380ec17afc
+EBUILD gparted-0.14.1.ebuild 2412 SHA256 f943affb4c26c616747ffa24c853a46021b72abc084f64423d561d38ca328c67 SHA512 bd811d72a27527c8d8218395b1c447fc894f0b83d923ab55ac83c68e86f409b9697fe716e0ab474be0194b0285b14fe9e19538a63f8ecad48e538087cb044584 WHIRLPOOL 86a62b54e0b8007768ab575b33ac8bb8dd2782bb98e5f01230f5b902effb4b36854a2c56cbdbaa32cf6869618b857adc1e54d43cd95c680c6ac0b1eba2927b40
+MISC ChangeLog 16890 SHA256 cb9f528d89dbb049bf117b5e87917c5d89a0a8065416ba37e2690bef1ed0faa1 SHA512 1cda70cf4a547a9299db197437e7ce0e1b7a4b13c6f9727c624b866c371179b24e944f5143a8c50718612942ae4f9a279249e7a994cadc082fe3afc58e1790be WHIRLPOOL 0098d1d687f38cd89660865b985412025e165c00c1248347bf4f57e0069e890730472d9b1c3225e8c70c7fac26e1288194bfd639bff8f4882b8970ebdb7d5857
 MISC metadata.xml 1489 SHA256 923195e65741cba1d64c5a3322a13caf19ae95ed1ba28defcf90ee17eeae524f SHA512 fc71fef54e4e4712f0e9c0c81593413a6aab466af083e709d8fc236810050d3ae31446c2fa216b95635cbb1a4edd3e81d59f8658fa917be0e50d04cee7487b03 WHIRLPOOL 12ae4b2dedee049ed89a5ee0c549c039ab47e1c5299936d113a96f0df412164a1f3f0e3fe94b20894cfa84074ebd9fbf57d51d9b01ae6f068639f5cc15237288
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQu9UqAAoJEEdUh39IaPFNA3AH/AuP5UYoLArY1JrPfPfoYgv8
-2qqRWpgn0sgLJLdVE6MfgYdxU46JmfgepeUuoLTXeiyCjUa2wO08XRXbBDay/Hc0
-9cfx09z/toj6Z4twX3SIavklSPw1+oZfb3xI6jci2FBx5ha+G83HVkEOQI0CHGSt
-0KyeE9OpmycaxOATKJ/i8TnRhlRisC+zt8K0OrRTuebWy1iRLCQ0SyDbCYsrWHbn
-LjZSW9W1l4Z0LVGWhUYJ8SxzbWkwJfvNSLi2SDAk18xQayBqkc1yuixVgkTR3dX9
-xKB/pRBtxswqsFqCFfPmsSOVtq9L+m3cOzBmZ10vBIc3M4ylWrNS7IbfhbwxxeI=
-=fH4H
+iEYEAREIAAYFAlDykUcACgkQCaWpQKGI+9Rp6gCeLqHI+Ip19KkAzvBOC/x+83UL
+2y4An1XV95sMdT1tYuHFE1kviXwTNamH
+=QtWq
 -----END PGP SIGNATURE-----
diff --git a/sys-block/gparted/files/gparted-pkexec b/sys-block/gparted/files/gparted-pkexec
new file mode 100755
index 000000000000..4405cf42a1ca
--- /dev/null
+++ b/sys-block/gparted/files/gparted-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/sbin/gparted" "$@"
diff --git a/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy b/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy
new file mode 100644
index 000000000000..566712ce2b43
--- /dev/null
+++ b/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy
@@ -0,0 +1,22 @@
+<?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.gparted">
+    <message>Authentication is required to run the GParted Partition Editor</message>
+    <icon_name>gparted</icon_name>
+    <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/gparted</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/sys-block/gparted/gparted-0.11.0.ebuild b/sys-block/gparted/gparted-0.11.0.ebuild
deleted file mode 100644
index 0b8c78bfd6aa..000000000000
--- a/sys-block/gparted/gparted-0.11.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.11.0.ebuild,v 1.7 2012/12/02 22:24:40 ssuominen Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="btrfs dmraid fat gtk hfs jfs kde mdadm ntfs reiserfs reiser4 xfs"
-
-# FIXME: add gpart support
-common_depends=">=sys-block/parted-3
-	>=dev-cpp/gtkmm-2.16:2.4"
-
-RDEPEND="${common_depends}
-	gtk? ( x11-libs/gksu )
-	kde? ( kde-base/kdesu )
-
-	>=sys-fs/e2fsprogs-1.41
-	btrfs? ( sys-fs/btrfs-progs )
-	dmraid? ( || (
-			>=sys-fs/lvm2-2.02.45
-			sys-fs/device-mapper )
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
-
-DEPEND="${common_depends}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	app-text/rarian
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--enable-doc
-		--disable-scrollkeeper
-		GKSUPROG=$(type -P true)"
-}
-
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-
-	if use kde; then
-		cp "${_ddir}"/gparted{,-kde}.desktop
-		sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-		echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-	fi
-
-	if use gtk; then
-		sed -i -e 's:Exec=:Exec=gksu :' "${_ddir}"/gparted.desktop
-		echo 'NotShowIn=KDE;' >> "${_ddir}"/gparted.desktop
-	else
-		echo 'OnlyShowIn=X-NeverShowThis;' >> "${_ddir}"/gparted.desktop
-	fi
-}
diff --git a/sys-block/gparted/gparted-0.13.1.ebuild b/sys-block/gparted/gparted-0.14.1.ebuild
index 29f034137348..76a37a1f5b98 100644
--- a/sys-block/gparted/gparted-0.13.1.ebuild
+++ b/sys-block/gparted/gparted-0.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.13.1.ebuild,v 1.2 2012/12/02 22:24:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.14.1.ebuild,v 1.1 2013/01/13 10:49:42 pacho Exp $
 
-EAPI=4
-GCONF_DEBUG=no
+EAPI="5"
+GCONF_DEBUG="no"
 
 inherit gnome2
 
@@ -14,17 +14,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="btrfs dmraid fat gtk hfs jfs kde mdadm ntfs reiserfs reiser4 xfs"
+IUSE="btrfs dmraid fat gtk hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
 
 # FIXME: add gpart support
-COMMON_DEPEND=">=dev-cpp/gtkmm-2.16:2.4
-	>=dev-libs/glib-2
-	>=sys-block/parted-3.1"
+COMMON_DEPEND=">=dev-cpp/gtkmm-2.22:2.4
+	>=dev-libs/glib-2:2
+	>=sys-block/parted-3.1:="
 
 RDEPEND="${COMMON_DEPEND}
-	gtk? ( x11-libs/gksu )
-	kde? ( kde-base/kdesu )
+	!policykit? (
+		gtk? ( x11-libs/gksu )
+		kde? ( kde-base/kdesu ) )
+	policykit? ( sys-auth/polkit )
 
+	>=sys-apps/util-linux-2.20
 	>=sys-fs/e2fsprogs-1.41
 	btrfs? ( sys-fs/btrfs-progs )
 	dmraid? ( || (
@@ -53,9 +56,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--enable-doc
 		GKSUPROG=$(type -P true)"
@@ -72,16 +74,23 @@ src_install() {
 
 	local _ddir="${D}"/usr/share/applications
 
-	if use kde; then
-		cp "${_ddir}"/gparted{,-kde}.desktop
-		sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-		echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-	fi
-
-	if use gtk; then
-		sed -i -e 's:Exec=:Exec=gksu :' "${_ddir}"/gparted.desktop
-		echo 'NotShowIn=KDE;' >> "${_ddir}"/gparted.desktop
+	if use policykit; then
+		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
+		insinto /usr/share/polkit-1/actions/
+		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
+		dobin "${FILESDIR}"/gparted-pkexec
 	else
-		echo 'OnlyShowIn=X-NeverShowThis;' >> "${_ddir}"/gparted.desktop
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop
+			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+		fi
+
+		if use gtk; then
+			sed -i -e 's:Exec=:Exec=gksu :' "${_ddir}"/gparted.desktop
+			echo 'NotShowIn=KDE;' >> "${_ddir}"/gparted.desktop
+		else
+			echo 'OnlyShowIn=X-NeverShowThis;' >> "${_ddir}"/gparted.desktop
+		fi
 	fi
 }