[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     a50acecc9191b08a44972307c81727ecfa618b97
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 16:10:18 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 16:10:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a50acecc

Merge changes from emacs-vcs.

Package-Manager: portage-2.1.12.4

---
 app-editors/emacs-xwidget/ChangeLog                      | 4 ++++
 app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 6 ++++--
 app-editors/emacs-xwidget/metadata.xml                   | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 020e55f..4a98282 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
+  metadata.xml:
+  Merge changes from emacs-vcs.
+
   08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
   Merge some changes from emacs-vcs.
 

diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index d7c480e..6515c5f 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
@@ -42,6 +42,7 @@ RDEPEND="sys-libs/ncurses
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
+	gfile? ( >=dev-libs/glib-2.28.6 )
 	gnutls? ( net-libs/gnutls )
 	gpm? ( sys-libs/gpm )
 	hesiod? ( net-dns/hesiod )
@@ -92,6 +93,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
+	gfile? ( virtual/pkgconfig )
 	gnutls? ( virtual/pkgconfig )
 	libxml2? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
@@ -236,12 +238,12 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
 		--without-compress-info \
+		--with-file-notification=$(usev gfile || usev inotify || echo no) \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
 		$(use_with gpm) \
 		$(use_with hesiod) \
-		$(use_with inotify) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with libxml2 xml2) \
 		$(use_with selinux) \

diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
index aed3cc2..7e27373 100644
--- a/app-editors/emacs-xwidget/metadata.xml
+++ b/app-editors/emacs-xwidget/metadata.xml
@@ -22,6 +22,8 @@
   <flag name='games'>Support shared score files for games</flag>
   <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
+  <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+    notification</flag>
   <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
   <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of