summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-06-09 09:14:26 +0200
committerUlrich Müller <ulm@gentoo.org>2013-06-09 09:14:26 +0200
commit6e429c0ee158737b0475af0d020b0138cf015af9 (patch)
tree3d6ff19612531546c2dfe0f879ef762c0614db87
parentMerge some changes from emacs-vcs. (diff)
downloademacs-6e429c0ee158737b0475af0d020b0138cf015af9.tar.gz
emacs-6e429c0ee158737b0475af0d020b0138cf015af9.tar.bz2
emacs-6e429c0ee158737b0475af0d020b0138cf015af9.zip
Merge changes from Portage tree.
Package-Manager: portage-2.1.12.3
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild15
2 files changed, 7 insertions, 11 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 94ead1d..7002932 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
metadata.xml:
Merge changes from Portage tree.
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 df437ba..97f40e8 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.13 2013/06/08 21:00:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.14 2013/06/09 07:11:06 ulm Exp $
EAPI=5
@@ -41,10 +41,10 @@ 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 )
- !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
@@ -86,8 +86,8 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
+ gfile? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
- !inotify? ( gfile? ( virtual/pkgconfig ) )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
@@ -153,14 +153,6 @@ 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)"
@@ -229,6 +221,7 @@ 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) \