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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

5 files changed, 39 insertions, 94 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/Manifest b/sys-block/gparted/Manifest
index 496b1eaa28ca..46899c3e0e23 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,9 +1,16 @@
-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.7.tar.bz2 567246 RMD160 75a6a3addcee52fe0db5e4d4a4adb77be986aba8 SHA1 db30a98e315c5ce63b16cbe29c4431126b8e7c25 SHA256 e57a53893eccb63569e48a387ee06aa2e22fad8dc6cc61d86ca4bed1559c34f9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gparted-0.3.8.tar.bz2 569925 RMD160 ceb2ddeccf3feb92fab31c5140c2185d7084da02 SHA1 2146f5106535d650bed25eca5b299f30b9ef03b7 SHA256 c6f1b0090805476bf3866c22113cb53d3153511256f4fd0d479033057204a1ee
-EBUILD gparted-0.3.5.ebuild 881 RMD160 4f24fdfd02f0a4adc94171b786e1daf45e943a97 SHA1 f895f6562b21106ac5ae1d502e429147e2959b92 SHA256 e83595e8126f051f6553bd13ee485b543c1429d5eb25c2e74ff1a5a566c75a78
-EBUILD gparted-0.3.7-r1.ebuild 1740 RMD160 af046ecaa922a26c8462e3f118916302af88801a SHA1 bddeb0851b687c21095934e610cb1d5f6f7b5521 SHA256 900f2a9597d126390b2fa2f3105083323a93b51aca846204ef476fb954e15716
+DIST gparted-0.3.9.tar.bz2 606873 RMD160 496127a097f45a5e9e97bcdb71712eec95f8b7b6 SHA1 eeb31f3d75547b2d310f324d0132b1bb530c8611 SHA256 75d77b7c2fe13fd3c137eb701bdf5090ee3040aaee3959dca750a640dd1ed6c6
 EBUILD gparted-0.3.8.ebuild 1618 RMD160 b9be5465dd39120eb03989ec083526bdd6ec7849 SHA1 3d8e6c35d3a8b66068c3d3319e8861dd720e3f8f SHA256 c78b288df8f3a292e957b073561b9100f3a9bd490f19d76ef2e3151b02f166af
-MISC ChangeLog 7214 RMD160 2173691143314f1d811d5056b5a41235fb05f913 SHA1 285d3d1bab6e89da6e1fff412517c1f81c47f853 SHA256 7052f22e4b39622a1b501ab6b1bb8a3c363bea4a7c5b238fd5215ea5934a9506
+EBUILD gparted-0.3.9.ebuild 1981 RMD160 0f8e120d9e6296ec603a9c36d505e6cfa4cd1378 SHA1 5afcef7c2971e9186351dc8d4a793a954ec63f6b SHA256 712ab6ddf40330e1213e727d5ff828c485e6f25bed3f36ade12d9aa8a1c1e0f6
+MISC ChangeLog 7530 RMD160 76bf39a8b1482846a1dbe0847eb9ebbbaf7631cf SHA1 09692dbe589e2256373261b91d83525fbff4c336 SHA256 ebf8919d5eff36d05109e421023b736adbc2b62d28e8949fed5b1bd8c5fcd1cd
 MISC metadata.xml 1236 RMD160 4fa652096eac019daf60300f4c18e16a17bddfa6 SHA1 d0bcb8f52773329f3df06f128496aefdd2d776c3 SHA256 8953d4b9618f1460d4dd64035290501b567cb6e2be603fc5b8c1aa3ce9230388
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkKJQgACgkQ1fmVwcYIWAbtMQCePrSKrXoufVdRi/e0yySYVQVN
+LtEAoOUDGi3aRySXavXkbYBPuW+pmO37
+=AYls
+-----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
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() {