summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-01-31 18:53:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-01-31 18:53:53 +0000
commit5297130ea5e42283f7e30b36ba8708c3657d2bf3 (patch)
treeb5d0ef4f367f12e2b4c982e741c76174fdec8711 /sys-apps/gnome-disk-utility
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-5297130ea5e42283f7e30b36ba8708c3657d2bf3.tar.gz
gentoo-2-5297130ea5e42283f7e30b36ba8708c3657d2bf3.tar.bz2
gentoo-2-5297130ea5e42283f7e30b36ba8708c3657d2bf3.zip
Fix regression introduced by moving unsynced 2.32.1 from overlay to tree.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/gnome-disk-utility')
-rw-r--r--sys-apps/gnome-disk-utility/ChangeLog6
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild13
2 files changed, 13 insertions, 6 deletions
diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 31fee2e52771..15c01253ef09 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/gnome-disk-utility
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.31 2011/01/31 09:47:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.32 2011/01/31 18:53:53 ssuominen Exp $
+
+ 31 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-disk-utility-2.32.1.ebuild:
+ Fix regression introduced by moving unsynced 2.32.1 from overlay to tree.
*gnome-disk-utility-2.32.1 (31 Jan 2011)
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
index e981f2570b2c..14c575caab5c 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.1 2011/01/31 09:47:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.2 2011/01/31 18:53:53 ssuominen Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
inherit autotools eutils gnome2
DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
+HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -23,15 +23,14 @@ CDEPEND="
=sys-fs/udisks-1.0*[remote-access?]
>=dev-libs/libatasmart-0.14
>=x11-libs/libnotify-0.6.1
-
- >=gnome-base/nautilus-2.24
-
avahi? ( >=net-dns/avahi-0.6.25[gtk] )
gnome-keyring? ( || (
gnome-base/libgnome-keyring
<gnome-base/gnome-keyring-2.29.4 ) )
+ nautilus? ( >=gnome-base/nautilus-2.24 )
"
RDEPEND="${CDEPEND}
+ x11-misc/xdg-utils
fat? ( sys-fs/dosfstools )
!!sys-apps/udisks"
DEPEND="${CDEPEND}
@@ -57,6 +56,10 @@ pkg_setup() {
}
src_prepare() {
+ sed -i \
+ -e '/printf/s:nautilus:xdg-open:' \
+ src/palimpsest/gdu-section-volumes.c || die #350919
+
# Keep avahi optional, upstream bug #631986
epatch "${FILESDIR}/${PN}-2.30.1-optional-avahi.patch"