From: Christian Faulhammer Date: Wed, 18 Apr 2007 07:02:20 +0000 (+0000) Subject: fix multilib handling, see bug 171330 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=529a24a3f0b9dd1958a9134731af998c0fbed266;p=gentoo.git fix multilib handling, see bug 171330 Package-Manager: portage-2.1.2.2 --- 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 spice-3.5.5.ebuild: + fix multilib handling, see bug 171330 12 Mar 2007; Denis Dupeyron spice-3.5.5.ebuild: Fixed bug #166897, thanks David Watzke. Fixed mtime issue forcing WORKDIR to diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest index 812b0577e605..20b1e7b01fc8 100644 --- a/sci-electronics/spice/Manifest +++ b/sci-electronics/spice/Manifest @@ -1,16 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX spice-3.5.5-gcc-4.1.patch 2511 RMD160 5e55a8939ec825a3867be593a99d211c9d1e3c1b SHA1 9843081300f200559226cbe645d9cc94234ee358 SHA256 8b1b0ee2a28c995e5a71ac313cef18ed0baa01a313949b9586ce56377ef35ec3 MD5 490bbc3ce696fc903a2ddedd19ad6fe7 files/spice-3.5.5-gcc-4.1.patch 2511 RMD160 5e55a8939ec825a3867be593a99d211c9d1e3c1b files/spice-3.5.5-gcc-4.1.patch 2511 SHA256 8b1b0ee2a28c995e5a71ac313cef18ed0baa01a313949b9586ce56377ef35ec3 files/spice-3.5.5-gcc-4.1.patch 2511 DIST spice3f5sfix.tar.gz 1377263 RMD160 dc3b02b9b9783c7b08fd6cdb1fbe3355c5739e49 SHA1 1e2e6d3c28cd28e9fad2479610fc43146f5ca755 SHA256 8df74cc3d12f0e2c32c8455008ae4bf837e736edec9cedbc68c86b72e20abf5d -EBUILD spice-3.5.5.ebuild 1543 RMD160 d480234b58fa2e0e6f0f15281062e7b1556fde3c SHA1 95deae4e4652ae09eb3e48d67717db2f40ae3910 SHA256 1b36dbfd26f4d1e2c8fcab99066c29f0ada58d830e5a7e579a3442048313ef42 -MD5 fed964007899f1d1c6c31158560a648e spice-3.5.5.ebuild 1543 -RMD160 d480234b58fa2e0e6f0f15281062e7b1556fde3c spice-3.5.5.ebuild 1543 -SHA256 1b36dbfd26f4d1e2c8fcab99066c29f0ada58d830e5a7e579a3442048313ef42 spice-3.5.5.ebuild 1543 -MISC ChangeLog 2391 RMD160 461423130469690a5c69fd9ae5eac79c3635a93f SHA1 0f346ce0247be4714222dc177123e916d782e22e SHA256 9bcd142f1933dee0d05965e04f7546597fba7def13b072de22c72a0271dfec10 -MD5 5012c41f47bc0fa8e06c429cfb08b779 ChangeLog 2391 -RMD160 461423130469690a5c69fd9ae5eac79c3635a93f ChangeLog 2391 -SHA256 9bcd142f1933dee0d05965e04f7546597fba7def13b072de22c72a0271dfec10 ChangeLog 2391 +EBUILD spice-3.5.5.ebuild 1660 RMD160 a316a360799eeed4d171e472da7be5ad18eb4a25 SHA1 a25f80e43c4af03aec81974d0ba97dec8b86e7c9 SHA256 b3c4d91aa94ee9f23fdd923bb038d6c350d0c2e7f70470e535cd982b38e2d623 +MD5 4efc163e8b340a0c4c48a8ef90c17d9e spice-3.5.5.ebuild 1660 +RMD160 a316a360799eeed4d171e472da7be5ad18eb4a25 spice-3.5.5.ebuild 1660 +SHA256 b3c4d91aa94ee9f23fdd923bb038d6c350d0c2e7f70470e535cd982b38e2d623 spice-3.5.5.ebuild 1660 +MISC ChangeLog 2505 RMD160 c1520faa2b0f38770dbabea58bfcdbee1cfcfcf4 SHA1 0512f1f0911636f46a44c79914d0a4300f8ec563 SHA256 115538fd433411581e1979b71779e0c72fb45479c90d0431b0930b5d9b9f9df9 +MD5 a74239aebc5dbc07d047c3bf21a5a458 ChangeLog 2505 +RMD160 c1520faa2b0f38770dbabea58bfcdbee1cfcfcf4 ChangeLog 2505 +SHA256 115538fd433411581e1979b71779e0c72fb45479c90d0431b0930b5d9b9f9df9 ChangeLog 2505 MISC metadata.xml 690 RMD160 9e8afed9996cc2c11388638bd0129b2ea50062f1 SHA1 0f98743fa250170c25ed97309f0a1c39d0624f8d SHA256 8b9ef70c8bfc12f9b87bca110e52da6e9e4cab3436fdb5552e152fc9da5fe8f3 MD5 b4997f9636fa7fa763f0d920bef9b2c3 metadata.xml 690 RMD160 9e8afed9996cc2c11388638bd0129b2ea50062f1 metadata.xml 690 @@ -18,3 +21,10 @@ SHA256 8b9ef70c8bfc12f9b87bca110e52da6e9e4cab3436fdb5552e152fc9da5fe8f3 metadata MD5 71174e9659bf579daeca981bd4f60cd5 files/digest-spice-3.5.5 241 RMD160 e97520fc47158852389be8d0fad2d5f5680228cc files/digest-spice-3.5.5 241 SHA256 29d79b51be00f3255402c8878108c36110fcc71f579403a35de11c3ba69400ed files/digest-spice-3.5.5 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFGJcKDNQqtfCuFneMRAhDFAJ9+n9OKBUt3mOmyYdC7qIAj19prqgCeOWCK +LDdscw/VPnfBpnm3d15werQ= +=XcmT +-----END PGP SIGNATURE----- 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