summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-05-06 08:00:46 +0200
committerUlrich Müller <ulm@gentoo.org>2014-05-06 08:00:46 +0200
commit5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66 (patch)
treefe347a4de76c046cda9bbf908960942e3eab0f69 /app-editors/emacs-xwidget
parentMerge changes from Portage tree. (diff)
downloademacs-5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66.tar.gz
emacs-5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66.tar.bz2
emacs-5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66.zip
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.10
Diffstat (limited to 'app-editors/emacs-xwidget')
-rw-r--r--app-editors/emacs-xwidget/ChangeLog3
-rw-r--r--app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild10
2 files changed, 10 insertions, 3 deletions
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 8cd64a2..6a735d5 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge 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 40e6eaa..3cc7c9a 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -99,7 +99,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}
@@ -225,6 +228,7 @@ src_configure() {
econf \
--program-suffix="-${EMACS_SUFFIX}" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-install \
@@ -326,7 +330,7 @@ src_install () {
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink