summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-05-05 10:15:23 +0200
committerUlrich Müller <ulm@gentoo.org>2014-05-05 10:15:23 +0200
commit2b77c759489ae0bdcc2624f161bc48e480ea7143 (patch)
tree8b9e129acf785b9833b1bbf46c70c009d7598f9e /app-editors/emacs-vcs
parentFixed ChangeLog (diff)
downloademacs-2b77c759489ae0bdcc2624f161bc48e480ea7143.tar.gz
emacs-2b77c759489ae0bdcc2624f161bc48e480ea7143.tar.bz2
emacs-2b77c759489ae0bdcc2624f161bc48e480ea7143.zip
Merge changes from Portage tree.
Package-Manager: portage-2.2.10
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild8
2 files changed, 9 insertions, 2 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 084ea4b..a7590b2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+ Merge changes from Portage tree.
+
08 Apr 2014; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index ea73d01..95c8ace 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
@@ -36,7 +36,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 )
@@ -92,7 +92,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}
@@ -210,6 +213,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 \