summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2012-12-24 16:26:33 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2012-12-24 16:26:33 +0000
commitd282bd235842d7f6d2596ec07e84c9ee01358b3e (patch)
tree391458e4cf8d4f7b9ddd88a658e5653cee77d499 /sys-apps
parentClean up (bug #444181). (diff)
downloadgentoo-2-d282bd235842d7f6d2596ec07e84c9ee01358b3e.tar.gz
gentoo-2-d282bd235842d7f6d2596ec07e84c9ee01358b3e.tar.bz2
gentoo-2-d282bd235842d7f6d2596ec07e84c9ee01358b3e.zip
Version bump for Gnome 3.6. Clean up old revisions.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/gnome-disk-utility/ChangeLog13
-rw-r--r--sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch92
-rw-r--r--sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch75
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild71
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild76
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild72
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild (renamed from sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.0.ebuild)29
-rw-r--r--sys-apps/gnome-disk-utility/metadata.xml4
8 files changed, 33 insertions, 399 deletions
diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index cf03bebe4d5a..bf29a4cc9fc3 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for sys-apps/gnome-disk-utility
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.75 2012/10/28 16:32:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.76 2012/12/24 16:26:33 eva Exp $
+
+*gnome-disk-utility-3.6.1 (24 Dec 2012)
+
+ 24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+ -files/gnome-disk-utility-2.30.1-optional-avahi.patch,
+ -gnome-disk-utility-2.32.1.ebuild,
+ -files/gnome-disk-utility-2.91.6-optional-avahi.patch,
+ -gnome-disk-utility-3.0.2-r200.ebuild, -gnome-disk-utility-3.0.2-r300.ebuild,
+ -gnome-disk-utility-3.4.0.ebuild, +gnome-disk-utility-3.6.1.ebuild,
+ metadata.xml:
+ Version bump for Gnome 3.6. Clean up old revisions.
28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
gnome-disk-utility-3.0.2-r201.ebuild:
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
deleted file mode 100644
index 65c4726ada0d..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 674d9284bd09a9378f99ff19b2d2ffb8032ce8ea Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
-Date: Tue, 16 Mar 2010 10:58:55 +0530
-Subject: [PATCH] Make avahi support build-time configureable
-
----
- configure.ac | 21 ++++++++++++++++++++-
- src/gdu-gtk/gdu-connect-to-server-dialog.c | 7 +++++++
- 2 files changed, 27 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 01be5f0..95f2087 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
- PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
- PKG_CHECK_MODULES(X11, [x11])
- PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
--PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
-+
-+# *************
-+# Avahi
-+# *************
-+
-+have_avahi_ui=no
-+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi], [disable use of Avahi for server searching]))
-+
-+if test "x$enable_avahi" != "xno"; then
-+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED,
-+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui is available])
-+ have_avahi_ui=yes], have_avahi_ui=no)
-+ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then
-+ AC_MSG_ERROR([avahi-ui support requested but libraries not found])
-+ fi
-+fi
-+
-+AC_SUBST(AVAHI_UI_LIBS)
-+AC_SUBST(AVAHI_UI_CFLAGS)
-+AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"])
-
- # *************
- # Remote Access
-diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c
-index 9ecf08c..5ad47bb 100644
---- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
-+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
-@@ -24,7 +24,10 @@
-
- #include "config.h"
- #include <glib/gi18n-lib.h>
-+
-+#ifdef HAVE_AVAHI_UI
- #include <avahi-ui/avahi-ui.h>
-+#endif
-
- #include "gdu-connect-to-server-dialog.h"
-
-@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog)
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-+#ifdef HAVE_AVAHI_UI
- static void
- on_dns_sd_clicked (GtkButton *button,
- gpointer user_data)
-@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button,
-
- gtk_widget_destroy (service_dialog);
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
- GTK_STOCK_CONNECT,
- GTK_RESPONSE_OK);
-
-+#ifdef HAVE_AVAHI_UI
- button = gtk_button_new_with_mnemonic (_("_Browse..."));
- image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (button), image);
-@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
- "clicked",
- G_CALLBACK (on_dns_sd_clicked),
- dialog);
-+#endif
-
- content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
---
-1.6.4.4
-
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
deleted file mode 100644
index b9080ea06ae0..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
- PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
- PKG_CHECK_MODULES(X11, [x11])
- PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
--PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
-+
-+# *************
-+# Avahi
-+# *************
-+
-+have_avahi_ui=no
-+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching]))
-+
-+if test "x$enable_avahi_ui" != "xno"; then
-+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED,
-+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 is available])
-+ have_avahi_ui=yes], have_avahi_ui=no)
-+ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then
-+ AC_MSG_ERROR([avahi-ui-gtk3 support requested but libraries not found])
-+ fi
-+fi
-+
-+AC_SUBST(AVAHI_UI_LIBS)
-+AC_SUBST(AVAHI_UI_CFLAGS)
-+AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"])
-
- # *************
- # Remote Access
---- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
-+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
-@@ -24,7 +24,10 @@
-
- #include "config.h"
- #include <glib/gi18n-lib.h>
-+
-+#ifdef HAVE_AVAHI_UI
- #include <avahi-ui/avahi-ui.h>
-+#endif
-
- #include "gdu-connect-to-server-dialog.h"
-
-@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog)
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-+#ifdef HAVE_AVAHI_UI
- static void
- on_dns_sd_clicked (GtkButton *button,
- gpointer user_data)
-@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button,
-
- gtk_widget_destroy (service_dialog);
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
- GTK_STOCK_CONNECT,
- GTK_RESPONSE_OK);
-
-+#ifdef HAVE_AVAHI_UI
- button = gtk_button_new_with_mnemonic (_("_Browse..."));
- image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (button), image);
-@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
- "clicked",
- G_CALLBACK (on_dns_sd_clicked),
- dialog);
-+#endif
-
- content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
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
deleted file mode 100644
index 7558878981eb..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 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.15 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
-IUSE="avahi doc fat gnome-keyring nautilus remote-access"
-
-CDEPEND="
- >=dev-libs/glib-2.22:2
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/libunique-1:1
- >=x11-libs/gtk+-2.20:2
- =sys-fs/udisks-1.0*:0[remote-access?]
- >=dev-libs/libatasmart-0.14
- >=x11-libs/libnotify-0.6.1
- avahi? ( >=net-dns/avahi-0.6.25[gtk] )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- nautilus? ( >=gnome-base/nautilus-2.24 )
-"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils
- fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- gnome-base/gnome-common
- app-text/docbook-xml-dtd:4.1.2
- app-text/rarian
- app-text/gnome-doc-utils
-
- virtual/pkgconfig
- >=dev-util/intltool-0.35
- >=dev-util/gtk-doc-am-1.13
-
- doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- $(use_enable avahi avahi-ui)
- $(use_enable nautilus)
- $(use_enable remote-access)
- $(use_enable gnome-keyring)"
- DOCS="AUTHORS NEWS README TODO"
-}
-
-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"
-
- intltoolize --force --copy --automake || die
- eautoreconf
-}
-
-src_install() {
- gnome2_src_install
- find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
deleted file mode 100644
index 0a75f7b8e355..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 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-3.0.2-r200.ebuild,v 1.11 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="avahi doc fat gnome-keyring nautilus remote-access"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
-
-CDEPEND="
- >=dev-libs/glib-2.22:2
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/libunique-2.90.1:3
- >=x11-libs/gtk+-2.90.7:3
- =sys-fs/udisks-1.0*:0[remote-access?]
- >=dev-libs/libatasmart-0.14
- >=x11-libs/libnotify-0.6.1
-
- avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- nautilus? ( >=gnome-base/nautilus-2.24.0 )
-"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils
- fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- gnome-base/gnome-common
- app-text/docbook-xml-dtd:4.1.2
- app-text/rarian
- app-text/gnome-doc-utils
-
- virtual/pkgconfig
- >=dev-util/intltool-0.35
- >=dev-util/gtk-doc-am-1.13
-
- doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- $(use_enable avahi avahi-ui)
- $(use_enable nautilus)
- $(use_enable remote-access)
- $(use_enable gnome-keyring)"
- DOCS="AUTHORS NEWS README TODO"
-}
-
-src_prepare() {
- local f=data/gdu-notification-daemon.desktop.in.in.in
- sed -i -e '/^OnlyShowIn/d' ${f} || die
- echo 'NotShowIn=KDE;' >> ${f}
-
- 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"
-
- # Keep nautilus extension working on Gnome2 setups
- EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-3.0.2-nautilus2-compat.patch"
-
- intltoolize --force --copy --automake || die
- eautoreconf
-
- gnome2_src_prepare
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
deleted file mode 100644
index 25a55d2f5220..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 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-3.0.2-r300.ebuild,v 1.5 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="avahi doc fat gnome-keyring nautilus remote-access"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-CDEPEND="
- >=dev-libs/glib-2.22:2
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/libunique-2.90.1:3
- >=x11-libs/gtk+-2.90.7:3
- =sys-fs/udisks-1.0*:0[remote-access?]
- >=dev-libs/libatasmart-0.14
- >=x11-libs/libnotify-0.6.1
-
- avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- nautilus? ( >=gnome-base/nautilus-2.91.0 )
-"
-RDEPEND="${CDEPEND}
- x11-misc/xdg-utils
- fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- gnome-base/gnome-common
- app-text/docbook-xml-dtd:4.1.2
- app-text/rarian
- app-text/gnome-doc-utils
-
- virtual/pkgconfig
- >=dev-util/intltool-0.35
- >=dev-util/gtk-doc-am-1.13
-
- doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- $(use_enable avahi avahi-ui)
- $(use_enable nautilus)
- $(use_enable remote-access)
- $(use_enable gnome-keyring)"
- DOCS="AUTHORS NEWS README TODO"
-}
-
-src_prepare() {
- local f=data/gdu-notification-daemon.desktop.in.in.in
- sed -i -e '/^OnlyShowIn/d' ${f} || die
- echo 'NotShowIn=KDE;' >> ${f}
-
- 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"
- intltoolize --force --copy --automake || die
- eautoreconf
-
- gnome2_src_prepare
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
index 6a02ece0d2b7..ce409718181f 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 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-3.4.0.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild,v 1.1 2012/12/24 16:26:33 eva Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -11,20 +11,29 @@ inherit gnome2
DESCRIPTION="Disk Utility for GNOME using udisks"
HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-LICENSE="LGPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
IUSE="fat"
+KEYWORDS="~amd64 ~x86"
-CDEPEND="
+COMMON_DEPEND="
>=dev-libs/glib-2.31:2
- >=sys-fs/udisks-1.90:2
- >=x11-libs/gtk+-3.3.11:3
+ >=sys-fs/udisks-1.99.0:2
+ >=x11-libs/gtk+-3.5.8:3
+ >=app-crypt/libsecret-0.7
+ dev-libs/libpwquality
"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
>=x11-themes/gnome-icon-theme-symbolic-2.91
- fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
+ fat? ( sys-fs/dosfstools )
+"
+DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50
+ dev-libs/libxslt
virtual/pkgconfig
"
+
+src_configure() {
+ G2CONF="${G2CONF} --disable-libsystemd-login"
+ gnome2_src_configure
+}
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 7a29b77d4e92..01c7a15efb29 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -4,9 +4,9 @@
<herd>gnome</herd>
<use>
<flag name='fat'>Include FAT16/FAT32 support
- (<pkg>sys-fs/dosfstools</pkg>)</flag>
+ (<pkg>sys-fs/dosfstools</pkg>)</flag>
<flag name="nautilus">Enable <pkg>gnome-base/nautilus</pkg> extension.</flag>
<flag name="remote-access">Enable access to remote udisks
- daemons.</flag>
+ daemons.</flag>
</use>
</pkgmetadata>