Uses system readline instead of its own and ncurses instead of termacp (bugUses system readline instead of its own and ncurses instead of termacp (bug #103105).

Package-Manager: portage-2.0.51.22-r2

5 files changed, 180 insertions, 2 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 8b23dba4f35b..bed7bb5c344d 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/magic
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.5 2005/07/09 02:16:48 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.6 2005/08/22 17:08:24 phosphan Exp $
+
+*magic-7.1-r5 (22 Aug 2005)
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +files/defs.mak-7.1-r3,
+  +magic-7.1-r5.ebuild:
+  Uses system readline instead of its own and ncurses instead of termacp (bug
+  #103105).
 
 *magic-7.1-r4 (09 Jul 2005)
 
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 1def8641738b..3d879ad9347b 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,6 +1,7 @@
 MD5 4ec9889990ce937e71bedaffc3e6dceb magic-7.1-r4.ebuild 3207
 MD5 9f305e36a40e0eb526f74d30bc596def magic-7.1-r3.ebuild 2404
-MD5 e42735ee6e328ccf49d4ccd9f4fe7e52 ChangeLog 2687
+MD5 929397d0a90596fd02469feaaebdf9a2 magic-7.1-r5.ebuild 3303
+MD5 8e89e7ba09a8b685daff700a7d0b415d ChangeLog 2908
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593
 MD5 d7a32efd29c53033d57c233d7da01e8a files/magic-7.1-remove-decl.patch 488
@@ -8,7 +9,9 @@ MD5 3386112ab484d0dff56bbd07451f7cf6 files/README.Gentoo 533
 MD5 992da190c2a177e9c61c1fc564c49723 files/magic-7.1-misc.patch 14546
 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r3 62
 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r4 62
+MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r5 62
 MD5 0b93bab0d27faa7228d74cb25337d866 files/magic-7.1-ppc-endian.patch 704
 MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310
 MD5 0d0472ae43dbddd46bc658a75f0c3b9e files/defs.mak-7.1-r2 2108
+MD5 3d96e0ebbf34f375004880856ae13f69 files/defs.mak-7.1-r3 2019
 MD5 fdb38b03c3fbdbb89eff8081e9953744 files/10magic 14
diff --git a/sci-electronics/magic/files/defs.mak-7.1-r3 b/sci-electronics/magic/files/defs.mak-7.1-r3
new file mode 100644
index 000000000000..7d9b4f71b220
--- /dev/null
+++ b/sci-electronics/magic/files/defs.mak-7.1-r3
@@ -0,0 +1,58 @@
+# This file was auto-generated by running the scripts/config program. Feel free
+# to change the values in here to suit your needs. Beware that running scripts/config
+# again will overwrite any changes!
+
+SHELL                  = /bin/sh
+
+VERSION                = 7.1
+
+# Change CADDIR to install in a different place
+CADDIR                 = ${DESTDIR}/usr
+BINDIR                 = ${CADDIR}/bin
+LIBDIR                 = ${CADDIR}/lib
+MANDIR                 = ${CADDIR}/share/man
+SYSDIR                 = ${CADDIR}/share/magic/sys
+SCMDIR                 = ${CADDIR}/share/magic/scm
+
+SCRIPTS                = ${MAGICDIR}/scripts
+
+# Define your make environment
+# MAKE                   = gmake
+# MAKEFLAGS              = -j4
+
+RM                     = rm -f
+CP                     = cp
+AR                     = ar
+ARFLAGS                = crv
+LD                     = ld -r
+RANLIB                 = ranlib
+
+CC                     = gcc
+CPP                    = /lib/cpp -P -traditional
+CPPFLAGS               = -I. -I${MAGICDIR} 
+DFLAGS                 = -Dlinux -DSYSV -DF_OK=0 -DW_OK=2 -D__NO_STRING_INLINES -DISC -DFILE_LOCKS -DNONMANHATTAN
+CFLAGS                 = -g -march=i486 
+# These CFLAGS may include switches for an optimized compile
+# CFLAGS                 = -g  -m486 -O6 -fomit-frame-pointer
+
+READLINE_DEFS          = 
+READLINE_LIBS          =  -lreadline -lncurses
+
+DEPEND_FLAG            = -MM
+DEPEND_FILE            = Depend
+
+GR_CFLAGS              = -DX11 -DXLIB -I/usr/X11R6/include
+GR_LIBS                =  -lX11 -L/usr/X11R6/lib/ -lbsd
+GR_SRCS                =  ${X11_SRCS}
+GR_HELPER_SRCS         =  ${X11HELPER_SRCS}
+GR_HELPER_PROG         =  ${X11HELP_PROG}
+
+# Set your .magic to be installed
+#   proto.magic     - original
+#   proto.magic.new - with X11 extensions
+#   proto.magic-scm - load scheme extensions
+DOT_MAGIC_FILES        = proto.magic.new proto.magic-scm
+
+OBJS      = ${SRCS:.c=.o}
+LIB_OBJS  = ${LIB_SRCS:.c=.o}
+CLEANS    = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}
diff --git a/sci-electronics/magic/files/digest-magic-7.1-r5 b/sci-electronics/magic/files/digest-magic-7.1-r5
new file mode 100644
index 000000000000..b5c06b5e7f42
--- /dev/null
+++ b/sci-electronics/magic/files/digest-magic-7.1-r5
@@ -0,0 +1 @@
+MD5 13364b77566f5b47fd3f2783e188d3df magic-7.1.tar.gz 3860487
diff --git a/sci-electronics/magic/magic-7.1-r5.ebuild b/sci-electronics/magic/magic-7.1-r5.ebuild
new file mode 100644
index 000000000000..f23f32478c52
--- /dev/null
+++ b/sci-electronics/magic/magic-7.1-r5.ebuild
@@ -0,0 +1,109 @@
+# 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-r5.ebuild,v 1.1 2005/08/22 17:08:24 phosphan Exp $
+
+inherit eutils 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=""
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	dev-lang/perl
+	>=app-shells/tcsh-6.10-r3"
+
+
+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}-r3 ${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/'
+
+	# Use ".magic-cad" rather than ".magic" as the config file to avoid
+	# conflicts with "sys-apps/file" (see bug #74592).
+	einfo 'Replacing occurences of ".magic" by ".magic-cad".'
+	cd ${S}
+	for i in extflat/*.c lisp/other/{*.c,Makefile.magic,:config} \
+		macros/*.c magic/{Makefile,.\#Makefile.1.6,proto.magic} \
+		magicusage/*.c main/*.c READ_ME scripts/config; do
+		sed -e 's/ .magic/ .magic-cad/' \
+			-e 's/".magic"/".magic-cad"/' \
+			-e 's%/.magic%/.magic-cad%' \
+			-i ${i} || die
+	done
+	rm -rf readline # we use the shared system library
+	rm */Depend # contains links to magic's readline
+}
+
+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}" ' \;
+	# Use ".magic" for the global config file.
+	cd ${D}/usr/share/magic/sys
+	mv .magic-cad .magic
+	dodoc ${FILESDIR}/README.Gentoo
+}
+
+pkg_postinst() {
+	ewarn 'On Gentoo systems, you should use "~/.magic-cad" as your personnal'
+	ewarn 'Magic startup file rather than "~/.magic". For more details, see'
+	ewarn '"README.Gentoo"'
+}