commit:     cfbd1eb9437262ace3e41358e44148e7a352dca4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 20:13:54 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 20:13:54 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cfbd1eb9

app-editors/emacs-vcs: Merge changes from Portage tree.

Package-Manager: portage-2.2.14

---
 app-editors/emacs-vcs/ChangeLog                  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 984e63a..9161e69 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: $
 
+  10 Nov 2014; Ulrich Müller <[email protected]> emacs-vcs-25.0.9999.ebuild:
+  Merge changes from Portage tree.
+
   18 May 2014; Ulrich Müller <[email protected]> emacs-vcs-24.4.9999.ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
index 66ef7a1..f66a49f 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
@@ -123,6 +123,7 @@ src_prepare() {
 
 src_configure() {
        strip-flags
+       filter-flags -pie                                       #526948
 
        if use sh; then
                replace-flags "-O[1-9]" -O0             #262359
@@ -253,6 +254,9 @@ src_install () {
        # remove unused <version>/site-lisp dir
        rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
 
+       # remove COPYING file (except for etc/COPYING used by describe-copying)
+       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
        if use gzip-el; then
                # compress .el files when a corresponding .elc exists
                find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \

Reply via email to