diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2010-07-04 06:32:18 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-07-04 06:32:18 +0000 |
| commit | e8244954aeba650d48f409a4e0f9daacc1682515 (patch) | |
| tree | 0cce89cbac6c4d433ee89b61169fa314c7b071ca /sci-electronics | |
| parent | Version bump. (diff) | |
| download | gentoo-2-e8244954aeba650d48f409a4e0f9daacc1682515.tar.gz gentoo-2-e8244954aeba650d48f409a4e0f9daacc1682515.tar.bz2 gentoo-2-e8244954aeba650d48f409a4e0f9daacc1682515.zip | |
fix for default editor (see bug #294766)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/spice/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-electronics/spice/spice-3.5.5-r1.ebuild | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/sci-electronics/spice/ChangeLog b/sci-electronics/spice/ChangeLog index df4f6895c86d..72f6bbc8961d 100644 --- a/sci-electronics/spice/ChangeLog +++ b/sci-electronics/spice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-electronics/spice -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.11 2009/06/07 05:43:47 calchan Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.12 2010/07/04 06:32:18 tomjbe Exp $ + + 04 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> spice-3.5.5-r1.ebuild: + fix for default editor (see bug #294766) *spice-3.5.5-r1 (07 Jun 2009) diff --git a/sci-electronics/spice/spice-3.5.5-r1.ebuild b/sci-electronics/spice/spice-3.5.5-r1.ebuild index 6b86bdc3084f..698ab03c9edc 100644 --- a/sci-electronics/spice/spice-3.5.5-r1.ebuild +++ b/sci-electronics/spice/spice-3.5.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5-r1.ebuild,v 1.1 2009/06/07 05:43:47 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5-r1.ebuild,v 1.2 2010/07/04 06:32:18 tomjbe Exp $ inherit eutils flag-o-matic multilib @@ -16,7 +16,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" RDEPEND="sys-libs/ncurses - x11-libs/libXaw" + x11-libs/libXaw + app-editors/gentoo-editor" DEPEND="${RDEPEND} x11-proto/xproto" @@ -32,9 +33,8 @@ src_unpack() { # Avoid re-creating WORKDIR due to stupid mtime touch .. - [ -z $EDITOR ] || EDITOR="vim" sed -i -e "s:termcap:ncurses:g" \ - -e "s:joe:${EDITOR}:g" \ + -e "s:joe:/usr/libexec/gentoo-editor:g" \ -e "s:-O2 -s:${CFLAGS}:g" \ -e "s:-lncurses -lm -s:-lncurses -lm ${LDFLAGS}:" \ -e "s:SPICE_DIR)/lib:SPICE_DIR)/$(get_libdir)/spice:g" \ @@ -53,13 +53,13 @@ src_compile() { src_install() { # install binaries dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die "failed to copy binaries" - newbin obj/bin/help spice.help - dosym /usr/bin/spice3 /usr/bin/spice + newbin obj/bin/help spice.help || die + dosym /usr/bin/spice3 /usr/bin/spice || die # install runtime stuff rm -f lib/make* - dodir /usr/$(get_libdir)/spice - cp -R lib/* "${D}"/usr/$(get_libdir)/spice/ + dodir /usr/$(get_libdir)/spice || die + cp -R lib/* "${D}"/usr/$(get_libdir)/spice/ || die "failed to copy libraries" # install docs - doman man/man1/*.1 - dodoc readme readme.Linux notes/spice2 + doman man/man1/*.1 || die + dodoc readme readme.Linux notes/spice2 || die } |