diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2007-04-18 07:02:20 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2007-04-18 07:02:20 +0000 |
| commit | 85882c0403d0c7c5a609f67934e8183248a8bad7 (patch) | |
| tree | bc1615956924d20b5802a1d21c1e9074a70f4453 /sci-electronics/spice | |
| parent | stable x86/amd64, bug 174963 (diff) | |
| download | gentoo-2-85882c0403d0c7c5a609f67934e8183248a8bad7.tar.gz gentoo-2-85882c0403d0c7c5a609f67934e8183248a8bad7.tar.bz2 gentoo-2-85882c0403d0c7c5a609f67934e8183248a8bad7.zip | |
fix multilib handling, see bug 171330
(Portage version: 2.1.2.2)
Diffstat (limited to 'sci-electronics/spice')
| -rw-r--r-- | sci-electronics/spice/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-electronics/spice/spice-3.5.5.ebuild | 33 |
2 files changed, 21 insertions, 17 deletions
diff --git a/sci-electronics/spice/ChangeLog b/sci-electronics/spice/ChangeLog index b869e65961d9..a823e3f2ba39 100644 --- a/sci-electronics/spice/ChangeLog +++ b/sci-electronics/spice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-electronics/spice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.8 2007/03/12 18:21:20 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.9 2007/04/18 07:02:20 opfer Exp $ + + 18 Apr 2007; Christian Faulhammer <opfer@gentoo.org> spice-3.5.5.ebuild: + fix multilib handling, see bug 171330 12 Mar 2007; Denis Dupeyron <calchan@gentoo.org> spice-3.5.5.ebuild: Fixed bug #166897, thanks David Watzke. Fixed mtime issue forcing WORKDIR to diff --git a/sci-electronics/spice/spice-3.5.5.ebuild b/sci-electronics/spice/spice-3.5.5.ebuild index 3395852ebeb1..c9f3b6577566 100644 --- a/sci-electronics/spice/spice-3.5.5.ebuild +++ b/sci-electronics/spice/spice-3.5.5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 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.ebuild,v 1.5 2007/03/12 18:21:20 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5.ebuild,v 1.6 2007/04/18 07:02:20 opfer Exp $ -inherit eutils flag-o-matic +inherit eutils flag-o-matic multilib IUSE="" @@ -15,11 +15,11 @@ LICENSE="BSD" SLOT="0" KEYWORDS="x86 ~ppc ~amd64" -DEPEND="sys-libs/ncurses - || ( ( x11-libs/libXaw - x11-proto/xproto - ) - virtual/x11 )" +RDEPEND="sys-libs/ncurses + x11-libs/libXaw" + +DEPEND="${RDEPEND} + x11-proto/xproto" S=${WORKDIR}/${MY_P} @@ -28,7 +28,7 @@ src_unpack() { replace-flags -O* -O1 unpack ${A} - cd ${S} + cd "${S}" # Avoid re-creating WORKDIR due to stupid mtime touch .. @@ -36,28 +36,29 @@ src_unpack() { sed -i -e "s:termcap:ncurses:g" \ -e "s:joe:${EDITOR}:g" \ -e "s:-O2 -s:${CFLAGS}:g" \ - -e "s:SPICE_DIR)/lib:SPICE_DIR)/lib/spice:g" \ + -e "s:SPICE_DIR)/lib:SPICE_DIR)/$(get_libdir)/spice:g" \ -e "s:/usr/local/spice:/usr:g" \ + -e "s:/X11R6::" \ conf/linux sed -i -e "s:head -1:head -n 1:" util/build - epatch ${FILESDIR}/${P}-gcc-4.1.patch + epatch "${FILESDIR}"/${P}-gcc-4.1.patch } src_compile() { - ./util/build linux || die - obj/bin/makeidx lib/helpdir/spice.txt || die + ./util/build linux || die "build failed" + obj/bin/makeidx lib/helpdir/spice.txt || die "makeidx failed" } src_install() { - cd ${S} + cd "${S}" # install binaries - dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die + 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 # install runtime stuff rm -f lib/make* - dodir /usr/lib/spice - cp -R lib/* ${D}/usr/lib/spice/ + dodir /usr/$(get_libdir)/spice + cp -R lib/* "${D}"/usr/$(get_libdir)/spice/ # install docs doman man/man1/*.1 dodoc readme readme.Linux notes/spice2 |