Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: sys-apps/gnome-disk-utility/
Date: Fri, 08 Jul 2011 20:59:34
Message-Id: 50c0edda1671eae1f1e01330233701ffcf0cdce0.tetromino@gentoo
1 commit: 50c0edda1671eae1f1e01330233701ffcf0cdce0
2 Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
3 AuthorDate: Fri Jul 8 20:54:55 2011 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Fri Jul 8 20:57:26 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=50c0edda
7
8 sys-apps/gnome-disk-utility: 3.0.0 → 3.0.2
9
10 Version bump, now supports DeviceAutomountHint.
11 (Note: at the moment, there is no 3.1.x version of gnome-disk-utility).
12
13 ---
14 ....0.0.ebuild => gnome-disk-utility-3.0.2.ebuild} | 10 +++++++---
15 .../gnome-disk-utility-9999.ebuild | 14 ++++++++++----
16 2 files changed, 17 insertions(+), 7 deletions(-)
17
18 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
19 similarity index 93%
20 rename from sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
21 rename to sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
22 index f3a3a42..10e00eb 100644
23 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
24 +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
25 @@ -2,7 +2,7 @@
26 # Distributed under the terms of the GNU General Public License v2
27 # $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild,v 1.3 2011/01/07 21:04:46 pacho Exp $
28
29 -EAPI="3"
30 +EAPI="4"
31 GCONF_DEBUG="no"
32 GNOME2_LA_PUNT="yes"
33
34 @@ -72,6 +72,10 @@ src_prepare() {
35 # Keep avahi optional, upstream bug #631986
36 epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"
37
38 - intltoolize --force --copy --automake || die
39 - eautoreconf
40 + if [[ ${PV} != 9999 ]]; then
41 + intltoolize --force --copy --automake || die
42 + eautoreconf
43 + fi
44 +
45 + gnome2_src_prepare
46 }
47
48 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
49 index 95b5920..10e00eb 100644
50 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
51 +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
52 @@ -2,7 +2,7 @@
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild,v 1.3 2011/01/07 21:04:46 pacho Exp $
55
56 -EAPI="3"
57 +EAPI="4"
58 GCONF_DEBUG="no"
59 GNOME2_LA_PUNT="yes"
60
61 @@ -32,19 +32,20 @@ CDEPEND="
62 >=dev-libs/libatasmart-0.14
63 >=x11-libs/libnotify-0.6.1
64
65 - >=gnome-base/nautilus-2.24
66 -
67 avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
68 gnome-keyring? ( || (
69 gnome-base/libgnome-keyring
70 <gnome-base/gnome-keyring-2.29.4 ) )
71 + nautilus? ( >=gnome-base/nautilus-2.91.0 )
72 "
73 RDEPEND="${CDEPEND}
74 + x11-misc/xdg-utils
75 fat? ( sys-fs/dosfstools )
76 !!sys-apps/udisks"
77 DEPEND="${CDEPEND}
78 sys-devel/gettext
79 gnome-base/gnome-common
80 + app-text/docbook-xml-dtd:4.1.2
81 app-text/scrollkeeper
82 app-text/gnome-doc-utils
83
84 @@ -54,7 +55,7 @@ DEPEND="${CDEPEND}
85
86 doc? ( >=dev-util/gtk-doc-1.3 )"
87
88 -src_prepare() {
89 +pkg_setup() {
90 G2CONF="${G2CONF}
91 --disable-static
92 $(use_enable avahi avahi-ui)
93 @@ -62,6 +63,11 @@ src_prepare() {
94 $(use_enable remote-access)
95 $(use_enable gnome-keyring)"
96 DOCS="AUTHORS NEWS README TODO"
97 +}
98 +
99 +src_prepare() {
100 + sed -e '/printf/s:nautilus:xdg-open:' \
101 + -i src/palimpsest/gdu-section-volumes.c || die "#350919"
102
103 # Keep avahi optional, upstream bug #631986
104 epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"