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
commit1e329fc93523ac4ff9ac27351125b52d98f6bffd (patch)
tree293a1db1f082d87615cf827b1753601bbe4de719 /sys-apps
parentAutomated update of use.local.desc (diff)
downloadhistorical-1e329fc93523ac4ff9ac27351125b52d98f6bffd.tar.gz
historical-1e329fc93523ac4ff9ac27351125b52d98f6bffd.tar.bz2
historical-1e329fc93523ac4ff9ac27351125b52d98f6bffd.zip
Fix regression introduced by moving unsynced 2.32.1 from overlay to tree.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/gnome-disk-utility/ChangeLog6
-rw-r--r--sys-apps/gnome-disk-utility/Manifest4
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild13
3 files changed, 15 insertions, 8 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/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 7bf677392b5b..5740d32481b5 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -6,6 +6,6 @@ DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba68
EBUILD gnome-disk-utility-2.30.1.ebuild 1831 RMD160 9ac362c8329dad2981e28b757680e76374855008 SHA1 9270d7f1aec26c5c3b91efaaaa389a923dce84f5 SHA256 884a8f89b7406e916259de237a0ca8b63dd57d0eb168fb61b7cb7ca4a7ec36a2
EBUILD gnome-disk-utility-2.32.0-r1.ebuild 1926 RMD160 a0b036d0922d2f1de33c0083b59889efa7872a84 SHA1 746b26572f1ea3f2eb082a9b0a0158d9546a699a SHA256 42540be36e21a8688c399fe2ac2c78de82ef2265c11a23692fea0aeeb82a58cb
EBUILD gnome-disk-utility-2.32.0.ebuild 1800 RMD160 476f5521c7f6f99fb329facc9ae0ebdecb75ad98 SHA1 e7972e8f19c218228c9a644a7bf8c8e1081420a1 SHA256 bb650be7affcc22346dff4a44ceac3f1a85b10fea83dc2fc02a582993173c306
-EBUILD gnome-disk-utility-2.32.1.ebuild 1731 RMD160 b66eb4d930fa718551aabe2ea0b4c14355b84642 SHA1 26a45339739be483bc7e12c3ce494b4310639808 SHA256 6c143a050bca8dd4db98f0af8ae217844e25da8b0f36ac61553b6b9147c080cd
-MISC ChangeLog 5284 RMD160 b82b7bda710ddeb7ca5bfdb39303282b18b4e579 SHA1 398966f0fae757df3f36f7ef07d72c099c9433da SHA256 63ef56d4925d18528ca58959f37a6ffe9482df124761f46c6564cbcb3a62385c
+EBUILD gnome-disk-utility-2.32.1.ebuild 1866 RMD160 d2ec9682bf1c52165adbbabe4b71b32fa63a216a SHA1 825214ab14df0eee4d08ff2d601eacbe66c243f7 SHA256 b9390d9e1f772630171fef0bc702edb57363107cf69a36237223d3cdc72e9842
+MISC ChangeLog 5452 RMD160 c04bb0fe12278ecbd8eef8ad4c82901814cb07c7 SHA1 7f79e9ced4496a28bc43787749d6be15720d028f SHA256 ca981bfff39ce7fe6de1d926bf82093e335d93a0be64aaa7f33b24a13869f18e
MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
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"