From 54bf9918ef7f90724f952ecfd48bee90afd7cd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Wed, 14 Aug 2013 08:30:55 +0200 Subject: Merge changes from Portage tree. Package-Manager: portage-2.2.0 --- app-editors/emacs-vcs/ChangeLog | 3 +++ app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'app-editors') diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index aa11a70..a3bdbf5 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: $ + 14 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: + Merge changes from Portage tree. + 13 Aug 2013; Ulrich Müller emacs-vcs-24.3.9999.ebuild: Explicitly ask for --with-sound=alsa with USE="alsa". 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 e3651cc..91a3102 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -218,7 +218,6 @@ src_configure() { econf \ --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}" \ @@ -245,6 +244,9 @@ src_compile() { src_install () { emake DESTDIR="${D}" NO_BIN_LINK=t install + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ + || die "moving emacs executable failed" + # 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" -- cgit v1.2.3