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