do not fail in absence of hal, bug #220459. more su helper sweetness, bug #220383.

Package-Manager: portage-2.1.5.4

4 files changed, 124 insertions, 5 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index 18ff692f6d87..5fb85905d374 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/gparted
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.48 2008/05/04 11:43:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.49 2008/06/15 18:54:28 eva Exp $
+
+*gparted-0.3.7-r1 (15 Jun 2008)
+
+  15 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gparted-0.3.7-hal-lock.patch, +gparted-0.3.7-r1.ebuild:
+  do not fail in absence of hal, bug #220459. 
+  more su helper sweetness, bug #220383.
 
 *gparted-0.3.7 (04 May 2008)
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index dbf2cc3ce8b9..dd8a2021c14f 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gparted-0.3.7-hal-lock.patch 1997 RMD160 8a82de631af63e14111a60317ae9ea324e3661ee SHA1 33a09a844cec094527fa759a1065449c69c1f7af SHA256 9c0554e6537c113fd29d3f1ab6747d2d095271ee681d5a5d68c6c29e81ce5a57
 DIST gparted-0.3.5.tar.bz2 542057 RMD160 6225dd27577f380fa20a7ed9b20ee2cb95dd3d00 SHA1 e547c1e531185bfda00a230cc76d3ebc50a957a0 SHA256 687544546b3dd5fe84f4a1da00d6fe4e495f490c65c6ae0b08fda8741eb9ea81
 DIST gparted-0.3.6.tar.gz 806489 RMD160 da708a2714bef70de4c73ee174e374e84835fd61 SHA1 5785cb1f96af4b09e54f27d31a59fb729b0975f0 SHA256 adce845aa9c57eeaf3f1ce624b632d61cca6a54dd1d21330cb4ccaac2ee56623
 DIST gparted-0.3.7.tar.bz2 567246 RMD160 75a6a3addcee52fe0db5e4d4a4adb77be986aba8 SHA1 db30a98e315c5ce63b16cbe29c4431126b8e7c25 SHA256 e57a53893eccb63569e48a387ee06aa2e22fad8dc6cc61d86ca4bed1559c34f9
 EBUILD gparted-0.3.5.ebuild 881 RMD160 4f24fdfd02f0a4adc94171b786e1daf45e943a97 SHA1 f895f6562b21106ac5ae1d502e429147e2959b92 SHA256 e83595e8126f051f6553bd13ee485b543c1429d5eb25c2e74ff1a5a566c75a78
 EBUILD gparted-0.3.6.ebuild 883 RMD160 41fd79114f809e778ceeebf0042a2265ce9172dd SHA1 b7f6947428682ba648ac7c7402250f12313a62c5 SHA256 0cef2db5fc33d4f137de6cbbbfedd843926d44ee016cb2cc6a3db0346793f4db
+EBUILD gparted-0.3.7-r1.ebuild 1740 RMD160 af046ecaa922a26c8462e3f118916302af88801a SHA1 bddeb0851b687c21095934e610cb1d5f6f7b5521 SHA256 900f2a9597d126390b2fa2f3105083323a93b51aca846204ef476fb954e15716
 EBUILD gparted-0.3.7.ebuild 992 RMD160 b719a6ee15eac98af5f16f8e5899d07d44d2cc36 SHA1 e5a85782c7a29252baa8bde41cc182c66790e705 SHA256 c7af2d097e8c0e452668d28caa437ea0e1b7047bbf275b94f826aca0b73c5756
-MISC ChangeLog 6172 RMD160 f2bdd2b35738057a3a4de43e782ee7f3125b0f98 SHA1 3a2ba6ab8910be8d3cbff16600aed215e04e9a67 SHA256 5249175d777d64024a80c0db742308d84e1afce520cc289c23b03724c613f121
+MISC ChangeLog 6413 RMD160 38d15ba232a832470280573555d137c914881d52 SHA1 3c88e6e1b79816b18a1fb421f3c8ba02b454a337 SHA256 f018d12db27adf084d1e235aa0c53bf367bb2ffdca5c07b82d12a35ec8036ebb
 MISC metadata.xml 560 RMD160 b7d9a8f3213c3ce60259e333afbea650474668de SHA1 49a64746aae894ea919373fb6c750bae01b0e8a9 SHA256 bbf06ffa4fea8b4d0e9da7384d4f89ec05c31c221b1cfcb2442e6ebf2fa3657c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgdoWcACgkQ1fmVwcYIWAZ/uACgn10aXr4zk0eMF9jTvJ1Yqfvm
-E4wAoOawjFMsoO2AAy6lM5pZMoRj8At7
-=TXTb
+iEYEARECAAYFAkhVZWoACgkQ1fmVwcYIWAZtqgCeIwM8DPekFYVvYg5R6d3ArXr9
+5LUAoMX2cGeKUX4HORVU2D/3FUUbg5Ta
+=pbk9
 -----END PGP SIGNATURE-----
diff --git a/sys-block/gparted/files/gparted-0.3.7-hal-lock.patch b/sys-block/gparted/files/gparted-0.3.7-hal-lock.patch
new file mode 100644
index 000000000000..84d73c049c01
--- /dev/null
+++ b/sys-block/gparted/files/gparted-0.3.7-hal-lock.patch
@@ -0,0 +1,50 @@
+--- /var/tmp/portage/sys-block/gparted-0.3.7/work/gparted-0.3.7/gparted.in	2008-04-29 16:17:29.000000000 +0200
++++ gparted.in	2008-06-15 19:21:32.000000000 +0200
+@@ -1,23 +1,35 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+-#  Purpose:  Acquire device locks prior to running gparted.
++#  Purpose:  Perform appropriate startup of GParted executable gpartedbin.
++#
++#            On systems with hal-lock, use hal-lock to acquire device
++#            locks prior to running gpartedbin.
+ #            This is to prevent devices from being automounted.
+ #            File system problems can occur if devices are mounted
+ #            prior to the completion of GParted's operations.
+ #            See GParted bug #324220
+ #            http://bugzilla.gnome.org/show_bug.cgi?id=324220
+ #
++#            On systems without hal-lock, invoke gpartedbin directly.
+ #
+-#  Following is a quote from HAL 0.5.10 Specification.
+-#  http://people.freedesktop.org/~david/hal-spec/hal-spec.html#locking-guidelines
++
+ #
+-#  In order to prevent HAL-based automounters from mounting partitions
+-#  that are being prepared, applications that access block devices
+-#  directly (and pokes the kernel to reload the partitioning table)
+-#  should lock out automounters by either a) obtaining the
+-#  org.freedesktop.Hal.Device.Storage lock on each drive being processed;
+-#  or b) obtaining the global org.freedesktop.Hal.Device.Storage lock.
++#  Search PATH to determine if hal-lock program can be found
+ #
++HAVE_HAL_LOCK=no
++for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
++	if test -x "$k/hal-lock"; then
++		HAVE_HAL_LOCK=yes
++		break
++	fi
++done
+ 
+-hal-lock --interface org.freedeskdesktop.Hal.Device.Storage --exclusive \
+-	--run @installdir@/gpartedbin $*
++#
++#  Use hal-lock for invocation if it exists, otherwise simply run gpartedbin
++#
++if test "x$HAVE_HAL_LOCK" = "xyes"; then
++	hal-lock --interface org.freedeskdesktop.Hal.Device.Storage --exclusive \
++		--run "@installdir@/gpartedbin $*"
++else
++	@installdir@/gpartedbin $*
++fi
diff --git a/sys-block/gparted/gparted-0.3.7-r1.ebuild b/sys-block/gparted/gparted-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..84d56b6098fe
--- /dev/null
+++ b/sys-block/gparted/gparted-0.3.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.7-r1.ebuild,v 1.1 2008/06/15 18:54:28 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="http://gparted.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="fat gnome hfs jfs kde ntfs reiserfs reiser4 xfs xfce"
+
+common_depends=">=sys-apps/parted-1.7.1
+		>=dev-cpp/gtkmm-2.8.0"
+
+RDEPEND="${common_depends}
+		gnome? ( x11-libs/gksu )
+		xfce? ( x11-libs/gksu )
+		kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
+		fat? ( sys-fs/dosfstools )
+		ntfs? ( sys-fs/ntfsprogs )
+		hfs? ( sys-fs/hfsutils )
+		jfs? ( sys-fs/jfsutils )
+		reiserfs? ( sys-fs/reiserfsprogs )
+		reiser4? ( sys-fs/reiser4progs )
+		xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
+
+DEPEND="${common_depends}
+		>=dev-util/pkgconfig-0.12
+		>=dev-util/intltool-0.35.5"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# HAL is not necessary, bug #220459
+	epatch "${FILESDIR}/${P}-hal-lock.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use kde; then
+		cp "${D}"/usr/share/applications/gparted.desktop \
+			"${D}"/usr/share/applications/gparted-kde.desktop
+
+		sed -i "s:Exec=:Exec=kdesu :" "${D}"/usr/share/applications/gparted-kde.desktop
+		echo "OnlyShowIn=KDE;" >> "${D}"/usr/share/applications/gparted-kde.desktop
+	fi
+
+	if use gnome || use xfce; then
+		sed -i "s:Exec=:Exec=gksu :" "${D}"/usr/share/applications/gparted.desktop
+		echo "OnlyShowIn=GNOME;XFCE;" >> "${D}"/usr/share/applications/gparted.desktop
+	else
+		echo "OnlyShowIn=X-NeverShowThis;" >> "${D}"/usr/share/applications/gparted.desktop
+	fi
+}