diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-08-14 06:26:39 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-08-14 06:26:39 +0000 |
| commit | 10fecc3fa572594c64d49ec3e9f752c23489c719 (patch) | |
| tree | 9c689420984a5d746201d25cd5acc6779393277f /app-editors | |
| parent | Don't call configure with --program-transform-name, upstream bug #15091. Reve... (diff) | |
| download | gentoo-2-10fecc3fa572594c64d49ec3e9f752c23489c719.tar.gz gentoo-2-10fecc3fa572594c64d49ec3e9f752c23489c719.tar.bz2 gentoo-2-10fecc3fa572594c64d49ec3e9f752c23489c719.zip | |
Don't call configure with --program-transform-name, upstream bug #15091. Revert to moving the executable instead.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 51bbfb36e272..279d7f94c952 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.139 2013/08/12 05:54:23 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.140 2013/08/14 06:26:39 ulm Exp $ + + 14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild: + Don't call configure with --program-transform-name, upstream bug #15091. + Revert to moving the executable instead. 12 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild: New USE flag for zlib. 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 8988fc89a7a5..8c8f6e7f5a10 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.18 2013/08/12 05:54:23 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.19 2013/08/14 06:26:39 ulm Exp $ EAPI=5 @@ -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" |