diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2007-03-19 11:52:01 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2007-03-19 11:52:01 +0000 |
| commit | 66314a8e3a824f3af975a4d019b3d4b45b2cc334 (patch) | |
| tree | 6c66cc330d8b930a914a48595d1207f21de28d08 | |
| parent | remove a superfluos tabulator (diff) | |
| download | emacs-66314a8e3a824f3af975a4d019b3d4b45b2cc334.tar.gz emacs-66314a8e3a824f3af975a4d019b3d4b45b2cc334.tar.bz2 emacs-66314a8e3a824f3af975a4d019b3d4b45b2cc334.zip | |
Don't install emacs binaries twice.
svn path=/emacs-extra/; revision=101
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-22.0.95-r3.ebuild | 2 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild | 2 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.0-r3.ebuild | 2 | ||||
| -rw-r--r-- | app-editors/emacs/ChangeLog | 3 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r10.ebuild | 4 |
6 files changed, 12 insertions, 6 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 9e9bbca..4bb74e7 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> + emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild, + emacs-cvs-23.0.0-r3.ebuild: + Don't install emacs executable twice. + 18 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild, emacs-cvs-23.0.0-r3.ebuild: diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r3.ebuild index f00e65a..b14d514 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r3.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r3.ebuild @@ -132,7 +132,7 @@ src_install () { emake install DESTDIR="${D}" || die "make install failed" rm "${D}"/usr/bin/emacs-${SLOT}-emacs-${SLOT} || die "removing duplicate emacs executable failed" - dohard /usr/bin/emacs{-emacs,}-${SLOT} || die + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die if use aqua ; then einfo "Installing Carbon Emacs..." diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild index d1646f7..70bcf40 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild @@ -138,7 +138,7 @@ src_install () { emake install DESTDIR="${D}" || die "make install failed" rm "${D}"/usr/bin/emacs-${SLOT}-emacs-${SLOT} || die "removing duplicate emacs executable failed" - dohard /usr/bin/emacs{-emacs,}-${SLOT} || die + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die if use aqua ; then einfo "Installing Carbon Emacs..." diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r3.ebuild index b9aa316..09aef88 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r3.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r3.ebuild @@ -143,7 +143,7 @@ src_install () { emake install DESTDIR="${D}" || die "make install failed" rm "${D}"/usr/bin/emacs-${SLOT}-emacs-${SLOT} || die "removing duplicate emacs executable failed" - dohard /usr/bin/emacs{-emacs,}-${SLOT} || die + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die if use aqua ; then einfo "Installing Carbon Emacs..." diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index a3c6035..a23e0b1 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -2,7 +2,8 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 19 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-18.59-r3.ebuild: + 19 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-18.59-r3.ebuild, + emacs-21.4-r10.ebuild: Don't install emacs executable twice. 19 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r10.ebuild, diff --git a/app-editors/emacs/emacs-21.4-r10.ebuild b/app-editors/emacs/emacs-21.4-r10.ebuild index 9d6a400..8aa579f 100644 --- a/app-editors/emacs/emacs-21.4-r10.ebuild +++ b/app-editors/emacs/emacs-21.4-r10.ebuild @@ -122,8 +122,8 @@ src_install() { for i in "${D}"/usr/bin/* ; do mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed" done - mv "${D}"/usr/bin/emacs{-${PV},}-emacs-${SLOT} || die "mv emacs failed" - dohard /usr/bin/emacs{-emacs,}-${SLOT} || die + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" + rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} einfo "Fixing info documentation..." mkdir "${T}/emacs-${SLOT}" |