Fixed bug #166897, thanks David Watzke. Fixed mtime issue forcing WORKDIR to be recre...

Package-Manager: portage-2.1.2.2

diff --git a/sci-electronics/spice/ChangeLog b/sci-electronics/spice/ChangeLog
index 122f01e080674b19314e0c1c3540c34a505082ac..b869e65961d925967a22202304eacb1abfb326de 100644 (file)
--- a/sci-electronics/spice/ChangeLog
+++ b/sci-electronics/spice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2007/02/21 18:50:11 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.8 2007/03/12 18:21:20 calchan Exp $
+
+  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
+  be recreated each time.
 
   21 Feb 2007; Denis Dupeyron <calchan@gentoo.org> files/digest-spice-3.5.5,
   Manifest:

diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index 527847f0e24dbae5d9e162b97ba6e66704b13360..812b0577e605df07a8ad1d28755a860f9e310ccb 100644 (file)
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -3,14 +3,14 @@ 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 1464 RMD160 ef2e6967e5e525d0981db5e94195d7727929dfc3 SHA1 7114c01f94dd640429faab3493bdd3d083cb4f55 SHA256 0d27ee69ead756094f12d1da31eeaf82b17a2b8b65567991846638decf7bf451
-MD5 c6e9ebe669f784411b364fd9be3cd8fb spice-3.5.5.ebuild 1464
-RMD160 ef2e6967e5e525d0981db5e94195d7727929dfc3 spice-3.5.5.ebuild 1464
-SHA256 0d27ee69ead756094f12d1da31eeaf82b17a2b8b65567991846638decf7bf451 spice-3.5.5.ebuild 1464
-MISC ChangeLog 2214 RMD160 75f804b4afbc27f1cd305afb731064ce24898c56 SHA1 1f41c27ad037812ef0c8f34d91719adf19ae0dfb SHA256 f79cbc8125996c6f505d6ffab4a9c53accdb559ad612a597af1b7596a2b1a70b
-MD5 da7fe72549aa18e0f30ac238d88e8a59 ChangeLog 2214
-RMD160 75f804b4afbc27f1cd305afb731064ce24898c56 ChangeLog 2214
-SHA256 f79cbc8125996c6f505d6ffab4a9c53accdb559ad612a597af1b7596a2b1a70b ChangeLog 2214
+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
 MISC metadata.xml 690 RMD160 9e8afed9996cc2c11388638bd0129b2ea50062f1 SHA1 0f98743fa250170c25ed97309f0a1c39d0624f8d SHA256 8b9ef70c8bfc12f9b87bca110e52da6e9e4cab3436fdb5552e152fc9da5fe8f3
 MD5 b4997f9636fa7fa763f0d920bef9b2c3 metadata.xml 690
 RMD160 9e8afed9996cc2c11388638bd0129b2ea50062f1 metadata.xml 690

diff --git a/sci-electronics/spice/spice-3.5.5.ebuild b/sci-electronics/spice/spice-3.5.5.ebuild
index 06cdd57cf6ccc83199b49965ae74d0c153d80b60..3395852ebeb1f1cbdc12914c11aa6c23ee7a518b 100644 (file)
--- a/sci-electronics/spice/spice-3.5.5.ebuild
+++ b/sci-electronics/spice/spice-3.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4 2006/05/21 22:20:52 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5.ebuild,v 1.5 2007/03/12 18:21:20 calchan Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,16 +28,18 @@ src_unpack() {
        replace-flags -O* -O1
 
        unpack ${A}
-       cd ${S}/conf
+       cd ${S}
+       # Avoid re-creating WORKDIR due to stupid mtime
+       touch ..
+
        [ -z $EDITOR ] || EDITOR="vim"
-#      cp linux{,.orig}
-       sed -e "s:termcap:ncurses:g" \
+       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:/usr/local/spice:/usr:g" \
-               -i.orig linux
-       cd ${S}
+               conf/linux
+       sed -i -e "s:head -1:head -n 1:" util/build
        epatch ${FILESDIR}/${P}-gcc-4.1.patch
 }
 
@@ -49,7 +51,7 @@ src_compile() {
 src_install() {
        cd ${S}
        # install binaries
-       dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod}
+       dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die
        newbin obj/bin/help spice.help
        dosym /usr/bin/spice3 /usr/bin/spice
        # install runtime stuff