summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-31 13:52:46 +0200
committerUlrich Müller <ulm@gentoo.org>2013-03-31 13:52:46 +0200
commit646079b3e1dc188bdb612709f7cbd7735f1a34cf (patch)
treecc02c0d374bdba2445d6fa2a78024bcbb5434f4d /app-editors/emacs-vcs
parentMerge changes from emacs-vcs. (diff)
downloademacs-646079b3e1dc188bdb612709f7cbd7735f1a34cf.tar.gz
emacs-646079b3e1dc188bdb612709f7cbd7735f1a34cf.tar.bz2
emacs-646079b3e1dc188bdb612709f7cbd7735f1a34cf.zip
Merge changes from Portage tree.
Package-Manager: portage-2.1.11.59
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild12
2 files changed, 6 insertions, 9 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 2554cd1..f99932b 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: $
+ 31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
27 Mar 2013; Ulrich Müller <ulm@gentoo.org> metadata.xml:
Remove flag description for inotify, it is a global USE flag now.
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 c26a5ac..d82e038 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.8 2013/03/21 17:59:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.10 2013/03/31 11:51:18 ulm Exp $
EAPI=5
@@ -208,8 +208,8 @@ src_configure() {
fi
econf \
- --program-suffix=-${EMACS_SUFFIX} \
- --program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --program-transform-name="s/^\(emacs\)-[0-9].*-\1/\1/" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
@@ -235,12 +235,6 @@ src_compile() {
src_install () {
emake DESTDIR="${D}" NO_BIN_LINK=t install
- # move man pages to the correct place
- local m
- for m in "${ED}"/usr/share/man/man1/* ; do
- mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
- done
-
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"