Version bump. Import patch from upstream bug #582687 in order to resolve realpath for symlinks devices

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 145 insertions, 12 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index a4f01a684e57..0294c2d49019 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/gparted
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.71 2009/08/25 20:10:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.72 2009/10/14 18:11:20 mrpouet Exp $
+
+*gparted-0.4.7 (14 Oct 2009)
+
+  14 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  +gparted-0.4.7.ebuild, +files/gparted-0.4.7-realpath-symlink-device.patch:
+  Version bump. Import patch from upstream bug #582687 in order to resolve
+  realpath for symlinks devices.
 
   25 Aug 2009; Christian Faulhammer <fauli@gentoo.org> gparted-0.4.5.ebuild:
   stable x86, bug 280080
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 6f745101dca1..fe686cee8a80 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gparted-0.4.7-realpath-symlink-device.patch 1571 RMD160 5d73e5c3d5ede9ce59ef6317c4b548ce45d5a805 SHA1 9541d014399e88cbbe183ccd3deb6776cbf53ac1 SHA256 a21316d1a1d944a2adcab4fcc5f4f196f9b76d6a75a9e0fa5c43b3e5f15f5c0e
 DIST gparted-0.4.3.tar.bz2 1052031 RMD160 7b1d076a63e60b56c0fb9e8f2e851e8f981efb21 SHA1 95ed804eeb1e5a4002d065b54bd1ec7cc8bd29e6 SHA256 cf3b482c15217ec42223edf3102c9275f7ddf5332472f12a6f3999fcd98a31c1
 DIST gparted-0.4.5.tar.bz2 1118330 RMD160 b5549783434a43039f30aa88738eb7daccddb44a SHA1 c641394e174b328301918865f6d03c749d79ff3c SHA256 a0a102ee51c1d70fa1c786c77a613111179ce81efccb637bd04aef525199b93f
 DIST gparted-0.4.6.tar.bz2 1187912 RMD160 44544115461825fc4140c83af6f65121edababb5 SHA1 0968a8138eab24734567466ec191f18f60f7d285 SHA256 65a5eec71839ef45ed44c549d1cd24796526b69288f2c30741a16a42bd4a1680
+DIST gparted-0.4.7.tar.bz2 1193961 RMD160 1f620de8e4ca41b04a9a5155b067ae551d256231 SHA1 3a4e8b52f0129af003ea4e23b34b66a5686ea996 SHA256 16347ab3964c77191d71ab34c62e3df4af6593f4da31dee1880c07388615fe2b
 EBUILD gparted-0.4.3.ebuild 2005 RMD160 eb56733746f282856683da28ce0e159af1518edd SHA1 449472cee3491775d2dd422307acec9c79a02562 SHA256 eceb180e05fecad960a2d761f6a38de28a27bf797cb459c234ef846d4608ed67
 EBUILD gparted-0.4.5.ebuild 2114 RMD160 09b7eeac2bc00a47df5595da79dee64e1b88d20e SHA1 4ac4129a6aa8bf9e67830dc3be3bf94e7311f5cb SHA256 a983a7baa5648bcad2408011f5d1c971bc03079f898cf880ea3d8b3f813d5e6f
 EBUILD gparted-0.4.6.ebuild 2186 RMD160 123869de4d3c1784c9354d5bb3d74acd361f2bd1 SHA1 588dd29ef790eda7e11e1edc71e665d18a2fa58d SHA256 1a885b4e1bde80606d82391529d2244e86ee9d91faaa171871caec787871dc44
-MISC ChangeLog 9736 RMD160 48c135ecc971d1b1b81f1e730934063f2aa8ae7b SHA1 515656d16220e86526d93e06d191dafda5553533 SHA256 e322c98a782cec21a452a6879b4ce4a4f74d17b67cfe8e1208cb8419045f7aee
+EBUILD gparted-0.4.7.ebuild 2343 RMD160 d56ada2112b9e1ddb8965336ceac4d6e080995f7 SHA1 2b40c07dd823237e7872b338b716a4f53f8d24d3 SHA256 20960129239f95d172096782a3f87d8ca0dd3f9fe80bf34e97001f0e5bac9047
+MISC ChangeLog 10004 RMD160 301749de9162ae2d963cb32becc35aa78a1a46a7 SHA1 b1076f2a99d13f8265717b575ebde742b3276db9 SHA256 a5663ba4a5befce5baf5ad41be5b1ddc7c7f94e4cb889022e99f374b88e706a9
 MISC metadata.xml 1333 RMD160 0ac35a9787e19668de42ac805ace8e05d7875f6a SHA1 f7e9b8815b4249cca0a707cbe494e3bdbf2194a1 SHA256 40ac4932e46d02fda4c059d8c1789e241a2ff8da668c5a68925128b44924161b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqURTwACgkQNQqtfCuFneM7ggCffQksqgqhgqo0Emfz0LE0LpOd
-NLIAn0nPNY9aTHS5K0aYdKLEtqHKyDby
-=mkYP
------END PGP SIGNATURE-----
diff --git a/sys-block/gparted/files/gparted-0.4.7-realpath-symlink-device.patch b/sys-block/gparted/files/gparted-0.4.7-realpath-symlink-device.patch
new file mode 100644
index 000000000000..dcbaa2964925
--- /dev/null
+++ b/sys-block/gparted/files/gparted-0.4.7-realpath-symlink-device.patch
@@ -0,0 +1,45 @@
+From 5f6301d1b05bb51a7604a350dea52fb6580fdfaa Mon Sep 17 00:00:00 2001
+From: Curtis Gedak <gedakc@gmail.com>
+Date: Tue, 13 Oct 2009 23:45:04 +0000
+Subject: Rework logic to resolve real path for symbolic link devices (#582687)
+
+---
+diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
+index e07fa74..a47f7cc 100644
+--- a/src/GParted_Core.cc
++++ b/src/GParted_Core.cc
+@@ -660,19 +660,21 @@ void GParted_Core::read_mountpoints_from_file(
+ 			mountpoint = Utils::regexp_label( line, "^/[^ \t]+[ \t]+([^ \t]+)" ) ;
+ 			if ( mountpoint .length() > 0 && node .length() > 0 )
+ 			{
+-				//If node is a symbolic link (e.g., /dev/root), then find real path
+-				if ( file_test( node, Glib::FILE_TEST_IS_SYMLINK ) )
+-				{
+-					char c_str[4096+1] ;
+-					Glib::ustring tmp_node = node ;
+-					//FIXME: it seems realpath is very unsafe to use (manpage)...
+-					realpath( tmp_node .c_str(), c_str ) ;
+-					if ( tmp_node .length() > 0 )
+-						node = tmp_node ;
+-				}
+-				//only add this path if it exists
++				//Only add node path(s) if mount point exists
+ 				if ( file_test( mountpoint, Glib::FILE_TEST_EXISTS ) )
++				{
+ 					map[ node ] .push_back( mountpoint ) ;
++
++					//If node is a symbolic link (e.g., /dev/root)
++					//  then find real path and add entry
++					if ( file_test( node, Glib::FILE_TEST_IS_SYMLINK ) )
++					{
++						char c_str[4096+1] ;
++						//FIXME: it seems realpath is very unsafe to use (manpage)...
++						if ( realpath( node .c_str(), c_str ) != NULL )
++							map[ c_str ] .push_back( mountpoint ) ;
++					}
++				}
+ 			}
+ 		}
+ 
+--
+cgit v0.8.2
diff --git a/sys-block/gparted/gparted-0.4.7.ebuild b/sys-block/gparted/gparted-0.4.7.ebuild
new file mode 100644
index 000000000000..b275faba6a2c
--- /dev/null
+++ b/sys-block/gparted/gparted-0.4.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.4.7.ebuild,v 1.1 2009/10/14 18:11:20 mrpouet Exp $
+
+EAPI="1"
+GCONF_DEBUG="no"
+
+inherit eutils 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 ~ppc ~x86"
+IUSE="dmraid 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 ) )
+
+	>=sys-fs/e2fsprogs-1.41.0
+	dmraid? ( || (
+			>=sys-fs/lvm2-2.02.45
+			sys-fs/device-mapper )
+		sys-fs/dmraid
+		sys-fs/multipath-tools )
+	fat? ( sys-fs/dosfstools )
+	ntfs? ( sys-fs/ntfsprogs )
+	hfs? (
+		sys-fs/udev
+		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
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2"
+
+DOCS="AUTHORS NEWS ChangeLog README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Revert upstream changes to use gksu inconditionally
+	sed "s:Exec=@gksuprog@ :Exec=:" \
+		-i gparted.desktop.in.in || die "sed 1 failed"
+	# Resolve real path for symbolic link devices,
+	# patch import related to upstream bug #582687
+	epatch "${FILESDIR}"/${P}-realpath-symlink-device.patch
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-doc
+		--disable-scrollkeeper
+		GKSUPROG=$(type -P true)"
+}
+
+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
+}