From f7b93b6f8f457010ca4b5bc77e5da84fa51684d2 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Thu, 21 Mar 2013 02:29:46 +0100 Subject: Merge changes from emacs-vcs. Package-Manager: portage-2.1.11.57 --- app-editors/emacs-xwidget/ChangeLog | 3 ++- app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 13 ++++--------- app-editors/emacs-xwidget/metadata.xml | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog index b0b74c0..bcedcb0 100644 --- a/app-editors/emacs-xwidget/ChangeLog +++ b/app-editors/emacs-xwidget/ChangeLog @@ -2,7 +2,8 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 20 Mar 2013; Ulrich Müller emacs-xwidget-24.3.9999.ebuild: + 21 Mar 2013; Ulrich Müller emacs-xwidget-24.3.9999.ebuild, + metadata.xml: Merge changes from emacs-vcs. *emacs-xwidget-24.3.9999 (17 Nov 2012) 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 9602ce4..952e7b0 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="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 xwidgets" +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" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -45,6 +45,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? ( @@ -223,19 +224,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) \ @@ -243,6 +236,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-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml index aed3cc2..9d419db 100644 --- a/app-editors/emacs-xwidget/metadata.xml +++ b/app-editors/emacs-xwidget/metadata.xml @@ -30,6 +30,7 @@ Enable support for net-dns/hesiod Use media-gfx/imagemagick for image processing + Enable inotify filesystem monitoring support Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations Enable building under a PaX enabled kernel -- cgit v1.2.3-18-g5258