summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gmail.com>2011-07-08 16:54:55 -0400
committerAlexandre Rostovtsev <tetromino@gmail.com>2011-07-08 16:54:55 -0400
commitee6582cd3c3902f08bc1c5c901c97cefac107db2 (patch)
tree84564f39220374cd0bee0432c331e85d491c64df /sys-apps
parentnet-misc/vinagre: 3.0.1 → 3.0.2 (diff)
downloadgnome-ee6582cd3c3902f08bc1c5c901c97cefac107db2.tar.gz
gnome-ee6582cd3c3902f08bc1c5c901c97cefac107db2.tar.bz2
gnome-ee6582cd3c3902f08bc1c5c901c97cefac107db2.zip
sys-apps/gnome-disk-utility: 3.0.0 → 3.0.2
Version bump, now supports DeviceAutomountHint.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/gnome-disk-utility/Manifest16
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild (renamed from sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild)10
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild14
3 files changed, 20 insertions, 20 deletions
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 8cfe6732..dad888c8 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867
-DIST gnome-disk-utility-3.0.0.tar.bz2 2407254 RMD160 b746f26c4d20920bec8bb795a7d04f81a6009abe SHA1 bd28a3228fc9f4ddb08778a4152bc5ebd175697b SHA256 94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb
-EBUILD gnome-disk-utility-3.0.0.ebuild 1920 RMD160 98c92739bc6de04f7cb806b6d505e6f14ee7c93a SHA1 e91f54c7b1cc3f162f39461af7ba925d3ec1401c SHA256 6a44f42e0fad8a893695ea8c83b23ca9ac032e5483d30d0416aabddf45385e76
-EBUILD gnome-disk-utility-9999.ebuild 1793 RMD160 cef46ea93dc278bd056f09f3a687011ed1ace55a SHA1 ff95855ec951f8fc1b9322e75bde17e3d5419992 SHA256 026befc32f6d9481ccfe87e07162dc4226f05a76b599cfe76a47af57be7070d5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2olYkACgkQ1fmVwcYIWAaPawCeJFfrqJLEvPpTwGE0v2rd7kB2
-84UAniRyOyx3XAoLHsDuEFhT6kd88k0o
-=DK0K
------END PGP SIGNATURE-----
+DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5
+EBUILD gnome-disk-utility-3.0.2.ebuild 1977 RMD160 7f9be95eecc235062a530af0fed211b768ac00c5 SHA1 1018238715fb0cc793383f69f2d57f76f2b0a3ef SHA256 ab40b86adc03ada6cb89c7690a0968cc0751b735b2ab2b9c8a445572f773bd75
+EBUILD gnome-disk-utility-9999.ebuild 1977 RMD160 7f9be95eecc235062a530af0fed211b768ac00c5 SHA1 1018238715fb0cc793383f69f2d57f76f2b0a3ef SHA256 ab40b86adc03ada6cb89c7690a0968cc0751b735b2ab2b9c8a445572f773bd75
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
index f3a3a426..10e00ebd 100644
--- 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
@@ -2,7 +2,7 @@
# 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.0.ebuild,v 1.3 2011/01/07 21:04:46 pacho Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -72,6 +72,10 @@ src_prepare() {
# Keep avahi optional, upstream bug #631986
epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"
- intltoolize --force --copy --automake || die
- eautoreconf
+ if [[ ${PV} != 9999 ]]; then
+ intltoolize --force --copy --automake || die
+ eautoreconf
+ fi
+
+ gnome2_src_prepare
}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
index 95b5920e..10e00ebd 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -2,7 +2,7 @@
# 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.0.ebuild,v 1.3 2011/01/07 21:04:46 pacho Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -32,19 +32,20 @@ CDEPEND="
>=dev-libs/libatasmart-0.14
>=x11-libs/libnotify-0.6.1
- >=gnome-base/nautilus-2.24
-
avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
gnome-keyring? ( || (
gnome-base/libgnome-keyring
<gnome-base/gnome-keyring-2.29.4 ) )
+ nautilus? ( >=gnome-base/nautilus-2.91.0 )
"
RDEPEND="${CDEPEND}
+ x11-misc/xdg-utils
fat? ( sys-fs/dosfstools )
!!sys-apps/udisks"
DEPEND="${CDEPEND}
sys-devel/gettext
gnome-base/gnome-common
+ app-text/docbook-xml-dtd:4.1.2
app-text/scrollkeeper
app-text/gnome-doc-utils
@@ -54,7 +55,7 @@ DEPEND="${CDEPEND}
doc? ( >=dev-util/gtk-doc-1.3 )"
-src_prepare() {
+pkg_setup() {
G2CONF="${G2CONF}
--disable-static
$(use_enable avahi avahi-ui)
@@ -62,6 +63,11 @@ src_prepare() {
$(use_enable remote-access)
$(use_enable gnome-keyring)"
DOCS="AUTHORS NEWS README TODO"
+}
+
+src_prepare() {
+ sed -e '/printf/s:nautilus:xdg-open:' \
+ -i src/palimpsest/gdu-section-volumes.c || die "#350919"
# Keep avahi optional, upstream bug #631986
epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"