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

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 65 insertions, 111 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/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
 }