summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-10-07 10:27:18 +0000
committerUlrich Müller <ulm@gentoo.org>2012-10-07 10:27:18 +0000
commit4abad02504625b347a724463ee7b8bbc51182da6 (patch)
tree56affddbbce9c62283ec9a23dc60b84e9a053aa6 /app-editors
parentDrop maintainer due retirement, #274113 (diff)
downloadgentoo-2-4abad02504625b347a724463ee7b8bbc51182da6.tar.gz
gentoo-2-4abad02504625b347a724463ee7b8bbc51182da6.tar.bz2
gentoo-2-4abad02504625b347a724463ee7b8bbc51182da6.zip
Passing CC to emake seems no longer necessary. Use --program-transform-name config option instead of moving the executable.
(Portage version: 2.1.11.24/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-vcs/ChangeLog6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild15
2 files changed, 9 insertions, 12 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index cf8b7bdf589a..29b83760e0ec 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.116 2012/09/25 19:13:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.117 2012/10/07 10:27:18 ulm Exp $
+
+ 02 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+ Passing CC to emake seems no longer necessary. Use --program-transform-name
+ config option instead of moving the executable.
25 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
Specify LICENSE more precisely, "as-is" is really HPND.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index b2247d7f6678..10355d5b1011 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.2.9999.ebuild,v 1.7 2012/09/25 19:13:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.8 2012/10/07 10:27:18 ulm Exp $
EAPI=4
@@ -205,6 +205,7 @@ src_configure() {
econf \
--program-suffix=-${EMACS_SUFFIX} \
+ --program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
@@ -223,19 +224,11 @@ src_configure() {
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- #if [[ ${PV##*.} = 9999 ]]; then
- # emake CC="$(tc-getCC)" bootstrap
- # # cleanup, otherwise emacs will be dumped again in src_install
- # (cd src; emake versionclean)
- #fi
- emake CC="$(tc-getCC)"
+ emake
}
src_install () {
- emake install DESTDIR="${D}" NO_BIN_LINK=t
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "Moving emacs executable failed"
+ emake DESTDIR="${D}" NO_BIN_LINK=t install
# move man pages to the correct place
local m