| 1 |
commit: 0e97c8f1b6ace6eea29703b409707186601c2467 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 29 10:09:41 2013 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 10:09:41 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0e97c8f1 |
| 7 |
|
| 8 |
Merge changes from Portage tree. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
app-editors/emacs-vcs/ChangeLog | 3 +++ |
| 14 |
app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 20 +++++++++----------- |
| 15 |
2 files changed, 12 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog |
| 18 |
index 63ad864..fb84c31 100644 |
| 19 |
--- a/app-editors/emacs-vcs/ChangeLog |
| 20 |
+++ b/app-editors/emacs-vcs/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 29 Dec 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 26 |
+ Merge changes from Portage tree. |
| 27 |
+ |
| 28 |
31 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 29 |
Merge changes from Portage tree. |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 33 |
index c3cdcc0..2d3a558 100644 |
| 34 |
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 35 |
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 36 |
@@ -1,6 +1,6 @@ |
| 37 |
# Copyright 1999-2013 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.20 2013/08/31 22:13:48 ulm Exp $ |
| 40 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.21 2013/12/16 23:59:27 ulm Exp $ |
| 41 |
|
| 42 |
EAPI=5 |
| 43 |
|
| 44 |
@@ -116,15 +116,6 @@ src_prepare() { |
| 45 |
fi |
| 46 |
|
| 47 |
epatch_user |
| 48 |
- |
| 49 |
- if ! use gzip-el; then |
| 50 |
- # Emacs' build system automatically detects the gzip binary and |
| 51 |
- # compresses el files. We don't want that so confuse it with a |
| 52 |
- # wrong binary name |
| 53 |
- sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \ |
| 54 |
- || die "unable to sed configure.ac" |
| 55 |
- fi |
| 56 |
- |
| 57 |
AT_M4DIR=m4 eautoreconf |
| 58 |
} |
| 59 |
|
| 60 |
@@ -215,7 +206,7 @@ src_configure() { |
| 61 |
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ |
| 62 |
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ |
| 63 |
--with-gameuser="${GAMES_USER_DED:-games}" \ |
| 64 |
- --without-compress-info \ |
| 65 |
+ --without-compress-install \ |
| 66 |
--with-file-notification=$(usev gfile || usev inotify || echo no) \ |
| 67 |
$(use_enable acl) \ |
| 68 |
$(use_with dbus) \ |
| 69 |
@@ -255,6 +246,13 @@ src_install () { |
| 70 |
# remove unused <version>/site-lisp dir |
| 71 |
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
| 72 |
|
| 73 |
+ if use gzip-el; then |
| 74 |
+ # compress .el files when a corresponding .elc exists |
| 75 |
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ |
| 76 |
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n |
| 77 |
+ assert "gzip .el failed" |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
local cdir |
| 81 |
if use source; then |
| 82 |
cdir="/usr/share/emacs/${FULL_VERSION}/src" |
Archives