Bump to 0.3.9, enhance copy/move partition, bug fixes and translation/documentation updates. Clean up old revisions.

(Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 26 insertions, 88 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index 582da032faef..54b57eac7217 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,14 @@
 # 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.55 2008/09/13 10:32:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.56 2008/10/30 21:19:42 eva Exp $
+
+*gparted-0.3.9 (30 Oct 2008)
+
+  30 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gparted-0.3.7-hal-lock.patch, -gparted-0.3.5.ebuild,
+  -gparted-0.3.7-r1.ebuild, +gparted-0.3.9.ebuild:
+  Bump to 0.3.9, enhance copy/move partition, bug fixes and
+  translation/documentation updates. Clean up old revisions.
 
   13 Sep 2008; nixnut <nixnut@gentoo.org> gparted-0.3.8.ebuild:
   Stable on ppc wrt bug 236960
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
deleted file mode 100644
index 84d73c049c01..000000000000
--- a/sys-block/gparted/files/gparted-0.3.7-hal-lock.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- /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.5.ebuild b/sys-block/gparted/gparted-0.3.5.ebuild
deleted file mode 100644
index db68637fef2a..000000000000
--- a/sys-block/gparted/gparted-0.3.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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.5.ebuild,v 1.5 2008/04/19 22:49: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 hfs jfs ntfs reiserfs reiser4 xfs"
-
-common_depends=">=sys-apps/parted-1.7.1
-		>=dev-cpp/gtkmm-2.8.0"
-
-RDEPEND="${common_depends}
-		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.29"
diff --git a/sys-block/gparted/gparted-0.3.7-r1.ebuild b/sys-block/gparted/gparted-0.3.9.ebuild
index 84d56b6098fe..791559370460 100644
--- a/sys-block/gparted/gparted-0.3.7-r1.ebuild
+++ b/sys-block/gparted/gparted-0.3.9.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.9.ebuild,v 1.1 2008/10/30 21:19:42 eva Exp $
 
 inherit eutils gnome2
 
 DESCRIPTION="Gnome Partition Editor"
 HOMEPAGE="http://gparted.sourceforge.net/"
 
-SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +23,9 @@ RDEPEND="${common_depends}
 		kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 		fat? ( sys-fs/dosfstools )
 		ntfs? ( sys-fs/ntfsprogs )
-		hfs? ( sys-fs/hfsutils )
+		hfs? (
+			sys-fs/udev
+			sys-fs/hfsutils )
 		jfs? ( sys-fs/jfsutils )
 		reiserfs? ( sys-fs/reiserfsprogs )
 		reiser4? ( sys-fs/reiser4progs )
@@ -31,13 +33,22 @@ RDEPEND="${common_depends}
 
 DEPEND="${common_depends}
 		>=dev-util/pkgconfig-0.12
-		>=dev-util/intltool-0.35.5"
+		>=dev-util/intltool-0.35.5
+		app-text/scrollkeeper
+		app-text/gnome-doc-utils"
+
+DOCS="AUTHORS NEWS ChangeLog README"
 
 src_unpack() {
 	gnome2_src_unpack
 
-	# HAL is not necessary, bug #220459
-	epatch "${FILESDIR}/${P}-hal-lock.patch"
+	# Revert upstream changes to use gksu inconditionally
+	sed "s:Exec=@gksuprog@ :Exec=:" \
+		-i gparted.desktop.in.in || die "sed 1 failed"
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper GKSUPROG=/bin/true"
 }
 
 src_install() {