| 1 |
commit: 5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 6 06:00:46 2014 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 6 06:00:46 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5bbbc0be |
| 7 |
|
| 8 |
Merge changes from emacs-vcs. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
app-editors/emacs-xwidget/ChangeLog | 3 +++ |
| 14 |
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 10 +++++++--- |
| 15 |
2 files changed, 10 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog |
| 18 |
index 8cd64a2..6a735d5 100644 |
| 19 |
--- a/app-editors/emacs-xwidget/ChangeLog |
| 20 |
+++ b/app-editors/emacs-xwidget/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 06 May 2014; Ulrich Müller <ulm@g.o> emacs-xwidget-24.3.9999.ebuild: |
| 26 |
+ Merge changes from emacs-vcs. |
| 27 |
+ |
| 28 |
13 Mar 2014; Ulrich Müller <ulm@g.o> emacs-xwidget-24.3.9999.ebuild: |
| 29 |
Merge changes from emacs-vcs. |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild |
| 33 |
index 40e6eaa..3cc7c9a 100644 |
| 34 |
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild |
| 35 |
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild |
| 36 |
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( aqua X )" |
| 37 |
|
| 38 |
RDEPEND="sys-libs/ncurses |
| 39 |
>=app-admin/eselect-emacs-1.16 |
| 40 |
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] |
| 41 |
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] |
| 42 |
net-libs/liblockfile |
| 43 |
acl? ( virtual/acl ) |
| 44 |
alsa? ( media-libs/alsa-lib ) |
| 45 |
@@ -99,7 +99,10 @@ DEPEND="${RDEPEND} |
| 46 |
libxml2? ( virtual/pkgconfig ) |
| 47 |
X? ( virtual/pkgconfig ) |
| 48 |
gzip-el? ( app-arch/gzip ) |
| 49 |
- pax_kernel? ( sys-apps/paxctl )" |
| 50 |
+ pax_kernel? ( |
| 51 |
+ sys-apps/attr |
| 52 |
+ sys-apps/paxctl |
| 53 |
+ )" |
| 54 |
|
| 55 |
if [[ ${PV##*.} = 9999 ]]; then |
| 56 |
DEPEND="${DEPEND} |
| 57 |
@@ -225,6 +228,7 @@ src_configure() { |
| 58 |
econf \ |
| 59 |
--program-suffix="-${EMACS_SUFFIX}" \ |
| 60 |
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
| 61 |
+ --localstatedir="${EPREFIX}"/var \ |
| 62 |
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
| 63 |
--with-gameuser="${GAMES_USER_DED:-games}" \ |
| 64 |
--without-compress-install \ |
| 65 |
@@ -326,7 +330,7 @@ src_install () { |
| 66 |
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
| 67 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
| 68 |
machine would satisfy basic Emacs requirements under X11. |
| 69 |
- See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support |
| 70 |
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
| 71 |
for how to enable anti-aliased fonts." |
| 72 |
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in |
| 73 |
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
Archives