diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2003-11-26 09:17:45 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2003-11-26 09:17:45 +0000 |
| commit | e0582e0847c067cf46917e87b904504378a4b1e3 (patch) | |
| tree | 967d5124706cd4573276bb23934133ddcc3e4a21 /app-sci/magic | |
| parent | fix save directory permissions so saving games is allowed (bug 33573); more e... (diff) | |
| download | gentoo-2-e0582e0847c067cf46917e87b904504378a4b1e3.tar.gz gentoo-2-e0582e0847c067cf46917e87b904504378a4b1e3.tar.bz2 gentoo-2-e0582e0847c067cf46917e87b904504378a4b1e3.zip | |
Fixing problem with CVS headers, see bug 34371
Diffstat (limited to 'app-sci/magic')
| -rw-r--r-- | app-sci/magic/Manifest | 4 | ||||
| -rw-r--r-- | app-sci/magic/files/magic-7.1-misc.patch | 6 | ||||
| -rw-r--r-- | app-sci/magic/magic-7.1-r2.ebuild | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app-sci/magic/Manifest b/app-sci/magic/Manifest index 41f8c7015af8..f198c030101c 100644 --- a/app-sci/magic/Manifest +++ b/app-sci/magic/Manifest @@ -1,12 +1,12 @@ MD5 c2a27d44d0be46e39aba2a6390466cb4 magic-7.1.ebuild 1117 MD5 5b846a413bc6a8748980558985636cad magic-7.1-r1.ebuild 1203 MD5 10384643c6c5f54cd10d4daf78713d63 ChangeLog 1335 -MD5 cc7f5279ad317c2808b9d764d2447821 magic-7.1-r2.ebuild 1829 +MD5 54098f50027ee4007eb68d64c78a7dff magic-7.1-r2.ebuild 1912 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593 MD5 d8eb4daf3f4c752bf337ea47c9dc9d61 files/digest-magic-7.1 66 MD5 51ef467f914b14f163fb1ecfa092876d files/defs.mak-7.1 1895 -MD5 825f3fd749c20f40a910f335bedee943 files/magic-7.1-misc.patch 14570 +MD5 992da190c2a177e9c61c1fc564c49723 files/magic-7.1-misc.patch 14546 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r1 62 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r2 62 MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310 diff --git a/app-sci/magic/files/magic-7.1-misc.patch b/app-sci/magic/files/magic-7.1-misc.patch index 122b92d88a2f..7fad5879afac 100644 --- a/app-sci/magic/files/magic-7.1-misc.patch +++ b/app-sci/magic/files/magic-7.1-misc.patch @@ -424,13 +424,13 @@ diff -ru utils/flock.c magic-7.1/utils/flock.c name_time.tv_sec, name_time.tv_usec); if ((mfile = fopen(lock_buf, "w")) == NULL) ---- magic/proto.magic 2001-10-04 00:20:29.000000000 +0200 -+++ magic/proto.magic.new 2003-11-18 09:07:18.000000000 +0100 +--- magic/proto.magic 2003-11-26 10:08:48.000000000 +0100 ++++ magic/proto.magic.new 2003-11-26 10:12:36.000000000 +0100 @@ -1,12 +1,4 @@ -# $(CAD_HOME)/lib/sys/.magic -# System wide start up file for magic, defines default macros. -# --# rcsid $Header: /var/cvsroot/gentoo-x86/app-sci/magic/files/magic-7.1-misc.patch,v 1.1 2003/11/18 08:36:39 phosphan Exp $ +-# rcsid $NO_RCS_Header: /ufs/repository/magic/magic/proto.magic,v 1.4 2001/09/26 18:24:39 tim Exp $ -# #ifndef USE_NEW_MACROS -############################################################################### diff --git a/app-sci/magic/magic-7.1-r2.ebuild b/app-sci/magic/magic-7.1-r2.ebuild index e25348d27870..932959c88aa3 100644 --- a/app-sci/magic/magic-7.1-r2.ebuild +++ b/app-sci/magic/magic-7.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/magic-7.1-r2.ebuild,v 1.3 2003/11/18 08:36:39 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/magic-7.1-r2.ebuild,v 1.4 2003/11/26 09:17:40 phosphan Exp $ S=${WORKDIR}/${P} DESCRIPTION="The VLSI design CAD tool" @@ -28,6 +28,8 @@ src_unpack() { # some gcc 3.3 stuff, paths... cd ${S} + # work around cvs problem + sed -i 's/\$Header/\$NO_RCS_Header/' magic/proto.magic epatch ${FILESDIR}/${P}-misc.patch # Insert our idea of configuration file |