From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 77EAF138247 for ; Sun, 29 Dec 2013 10:07:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E640E0A4A; Sun, 29 Dec 2013 10:07:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97D88E0A4A for ; Sun, 29 Dec 2013 10:07:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 848D433F6FF for ; Sun, 29 Dec 2013 10:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E3501E54D1 for ; Sun, 29 Dec 2013 10:07:03 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1388311781.0e97c8f1b6ace6eea29703b409707186601c2467.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: proj/emacs X-VCS-Files: app-editors/emacs-vcs/ChangeLog app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 0e97c8f1b6ace6eea29703b409707186601c2467 X-VCS-Branch: master Date: Sun, 29 Dec 2013 10:07:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87ed0332-5849-46a6-94af-8b209e92f7c2 X-Archives-Hash: 3d3daafb87e451c333ffd6e6a03b5e81 commit: 0e97c8f1b6ace6eea29703b409707186601c2467 Author: Ulrich Müller gentoo org> AuthorDate: Sun Dec 29 10:09:41 2013 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Dec 29 10:09:41 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0e97c8f1 Merge changes from Portage tree. Package-Manager: portage-2.2.7 --- app-editors/emacs-vcs/ChangeLog | 3 +++ app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 20 +++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 63ad864..fb84c31 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Dec 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: + Merge changes from Portage tree. + 31 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: Merge changes from Portage tree. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild index c3cdcc0..2d3a558 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=5 @@ -116,15 +116,6 @@ src_prepare() { fi epatch_user - - if ! use gzip-el; then - # Emacs' build system automatically detects the gzip binary and - # compresses el files. We don't want that so confuse it with a - # wrong binary name - sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \ - || die "unable to sed configure.ac" - fi - AT_M4DIR=m4 eautoreconf } @@ -215,7 +206,7 @@ src_configure() { --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-info \ + --without-compress-install \ --with-file-notification=$(usev gfile || usev inotify || echo no) \ $(use_enable acl) \ $(use_with dbus) \ @@ -255,6 +246,13 @@ src_install () { # remove unused /site-lisp dir rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + local cdir if use source; then cdir="/usr/share/emacs/${FULL_VERSION}/src"