summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-21 02:23:05 +0100
committerUlrich Müller <ulm@gentoo.org>2013-03-21 02:23:05 +0100
commit016daddc7bb39f18160edd252e8c401772d05026 (patch)
tree52b0a2fc55fa61d46180a0c64eec1558937c6f11 /app-editors
parentMerge changes from emacs-vcs. (diff)
downloademacs-016daddc7bb39f18160edd252e8c401772d05026.tar.gz
emacs-016daddc7bb39f18160edd252e8c401772d05026.tar.bz2
emacs-016daddc7bb39f18160edd252e8c401772d05026.zip
Merge changes from portage tree.
Package-Manager: portage-2.1.11.57
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild15
-rw-r--r--app-editors/emacs-vcs/metadata.xml1
3 files changed, 8 insertions, 11 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 385b465..46cc044 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,7 +2,8 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 20 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ 21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
+ metadata.xml:
Merge changes from portage tree.
04 Jan 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
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 c0c3875..6ad765c 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.6 2013/03/19 21:33:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.7 2013/03/21 01:16:09 ulm Exp $
EAPI=5
@@ -31,7 +31,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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick 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 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
@@ -44,6 +44,7 @@ RDEPEND="sys-libs/ncurses
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
+ acl? ( virtual/acl )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
@@ -206,19 +207,11 @@ src_configure() {
myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
- # According to configure, this option is only used for GNU/Linux
- # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
- # out the location because $(get_libdir) does not necessarily return
- # something that matches the host OS's libdir naming (e.g. RHEL).
- local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
- crtdir=${crtdir%/*}
-
econf \
--program-suffix=-${EMACS_SUFFIX} \
--program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
$(use_with hesiod) \
@@ -226,6 +219,8 @@ src_configure() {
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with inotify) \
+ $(use_with acl) \
$(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 b68a939..3c76f7a 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -30,6 +30,7 @@
<flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
<flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
processing</flag>
+ <flag name='inotify'>Enable inotify filesystem monitoring support</flag>
<flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
of the internal Lisp implementations</flag>
<flag name='pax_kernel'>Enable building under a PaX enabled kernel