New gfile USE flag for file notification support. USE=inotify will still take precedence, though. Reflect upstream change of acl configure option; it is handled by gnulib now.

Package-Manager: portage-2.1.12.3/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 43 insertions, 26 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 4b9d950fcd35..66cac46fc5e9 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.133 2013/04/06 10:13:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.134 2013/06/08 21:00:29 ulm Exp $
+
+  08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
+  metadata.xml:
+  New gfile USE flag for file notification support. USE=inotify will still take
+  precedence, though. Reflect upstream change of acl configure option; it is
+  handled by gnulib now.
 
   06 Apr 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
   Add slot operator to libpng dependency.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index fdd6ac6b7dce..3b3ef060d5dd 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD emacs-vcs-24.3.9999.ebuild 11152 SHA256 5b7dd16e22d54116ec761f898f225c26d1b99dd89bb3631439dcad5df1a1bc06 SHA512 a2510c8663ba1ab208e419a82838891c3b3fdb8f65da68c9667ce0678e02b26489278a35ca543d23814a2532a6052e862bd983c690dece27bd9e36399124c07f WHIRLPOOL db39f9682ecf0866462e19b7cc9a8ca62114b8d23d4a694ff06a6f46650484033090a9afffb3cd802c8a4470143ee3a80bd9ae6db7f083333e3b56b57e4690de
-MISC ChangeLog 72812 SHA256 f9b33060749bbdb906cd7bc9e41f1b6530698ca8ff81cb448a37df5ccc39bf59 SHA512 43761626dd7ce12c147840f98596b01b5092bef445dc1be524a67a091371a220d3de24ef13da4aa1a244fa5951ca42a04b7eddcf44e1d82ab45fc43ba930ba86 WHIRLPOOL 0127a3de693fabb898856f6328a0309fd96560cda679c4290c1cee271bd7494d6cd23ecffa0b33f349e6cdc623ad8ed34ef6c4d44987a49ba7dcb5d31fed6ef1
-MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
+EBUILD emacs-vcs-24.3.9999.ebuild 11450 SHA256 e10f92d922fa2efb4992cd3c0cfc475c74d7ced8628f03482429c5bc05eb7618 SHA512 2760555ba4e671ca9560591df5cce2a442c9564ea3c69cd04bc228c95bf51f63b83f96e20f3da8b0e2776a5976f3fee158b936d94ebc418551d4aeeb8e9c7e3e WHIRLPOOL ecf175048fbdde6f21deaef99b4331a57b307a916c59755040f40a068718f595780830646652137877f348b71bd2a1b36b223649ed2dbe72493807ddfe8b2807
+MISC ChangeLog 73086 SHA256 0af1c6e5210e5ed835b2ec8ba49529a149f0d63262041ea07419e739cd59d752 SHA512 d05038d14719aec28b34fd04bbdfa53a1af155f37ff647a313d90a92202a02ea8b27cc48c764503e10563fcac07226518128706579f996db0702185f06a95e77 WHIRLPOOL bae2c48714843ba68306eeac443d42a0334731e9c5f7b69392acf0c162ea50a89ed4907309d186cba8ce142793b81e356be12d5ad4de61da5248483b443d5552
+MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRX/WBAAoJEJQzkH1pP7W4XcQL/RsQZ38jfteUTnppuDLMbjmL
-MD/6WUuRL7bP3uGBoAXw13hpMW/py/1I2TErEElJn/k+ezLXxSbbFeX5z63A6FZ0
-6BYjNCVl263/LZNMuV7YN7+ajxW1tc6ldihf1CwB38Fc4Cwp5sXyGa9sgN55IoVG
-YLM+yYR/qpe3oH9fossXwpKTuIy/b9K/SNCSedejjSgUTbU2du+96QM7XA/KNVr5
-Eh84AkSO3p9ifYw/XG40mMAaHTo34LBAlsHifAXs6R3IBb29XnX4+g/5T5awBH08
-LGVqjNwkDBytNYLnQ1xSvwSYIk91JXkg77edZEBhboOnB0OEk3NuLZdb6QiKe/d+
-yJrm4m5ytHOD5HjLgFojMp0dGRV7+Kbia8qFMtB9ty2/7TfXCN2Ge0czm4AQ5k8X
-esok91z4PhQ+fyieJxzLpg5FqVKmLOqHVxwIUEJIUFspopsNep3gHoxl2wPdZpfJ
-vahQP4cCWky3QsZE81ngT16/5HC2G/Uw9mSBOI6BYQ==
-=30DB
+iQGcBAEBCAAGBQJRs5uFAAoJEJQzkH1pP7W4y+IL/RwpsZdzgSjug6P5ijZN8174
+BUEhy618V4kAGfKRmxkRHqmTdXZku86PahpVTq2gyjytWLcteSiRThM0+bjeO5TZ
+y8GP4YMmyhEf28pLMMHrwDeZo396X4w6yduiFiOS2DezSMwkCem2cGmehdbjDelt
+esbZbYDyIBmEngqCSwP9DMB+3/ssBpd2rOA3MVYpiQHOfXYjxuEk/7pMwa5cOJAO
+jKB/IJQlbzPVAmW4CHNnmEMX9ILdMiMRlOcfVrIZUdF48+WXTxpPQu9gGJbSDJDT
+ZjL4jEreyXuqlLMmeTripBpHHMnV3tLC8B8nJak6oXrHy0GkyW0CfOhuUvT0Wbsn
+vo0Zb1uycUUpAsCth/Hnz8ijxQ7iAeNcuv703bAeVFLDEakDJEF8FMXuQp5nmAqZ
+2ugelBnc2FBZLlC7OKnDfPj7HNAEveIk9A+G1dueYujphxwIWgTS6bKP6c8srMnQ
+v+0K2kukbMWncGApIn8FQhgcTv292fxUPvHNC5sVJg==
+=7GVi
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 4e2cda0e4f6c..df437bafb49b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.12 2013/04/06 10:13:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.13 2013/06/08 21:00:29 ulm Exp $
 
 EAPI=5
 
@@ -31,20 +31,21 @@ 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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"
+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"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
 	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
+	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
-	acl? ( virtual/acl )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
 	X? (
@@ -86,6 +87,7 @@ DEPEND="${RDEPEND}
 	alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
 	gnutls? ( virtual/pkgconfig )
+	!inotify? ( gfile? ( virtual/pkgconfig ) )
 	libxml2? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
 	gzip-el? ( app-arch/gzip )
@@ -151,6 +153,14 @@ src_configure() {
 		myconf+=" $(use_with sound)"
 	fi
 
+	if use inotify; then
+		myconf+=" --with-file-notification=inotify"
+		use gfile && ewarn \
+			"USE flag \"gfile\" has no effect if \"inotify\" is set."
+	else
+		myconf+=" --with-file-notification=$(usex gfile gfile)"
+	fi
+
 	if use X; then
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
@@ -219,13 +229,12 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
 		--without-compress-info \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
+		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with gnutls) \
-		$(use_with inotify) \
-		$(use_with acl) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with libxml2 xml2) \
 		$(use_with selinux) \
 		$(use_with wide-int) \
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index b68a93941698..358a70cf894d 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/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