filename collision fix, fixed building on ppc

Package-Manager: portage-2.0.51.19

7 files changed, 148 insertions, 21 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 9a115794d568..30b6e85b8560 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-electronics/magic
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.2 2004/12/27 21:01:45 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.3 2005/04/21 20:54:56 wormo Exp $
+
+*magic-7.1-r3 (21 Apr 2005)
+
+  21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/magic-7.1-ppc-endian.patch, +files/magic-7.1-remove-decl.patch,
+  +magic-7.1-r3.ebuild:
+  Took out a conflicting declaration to fix compile under gcc3.4
+  Make it build on ppc by defining powerpc endianness in header
+  and getting correct CFLAGS into defs.mak
+  Fix file collisions caused by man pages with very generic names;
+  add "magic-" prefix to man page filenames
 
 *magic-7.1-r2 (27 Dec 2004)
 
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 3c467fb3e84e..c95d61e05573 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 87f78a6ab4e83ce8c8f06f291f536901 ChangeLog 1696
-MD5 3b7bf3c5c395909e0f4fd21afa22ef0f magic-7.1-r2.ebuild 1901
+MD5 07b7abefbcaa8e62bca7bd881ad715f1 ChangeLog 2163
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593
+MD5 a68280b04af10e6b996f5cdd2bc5c97c magic-7.1-r3.ebuild 2394
+MD5 628a35fe7ad99a36ba80ca321df7d034 magic-7.1-r2.ebuild 1898
 MD5 fd0c6a30a11d997a83b1142215a0de39 files/defs.mak-7.1 1887
-MD5 992da190c2a177e9c61c1fc564c49723 files/magic-7.1-misc.patch 14546
-MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r2 62
-MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310
+MD5 fdb38b03c3fbdbb89eff8081e9953744 files/10magic 14
 MD5 0b1ea7223162f5c38659ab26393d20ec files/defs.mak-7.1-r1 2098
 MD5 0d0472ae43dbddd46bc658a75f0c3b9e files/defs.mak-7.1-r2 2108
-MD5 fdb38b03c3fbdbb89eff8081e9953744 files/10magic 14
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB0Hg/I1lqEGTUzyQRAv2bAKCX50MalvD4Ku9zD6aicrdfQdbtFwCfcOby
-/sNjXoyvp/HcncRrtL9v57E=
-=Mc+o
------END PGP SIGNATURE-----
+MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r2 62
+MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310
+MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593
+MD5 992da190c2a177e9c61c1fc564c49723 files/magic-7.1-misc.patch 14546
+MD5 0b93bab0d27faa7228d74cb25337d866 files/magic-7.1-ppc-endian.patch 704
+MD5 d7a32efd29c53033d57c233d7da01e8a files/magic-7.1-remove-decl.patch 488
+MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r3 62
diff --git a/sci-electronics/magic/files/digest-magic-7.1-r3 b/sci-electronics/magic/files/digest-magic-7.1-r3
new file mode 100644
index 000000000000..b5c06b5e7f42
--- /dev/null
+++ b/sci-electronics/magic/files/digest-magic-7.1-r3
@@ -0,0 +1 @@
+MD5 13364b77566f5b47fd3f2783e188d3df magic-7.1.tar.gz 3860487
diff --git a/sci-electronics/magic/files/magic-7.1-ppc-endian.patch b/sci-electronics/magic/files/magic-7.1-ppc-endian.patch
new file mode 100644
index 000000000000..be88c2fac9d2
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.1-ppc-endian.patch
@@ -0,0 +1,26 @@
+diff -ur magic-7.1-orig/misc/magic.h magic-7.1/misc/magic.h
+--- magic-7.1-orig/misc/magic.h	2005-04-20 23:04:24.156667592 -0700
++++ magic-7.1/misc/magic.h	2005-04-19 21:59:28.000000000 -0700
+@@ -150,10 +150,6 @@
+ #define       IS_LITTLE_ENDIAN        /* Intel x86 processors. */
+ #endif
+ 
+-#ifdef	linux
+-#define	IS_LITTLE_ENDIAN	/* Intel x86 processors running Linux >=.99p7. */
+-#endif
+-
+ #ifdef	vax
+ #define	IS_LITTLE_ENDIAN	/* The good 'ol VAX. */
+ #endif
+@@ -203,6 +199,11 @@
+ #define	IS_LITTLE_ENDIAN	/* Digital Alpha AXP */
+ #endif
+ 
++#ifdef	powerpc
++#define	IS_BIG_ENDIAN	  /* PowerPC machines. */
++#endif
++
++
+ /* Well, how'd we do? */
+ 
+ #if	!defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN)
diff --git a/sci-electronics/magic/files/magic-7.1-remove-decl.patch b/sci-electronics/magic/files/magic-7.1-remove-decl.patch
new file mode 100644
index 000000000000..cae4d3fd4f75
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.1-remove-decl.patch
@@ -0,0 +1,12 @@
+diff -ur magic-7.1-orig/drc/DRCmain.c magic-7.1/drc/DRCmain.c
+--- magic-7.1-orig/drc/DRCmain.c	2005-04-19 17:14:11.211968512 -0700
++++ magic-7.1/drc/DRCmain.c	2005-04-19 17:14:36.386141456 -0700
+@@ -35,8 +35,6 @@
+ #include "drc/drc.h"
+ #include "undo/undo.h"
+ 
+-extern void TxPrintf(), TxError();
+-
+ /* The global variables defined below are parameters between
+  * the DRC error routines (drcPaintError and drcPrintError)
+  * and the higher-level routines that start up DRC error checks.
diff --git a/sci-electronics/magic/magic-7.1-r2.ebuild b/sci-electronics/magic/magic-7.1-r2.ebuild
index 1f3c0d0dd9e2..5545c0f4f277 100644
--- a/sci-electronics/magic/magic-7.1-r2.ebuild
+++ b/sci-electronics/magic/magic-7.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.1-r2.ebuild,v 1.1 2004/12/27 19:59:13 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.1-r2.ebuild,v 1.2 2005/04/21 20:54:56 wormo Exp $
 
 inherit eutils
 
diff --git a/sci-electronics/magic/magic-7.1-r3.ebuild b/sci-electronics/magic/magic-7.1-r3.ebuild
new file mode 100644
index 000000000000..7d68253f7d9d
--- /dev/null
+++ b/sci-electronics/magic/magic-7.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.1-r3.ebuild,v 1.1 2005/04/21 20:54:56 wormo Exp $
+
+inherit eutils
+inherit flag-o-matic
+
+DESCRIPTION="The VLSI design CAD tool"
+HOMEPAGE="http://vlsi.cornell.edu/magic/"
+SRC_URI="http://vlsi.cornell.edu/magic/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="sys-apps/findutils
+	dev-lang/perl
+	>=app-shells/tcsh-6.10-r3
+	sys-libs/libtermcap-compat"
+RDEPEND="sys-libs/libtermcap-compat"
+
+src_unpack() {
+	unpack ${A}
+
+	# Patch to use FHS paths
+	epatch ${FILESDIR}/${P}-fhs.patch
+
+	# Patch for GCC 3.2 compatibility
+	epatch ${FILESDIR}/${P}-gcc3.2.patch
+
+	# Add one more needed for GCC 3.4 (but earlier gcc won't mind)
+	epatch ${FILESDIR}/${P}-remove-decl.patch
+
+	# Fix endianness problem for ppc
+	epatch ${FILESDIR}/${P}-ppc-endian.patch
+
+	# 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
+	cp ${FILESDIR}/defs.mak-${PV}-r2 ${S}/defs.mak
+	strip-flags
+	sed -i  "/^CFLAGS/ s/=.*/= ${CFLAGS}/;" ${S}/defs.mak
+
+	scripts/makedbh database/database.h.in database/database.h
+
+	# Clean up all the pre-GCC-3.2 preprocessor directives
+	einfo "Cleansing preprocessor directives"
+	find ./ -name "*.[ch]" | xargs -n 1 perl -pi -e 's/^\#endif..*$/\#endif/'
+	find ./ -name "*.[ch]" | xargs -n 1 perl -pi -e 's/^\#else..*$/\#else/'
+}
+
+src_compile() {
+	# this program does not like optimizations or parallel builds
+	make || die
+	egrep -q "^make.*Error" make.log && die "Error while compiling - please add ${S}/make.log to your error report."
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/10magic
+	keepdir /var/lock/magic
+	chmod +t ${D}/var/lock/magic
+	chmod ugo+rwx ${D}/var/lock/magic
+	cd ${D}/usr/lib/magic
+	mv * ${D}/usr/share/magic/
+	cd ${D}/usr/lib
+	mv *.h *.a magic/
+	ln -s ../../share/magic/sys magic/sys
+	ln -s ../../share/magic/scm magic/scm
+	ln -s ../../share/magic/tutorial magic/tutorial
+
+	# try to make man page names unique (many are so generic they collide)
+	cd ${D}/usr/share/man
+	find . -type f ! -name "*magic*" -exec \
+		sh -c 'F=`echo {} | sed -e "s:\(man.\)/:\1/magic-:;"` ; mv "{}" "${F}" ' \;
+}