summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-11-10 21:13:54 +0100
committerUlrich Müller <ulm@gentoo.org>2014-11-10 21:13:54 +0100
commitcfbd1eb9437262ace3e41358e44148e7a352dca4 (patch)
treee3c3fbd2e22152c4a903934bd351d4c92eca4de9
parentapp-xemacs/cc-mode: Pre release version bump. (diff)
downloademacs-cfbd1eb9437262ace3e41358e44148e7a352dca4.tar.gz
emacs-cfbd1eb9437262ace3e41358e44148e7a352dca4.tar.bz2
emacs-cfbd1eb9437262ace3e41358e44148e7a352dca4.zip
app-editors/emacs-vcs: Merge changes from Portage tree.
Package-Manager: portage-2.2.14
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild4
2 files changed, 7 insertions, 0 deletions
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 <ulm@gentoo.org> emacs-vcs-25.0.9999.ebuild:
+ Merge changes from Portage tree.
+
18 May 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-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 \