Cleaned up stale files following complete stabilization of magic-7.4.19.

(Portage version: 2.1.1_pre4-r1)
 (Unsigned Manifest commit)

16 files changed, 4 insertions, 965 deletions

diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index fe854c9e1e2a..a747f17cc2df 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,58 +1,7 @@
-AUX 10magic 14 RMD160 feae33768231cd762ee844fe04596c0648b8548f SHA1 91c94265cad6d5c8209e2e286ccd0018372870ad SHA256 ac6e4ababf5a44a20ed7b46812dff80570cb7a5e87dd64fc0d5c1d00b60dc65b
-MD5 fdb38b03c3fbdbb89eff8081e9953744 files/10magic 14
-RMD160 feae33768231cd762ee844fe04596c0648b8548f files/10magic 14
-SHA256 ac6e4ababf5a44a20ed7b46812dff80570cb7a5e87dd64fc0d5c1d00b60dc65b files/10magic 14
-AUX README.Gentoo 533 RMD160 4cb6260c28577ff08497fc326e335559da158275 SHA1 067effb956f7ff36abf367f4814f4300dc663fea SHA256 f8b57c954e9e67e28439d0d95f0c3af4111a550e067d203abcc4e688fb7457e6
-MD5 3386112ab484d0dff56bbd07451f7cf6 files/README.Gentoo 533
-RMD160 4cb6260c28577ff08497fc326e335559da158275 files/README.Gentoo 533
-SHA256 f8b57c954e9e67e28439d0d95f0c3af4111a550e067d203abcc4e688fb7457e6 files/README.Gentoo 533
-AUX defs.mak-7.1-r2 2108 RMD160 e66ab5847cebda77cdcfa09e714a86d376facee8 SHA1 d7bb5fba6fbb1e62b8268bedb570730a861166f7 SHA256 5519f6140929e15c58f94537f91486490e1661af51f6ecd4244767e407ff03bb
-MD5 0d0472ae43dbddd46bc658a75f0c3b9e files/defs.mak-7.1-r2 2108
-RMD160 e66ab5847cebda77cdcfa09e714a86d376facee8 files/defs.mak-7.1-r2 2108
-SHA256 5519f6140929e15c58f94537f91486490e1661af51f6ecd4244767e407ff03bb files/defs.mak-7.1-r2 2108
-AUX defs.mak-7.1-r3 2019 RMD160 f9e8c0060ce575c61006ae08822541d02ec7dfc9 SHA1 b721120861bf632ce4bb3d8d8f2811e9441c207e SHA256 00800c8663af73480bdfbd5bacd562d777d024f373f4ebf20c3328150d5011ba
-MD5 3d96e0ebbf34f375004880856ae13f69 files/defs.mak-7.1-r3 2019
-RMD160 f9e8c0060ce575c61006ae08822541d02ec7dfc9 files/defs.mak-7.1-r3 2019
-SHA256 00800c8663af73480bdfbd5bacd562d777d024f373f4ebf20c3328150d5011ba files/defs.mak-7.1-r3 2019
-AUX magic-7.1-fhs.patch 1310 RMD160 e647ad998eeab6bc814a52ea82026785174ceab8 SHA1 249170ea7b6d7fb27108dac968237a88cacb632c SHA256 7e2c257c19da9920342fcbe0636df9614d6797daf00fe2044b405f743855f806
-MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310
-RMD160 e647ad998eeab6bc814a52ea82026785174ceab8 files/magic-7.1-fhs.patch 1310
-SHA256 7e2c257c19da9920342fcbe0636df9614d6797daf00fe2044b405f743855f806 files/magic-7.1-fhs.patch 1310
-AUX magic-7.1-gcc3.2.patch 593 RMD160 cce5040ed07fe0fa2d692a6b46ec3b977d010268 SHA1 228f85eaf76146040452b015fa51469903411db5 SHA256 f1fa914f8cda82396d439cd555312f2a5f96449f64e540abfd089fe3c4218406
-MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593
-RMD160 cce5040ed07fe0fa2d692a6b46ec3b977d010268 files/magic-7.1-gcc3.2.patch 593
-SHA256 f1fa914f8cda82396d439cd555312f2a5f96449f64e540abfd089fe3c4218406 files/magic-7.1-gcc3.2.patch 593
-AUX magic-7.1-misc.patch 14546 RMD160 292c40de99a8a59dc142dedc2d023818459d98e9 SHA1 ad5f34dabf3e7c9f77a7cec8a32bfb478ba7114a SHA256 0a03ac9c161b2d9bdb7cd6f8a7101edf739c4e3f7b6e3d04c8d7fd2e9929dad1
-MD5 992da190c2a177e9c61c1fc564c49723 files/magic-7.1-misc.patch 14546
-RMD160 292c40de99a8a59dc142dedc2d023818459d98e9 files/magic-7.1-misc.patch 14546
-SHA256 0a03ac9c161b2d9bdb7cd6f8a7101edf739c4e3f7b6e3d04c8d7fd2e9929dad1 files/magic-7.1-misc.patch 14546
-AUX magic-7.1-ppc-endian.patch 704 RMD160 3b2ab58feb3d889fc27864f7ad8cc0232165c7d3 SHA1 1b396eedf3b77f719ca311b87b4bbd80f57c861a SHA256 9232ba8d103ecbbad01ac0cdb371fb43e73a0749a86066eef8d2d5d65c5224e3
-MD5 0b93bab0d27faa7228d74cb25337d866 files/magic-7.1-ppc-endian.patch 704
-RMD160 3b2ab58feb3d889fc27864f7ad8cc0232165c7d3 files/magic-7.1-ppc-endian.patch 704
-SHA256 9232ba8d103ecbbad01ac0cdb371fb43e73a0749a86066eef8d2d5d65c5224e3 files/magic-7.1-ppc-endian.patch 704
-AUX magic-7.1-remove-decl.patch 488 RMD160 7257e6a95aa59f643d1ecaa61ddd06afa95a1c8b SHA1 c8401526d08d5f4dbe27dc2852ed638deca9afd8 SHA256 c5df381a1f85a0a225f6492f24b96d5b58dc7497aa584a5c84e0180d1ca297e4
-MD5 d7a32efd29c53033d57c233d7da01e8a files/magic-7.1-remove-decl.patch 488
-RMD160 7257e6a95aa59f643d1ecaa61ddd06afa95a1c8b files/magic-7.1-remove-decl.patch 488
-SHA256 c5df381a1f85a0a225f6492f24b96d5b58dc7497aa584a5c84e0180d1ca297e4 files/magic-7.1-remove-decl.patch 488
 DIST 2002a.tar.gz 6601961 RMD160 3eb7e61999b032dc47bddc3398543f4d4cde3adf SHA1 908160476c9cddcedfb8a73f78f67f2c66480cc2 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19
-DIST magic-7.1.tar.gz 3860487
-DIST magic-7.4.14.tgz 3605289 RMD160 818c7eb779805d2dff50c53777b11ab8d9a92ec3 SHA256 d845db9764ca0c045bf01e905f45f1be5b68431f9d89622e5506512fba23fe7a
-DIST magic-7.4.16.tgz 3600320 RMD160 e1088db038dd0edd04f51e8a99d7b8e8d72b0786 SHA256 9ba3f258caa30b68202f63ced6de0783459b709e53f9d5a3433beeac96b9d110
 DIST magic-7.4.19.tgz 3600834 RMD160 3ddd8a1389dc1ae1396ecf6cb89bbca832b5982d SHA1 979e44c562480cb3f121433a15b7ecc8eade8ae8 SHA256 04e1f512867e9c06feb8937006b69eed3bd8973664b4a024aa8aaff1f02c113e
 DIST magic-7.4.22.tgz 3602058 RMD160 1a298239c4fbaf8dae851bfbc46a0284ae74e24c SHA1 89e08c1890899025eb5cc85544ebd517d5283c77 SHA256 ad53d7592313865f393c2b34d5cd98c7982e3b7b718b01d8a6bfa7cf978c18f4
 DIST magic-7.4.24.tgz 3601300 RMD160 c070e9609a96669acea4d2bbb51988d5ab7240b2 SHA1 fa4c40db289535d0bced2f3cd1662cc51f565098 SHA256 bfd4500216e727d4a31775288f202c387e3b5f6fcb544d9d0d9f760b27013965
-EBUILD magic-7.1-r5.ebuild 3299 RMD160 f39b4f214c646089ba91258fb31610832eea75ee SHA1 1129a7a8bdd41d94cfdc14e14260eba22304d869 SHA256 e62b3a4a640c9cbfd7765b31705f94e216b38058e92efb63a221dfe5971dbf1f
-MD5 271ff83c77f449c1bb0104a8e99d54d8 magic-7.1-r5.ebuild 3299
-RMD160 f39b4f214c646089ba91258fb31610832eea75ee magic-7.1-r5.ebuild 3299
-SHA256 e62b3a4a640c9cbfd7765b31705f94e216b38058e92efb63a221dfe5971dbf1f magic-7.1-r5.ebuild 3299
-EBUILD magic-7.4.14.ebuild 1342 RMD160 dccc596fcba28e1a1ae36fc56fd7971c7e153b2e SHA1 471a15673b3434f5f81d27736f3fa758813a3171 SHA256 9be039a0d2ec923a487ae8786f031cdfb880745d5e1949d304f24ec077883266
-MD5 b50146a6af2fdd353da207ab7ce9fb14 magic-7.4.14.ebuild 1342
-RMD160 dccc596fcba28e1a1ae36fc56fd7971c7e153b2e magic-7.4.14.ebuild 1342
-SHA256 9be039a0d2ec923a487ae8786f031cdfb880745d5e1949d304f24ec077883266 magic-7.4.14.ebuild 1342
-EBUILD magic-7.4.16.ebuild 1383 RMD160 e2df53d387afed43801d62da9507e7a537821bdf SHA1 fa918f7868fa3b2722ae687e42d80c71d8fc86cf SHA256 2d0281dc99852e28001fe836e8e5ebca058964fceab7b6a19cd827755c01630f
-MD5 04ae798a82fe663374860898e6205c6c magic-7.4.16.ebuild 1383
-RMD160 e2df53d387afed43801d62da9507e7a537821bdf magic-7.4.16.ebuild 1383
-SHA256 2d0281dc99852e28001fe836e8e5ebca058964fceab7b6a19cd827755c01630f magic-7.4.16.ebuild 1383
 EBUILD magic-7.4.19.ebuild 1337 RMD160 22ab4e3904d94ba55733d2111f1fe37843d62f36 SHA1 f56122ceab84f1da6aad73f0b9cb88605a9f6f0c SHA256 d829885a960fee7015b84c470525a95a3a84283e315b56c0ed7b507e8fd2a177
 MD5 067b1e1aba5e3e6cdb0365e801aaed28 magic-7.4.19.ebuild 1337
 RMD160 22ab4e3904d94ba55733d2111f1fe37843d62f36 magic-7.4.19.ebuild 1337
@@ -65,23 +14,14 @@ EBUILD magic-7.4.24.ebuild 1342 RMD160 edf8fde452094a7508e67806f08731134c97c5b6
 MD5 442aaa5e7e20dc3e8530b4fb433590b8 magic-7.4.24.ebuild 1342
 RMD160 edf8fde452094a7508e67806f08731134c97c5b6 magic-7.4.24.ebuild 1342
 SHA256 600849258aa5378e8284ee988e828d748ef231427f64ee25b829df3d26809aa5 magic-7.4.24.ebuild 1342
-MISC ChangeLog 4192 RMD160 05879dc56f738ca9bb6bfdeffc5e0f62907b7ed9 SHA1 5bbed6ef0218fbfb3600f02e31aea4a836dc41e6 SHA256 be1209ab971e683bc2f50ee7a97c5cf60dddecebf15c96b3a1295f41d74e030c
-MD5 06412d67cb105b1e78705574aa72f0d5 ChangeLog 4192
-RMD160 05879dc56f738ca9bb6bfdeffc5e0f62907b7ed9 ChangeLog 4192
-SHA256 be1209ab971e683bc2f50ee7a97c5cf60dddecebf15c96b3a1295f41d74e030c ChangeLog 4192
+MISC ChangeLog 4642 RMD160 a1b27e67e0eb38e42b142e97a363ee3c6b33c0b5 SHA1 b602825e2b4ee5a10d7cdcc6d5c26a4dedd1bc6c SHA256 417587d60c5b219788fff33f48452d51b13a37720be9926f9ed8a7ba1ac2e828
+MD5 728d9b2ff8fff06feedc2bae88de3681 ChangeLog 4642
+RMD160 a1b27e67e0eb38e42b142e97a363ee3c6b33c0b5 ChangeLog 4642
+SHA256 417587d60c5b219788fff33f48452d51b13a37720be9926f9ed8a7ba1ac2e828 ChangeLog 4642
 MISC metadata.xml 900 RMD160 2eadae625fcf32b2b3c16cc5dea80123066b943c SHA1 015acb62eb2b6ba91c08ae1954a5bddef8d547d4 SHA256 a53b73f34be6d5dff3316ac95d407f45b7272a4934420b21cf4ca2ea81b153da
 MD5 6a9b4b4978398d58fc6b039eae3fad5d metadata.xml 900
 RMD160 2eadae625fcf32b2b3c16cc5dea80123066b943c metadata.xml 900
 SHA256 a53b73f34be6d5dff3316ac95d407f45b7272a4934420b21cf4ca2ea81b153da metadata.xml 900
-MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r5 62
-RMD160 0967f6880347e80e6747e2b23a2678ab33e38d48 files/digest-magic-7.1-r5 62
-SHA256 bdd76902aa26a22859049403d2acfb0c3fb32cc94bdc9a31f31f0236feac267e files/digest-magic-7.1-r5 62
-MD5 c08d5d025d269cebe0eac7f16f2214c2 files/digest-magic-7.4.14 452
-RMD160 e01900338c0dd2388c31fdda1ed3548ff3e1e2c7 files/digest-magic-7.4.14 452
-SHA256 07335fdd3436d08f00c79ae4607016bf88739806d611807dadaca62b46cfd084 files/digest-magic-7.4.14 452
-MD5 ebbf6c166b76b9c62f3bcee7fd6a7a75 files/digest-magic-7.4.16 452
-RMD160 b2c60cd282250645b2e7374cb0cb9af3f2880607 files/digest-magic-7.4.16 452
-SHA256 a59d14fac9be2650f183560fd4ca7cdcedeb750965c4fa05246a7ffca2c1e5da files/digest-magic-7.4.16 452
 MD5 baf2a94c4ddbf642be2b16e0a53b647d files/digest-magic-7.4.19 452
 RMD160 24088e1325fa1ee0179fb27a00a38985b1faa84b files/digest-magic-7.4.19 452
 SHA256 e8bb8646996473758a6b89f839f896b77a9f1c508fa4883a2e3aca4201f5364a files/digest-magic-7.4.19 452
diff --git a/sci-electronics/magic/files/10magic b/sci-electronics/magic/files/10magic
deleted file mode 100644
index 4e5909911f5d..000000000000
--- a/sci-electronics/magic/files/10magic
+++ /dev/null
@@ -1 +0,0 @@
-CAD_HOME=/usr
diff --git a/sci-electronics/magic/files/README.Gentoo b/sci-electronics/magic/files/README.Gentoo
deleted file mode 100644
index 965b12e0aba5..000000000000
--- a/sci-electronics/magic/files/README.Gentoo
+++ /dev/null
@@ -1,14 +0,0 @@
-Using Magic on Gentoo Linux
-
-To avoid conflicts with the "sys-apps/file" package, Magic
-("sci-electronics/magic") is patched on Gentoo systems to use "~/.magic-cad"
-rather than "~/.magic" as the user's personnal startup file. (The system-wide
-startup file remains "/usr/share/magic/sys/.magic".)
-
-This is done because the "file" program (a basic UNIX utility) uses "~/.magic"
-for its configuration, and will not function properly if this file contains
-Magic startup instructions.
-
---
-Olivier Fisette <ribosome@gentoo.org>
-8 Jul 2005
diff --git a/sci-electronics/magic/files/defs.mak-7.1-r2 b/sci-electronics/magic/files/defs.mak-7.1-r2
deleted file mode 100644
index 8e9cf4365c95..000000000000
--- a/sci-electronics/magic/files/defs.mak-7.1-r2
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-MODULES               += readline
-
-# 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} -I${MAGICDIR}/readline
-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          =  -L${MAGICDIR}/readline/readline -lreadline -ltermcap
-
-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/defs.mak-7.1-r3 b/sci-electronics/magic/files/defs.mak-7.1-r3
deleted file mode 100644
index 7d9b4f71b220..000000000000
--- a/sci-electronics/magic/files/defs.mak-7.1-r3
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
deleted file mode 100644
index b5c06b5e7f42..000000000000
--- a/sci-electronics/magic/files/digest-magic-7.1-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13364b77566f5b47fd3f2783e188d3df magic-7.1.tar.gz 3860487
diff --git a/sci-electronics/magic/files/digest-magic-7.4.14 b/sci-electronics/magic/files/digest-magic-7.4.14
deleted file mode 100644
index 1669cb3c1223..000000000000
--- a/sci-electronics/magic/files/digest-magic-7.4.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 103192e92655f022c5a4dfd756dd3705 2002a.tar.gz 6601961
-RMD160 3eb7e61999b032dc47bddc3398543f4d4cde3adf 2002a.tar.gz 6601961
-SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19 2002a.tar.gz 6601961
-MD5 86519a2571bc756068fc3638c3a5229b magic-7.4.14.tgz 3605289
-RMD160 818c7eb779805d2dff50c53777b11ab8d9a92ec3 magic-7.4.14.tgz 3605289
-SHA256 d845db9764ca0c045bf01e905f45f1be5b68431f9d89622e5506512fba23fe7a magic-7.4.14.tgz 3605289
diff --git a/sci-electronics/magic/files/digest-magic-7.4.16 b/sci-electronics/magic/files/digest-magic-7.4.16
deleted file mode 100644
index d7d7ed3a209c..000000000000
--- a/sci-electronics/magic/files/digest-magic-7.4.16
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 103192e92655f022c5a4dfd756dd3705 2002a.tar.gz 6601961
-RMD160 3eb7e61999b032dc47bddc3398543f4d4cde3adf 2002a.tar.gz 6601961
-SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19 2002a.tar.gz 6601961
-MD5 804acb292551a8f5be8772ce01cc3980 magic-7.4.16.tgz 3600320
-RMD160 e1088db038dd0edd04f51e8a99d7b8e8d72b0786 magic-7.4.16.tgz 3600320
-SHA256 9ba3f258caa30b68202f63ced6de0783459b709e53f9d5a3433beeac96b9d110 magic-7.4.16.tgz 3600320
diff --git a/sci-electronics/magic/files/magic-7.1-fhs.patch b/sci-electronics/magic/files/magic-7.1-fhs.patch
deleted file mode 100644
index 31764796257b..000000000000
--- a/sci-electronics/magic/files/magic-7.1-fhs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -uNr tmp/magic-7.1/misc/paths.h other/magic-7.1/misc/paths.h
---- tmp/magic-7.1/misc/paths.h	2001-04-16 09:43:43.000000000 -0500
-+++ other/magic-7.1/misc/paths.h	2002-04-30 23:07:48.000000000 -0500
-@@ -27,18 +27,18 @@
-  *
-  */
- 
--#define	EXT_PATH	"~cad/lib/magic/%s ~cad/lib/magic/tutorial"
--#define DOT_MAGIC_PATH	"~cad/lib/magic/sys ~ ."
-+#define	EXT_PATH	"~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial"
-+#define DOT_MAGIC_PATH	"~cad/share/lib/magic/sys ~ ."
- 
- /*
-  * Paths used by 'magic'.
-  *
-  */
--#define MAGIC_CMOS_PATH	"~cad/lib/magic/cmos ~cad/lib/magic/tutorial"
--#define MAGIC_NMOS_PATH	"~cad/lib/magic/nmos ~cad/lib/magic/tutorial"
--#define MAGIC_SYS_PATH	". ~cad/lib/magic/sys ~cad/lib/magic/sys/current"
--#define MAGIC_SYS_DOT	"~cad/lib/magic/sys/.magic"
--#define MAGIC_LIB_PATH	"~cad/lib/magic/%s ~cad/lib/magic/tutorial"
-+#define MAGIC_CMOS_PATH	"~cad/share/lib/magic/cmos ~cad/share/lib/magic/tutorial"
-+#define MAGIC_NMOS_PATH	"~cad/share/lib/magic/nmos ~cad/share/lib/magic/tutorial"
-+#define MAGIC_SYS_PATH	". ~cad/share/lib/magic/sys ~cad/share/lib/magic/sys/current"
-+#define MAGIC_SYS_DOT	"~cad/share/lib/magic/sys/.magic"
-+#define MAGIC_LIB_PATH	"~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial"
- #define HELPER_PATH	". ~cad/bin"	/* Used by graphics drivers */
- 
- /*
diff --git a/sci-electronics/magic/files/magic-7.1-gcc3.2.patch b/sci-electronics/magic/files/magic-7.1-gcc3.2.patch
deleted file mode 100644
index 7e7ef10c74a8..000000000000
--- a/sci-electronics/magic/files/magic-7.1-gcc3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr tmp/magic-7.1/textio/txInput.c other/magic-7.1/textio/txInput.c
---- tmp/magic-7.1/textio/txInput.c	2002-10-02 16:36:25.000000000 -0500
-+++ other/magic-7.1/textio/txInput.c	2002-10-02 16:36:59.000000000 -0500
-@@ -579,7 +579,7 @@
- 
-   free(line);
- 
--  matches = (completion_func) ? completion_matches(text, completion_func) : (char **)NULL;
-+  matches = (completion_func != NULL) ? completion_matches(text, completion_func) : (char **)NULL;
- 
-   /* If we match nothing, inhibit any matching, except when matching files */
-   rl_attempted_completion_over = (matches == (char **)NULL &&
diff --git a/sci-electronics/magic/files/magic-7.1-misc.patch b/sci-electronics/magic/files/magic-7.1-misc.patch
deleted file mode 100644
index 7fad5879afac..000000000000
--- a/sci-electronics/magic/files/magic-7.1-misc.patch
+++ /dev/null
@@ -1,464 +0,0 @@
-diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c
---- ext2sim/ext2sim-6.4.5/ext2sim.c	2003-11-17 11:15:49.000000000 +0100
-+++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c	2003-11-17 11:26:52.000000000 +0100
-@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <ctype.h>
--#include <varargs.h>
-+
- #include "magic.h"
-diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim6_3.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c
---- ext2sim/ext2sim-6.4.5/ext2sim6_3.c	2003-11-17 11:15:49.000000000 +0100
-+++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c	2003-11-17 11:26:52.000000000 +0100
-@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <ctype.h>
--#include <varargs.h>
-+
- #include "magic.h"
-diff -p1 -ur ext2sim/ext2sim.c magic-7.1/ext2sim/ext2sim.c
---- ext2sim/ext2sim.c	2003-11-17 11:15:49.000000000 +0100
-+++ magic-7.1/ext2sim/ext2sim.c	2003-11-17 11:26:52.000000000 +0100
-@@ -21,3 +21,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <stdlib.h>
--#include <varargs.h>
-+
- #include "misc/magic.h"
-diff -p1 -ur ext2spice/ext2spice-6.4.5/ext2spice.c magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c
---- ext2spice/ext2spice-6.4.5/ext2spice.c	2003-11-17 11:15:47.000000000 +0100
-+++ magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c	2003-11-17 11:26:50.000000000 +0100
-@@ -35,3 +35,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <ctype.h>
--#include <varargs.h>
-+
- #include "magic.h"
-diff -p1 -ur ext2spice/ext2spice.c magic-7.1/ext2spice/ext2spice.c
---- ext2spice/ext2spice.c	2003-11-17 11:15:47.000000000 +0100
-+++ magic-7.1/ext2spice/ext2spice.c	2003-11-17 12:00:37.000000000 +0100
-@@ -20,3 +20,4 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <ctype.h>
--#include <varargs.h>
-+#include <stdarg.h>
-+
- #include "misc/magic.h"
-@@ -1588,3 +1589,3 @@ int l, w;
- /* debugging stuff */
--#include <varargs.h>
-+
- 
-@@ -1592,7 +1593,5 @@ int l, w;
- 
--DBPRINT( va_alist )
--  va_dcl
-+DBPRINT( const char * fmt, ... )
-   {
-     va_list  args;
--    char     *fmt;
-     FILE     *fp;
-@@ -1601,5 +1600,4 @@ DBPRINT( va_alist )
-     if ( DBG ) {
--    va_start( args );
-+    va_start( args,fmt );
-     fp = stderr ;
--    fmt = va_arg( args, char * );
-     (void) vsprintf( buff, fmt, args );
-diff -p1 -ur extcheck/extcheck.c magic-7.1/extcheck/extcheck.c
---- extcheck/extcheck.c	2003-11-17 11:15:47.000000000 +0100
-+++ magic-7.1/extcheck/extcheck.c	2003-11-17 11:26:50.000000000 +0100
-@@ -30,3 +30,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <ctype.h>
--#include <varargs.h>
-+
- #include "misc/magic.h"
-diff -p1 -ur extflat/EFargs.c magic-7.1/extflat/EFargs.c
---- extflat/EFargs.c	2003-11-17 11:15:49.000000000 +0100
-+++ magic-7.1/extflat/EFargs.c	2003-11-17 12:01:36.000000000 +0100
-@@ -26,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <stdlib.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #ifdef SYSV
-diff -p1 -ur extflat/EFread.c magic-7.1/extflat/EFread.c
---- extflat/EFread.c	2003-11-17 11:15:49.000000000 +0100
-+++ magic-7.1/extflat/EFread.c	2003-11-17 11:50:53.000000000 +0100
-@@ -26,3 +26,4 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <stdlib.h>
--#include <varargs.h>
-+#include <stdarg.h>
-+
- #include "misc/magic.h"
-@@ -35,2 +36,5 @@ static char rcsid[] = "$Header: /ufs/rep
- 
-+
-+void efReadError(const char *fmt, ...);
-+
- /*
-@@ -536,5 +540,4 @@ start:
-     /*VARARGS1*/
--efReadError(fmt, va_alist)
--    char *fmt;
--    va_dcl
-+
-+void efReadError(const char *fmt, ...)
- {
-@@ -543,3 +546,3 @@ efReadError(fmt, va_alist)
-     (void) printf("%s, line %d: ", efReadFileName, efReadLineNum);
--    va_start(args);
-+    va_start(args,fmt);
-     vfprintf(stdout, fmt, args);
-diff -p1 -ur graphics/X11Helper.c magic-7.1/graphics/X11Helper.c
---- graphics/X11Helper.c	2003-11-17 11:15:48.000000000 +0100
-+++ magic-7.1/graphics/X11Helper.c	2003-11-17 12:11:09.000000000 +0100
-@@ -13,2 +13,4 @@
- 
-+#define X11HELP_PROG "XHelper7"
-+
- #include <stdio.h>
-diff -p1 -ur graphics/grMain.c magic-7.1/graphics/grMain.c
---- graphics/grMain.c	2003-11-17 11:15:48.000000000 +0100
-+++ magic-7.1/graphics/grMain.c	2003-11-17 11:26:51.000000000 +0100
-@@ -122,3 +122,3 @@ static char rcsid[]="$Header: /ufs/repos
- #ifndef	NO_VARARGS
--#include <varargs.h>
-+
- #endif
-diff -p1 -ur graphics/grX11su1.c magic-7.1/graphics/grX11su1.c
---- graphics/grX11su1.c	2003-11-17 11:15:48.000000000 +0100
-+++ magic-7.1/graphics/grX11su1.c	2003-11-17 12:13:22.000000000 +0100
-@@ -19,2 +19,5 @@
-  */
-+
-+#define X11HELP_PROG "XHelper7"
-+
- #define HIRES
-diff -p1 -ur lisp/other/txOutput.c magic-7.1/lisp/other/txOutput.c
---- lisp/other/txOutput.c	2003-11-17 11:15:47.000000000 +0100
-+++ magic-7.1/lisp/other/txOutput.c	2003-11-17 11:26:49.000000000 +0100
-@@ -41,3 +41,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #ifndef	NO_VARARGS
--#include <varargs.h>
-+
- #endif
-diff -p1 -ur mpack/magicStubs.c magic-7.1/mpack/magicStubs.c
---- mpack/magicStubs.c	2003-11-17 11:15:48.000000000 +0100
-+++ magic-7.1/mpack/magicStubs.c	2003-11-17 12:23:32.000000000 +0100
-@@ -55,5 +55,5 @@ void SigDisableInterrupts(){}
- /*VARARGS1*/
--void
-+/*void
- TxError(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
--char *format;
-+const char *format;
- {
-@@ -64,5 +64,5 @@ char *format;
- }
--
-+*/
- /*VARARGS1*/
--void
-+/*void
- TxPrintf(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-@@ -73,3 +73,3 @@ char *format;
- }
--
-+*/
- void
-diff -p1 -ur tech/tech.h magic-7.1/tech/tech.h
---- tech/tech.h	2003-11-17 11:15:47.000000000 +0100
-+++ magic-7.1/tech/tech.h	2003-11-17 11:53:25.000000000 +0100
-@@ -25,2 +25,2 @@ typedef int SectionID;		/* Mask set by T
- extern char *TechDefault;	/* Name of default technology */
--extern void TechError();
-+extern void TechError(const char *fmt, ...);
-diff -p1 -ur textio/textio.h magic-7.1/textio/textio.h
---- textio/textio.h	2003-11-17 11:15:50.000000000 +0100
-+++ magic-7.1/textio/textio.h	2003-11-17 12:19:56.000000000 +0100
-@@ -31,6 +31,6 @@
- /* printing procedures */
--extern void TxPrintf();
-+extern void TxPrintf(const char*, ...);
- extern bool TxPrintOn();  	/* enables TxPrintf output */
- extern bool TxPrintOff();	/* disables TxPrintf output */
--extern void TxError();
-+extern void TxError(const char *, ...);
- extern void TxFlush();
-diff -p1 -ur textio/textioInt.h magic-7.1/textio/textioInt.h
---- textio/textioInt.h	2003-11-17 11:15:50.000000000 +0100
-+++ magic-7.1/textio/textioInt.h	2003-11-17 12:16:13.000000000 +0100
-@@ -58,2 +58,2 @@ typedef struct {
- extern int TxGetInputEvent();
--extern void txFprintfBasic();
-+extern void txFprintfBasic(FILE *, const char*, ...);
-diff -p1 -ur textio/txOutput.c magic-7.1/textio/txOutput.c
---- textio/txOutput.c	2003-11-17 11:15:50.000000000 +0100
-+++ magic-7.1/textio/txOutput.c	2003-11-17 12:21:19.000000000 +0100
-@@ -18,2 +18,4 @@
- 
-+#include <stdarg.h>
-+
- #ifndef lint
-@@ -44,3 +46,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #ifndef	NO_VARARGS
--#include <varargs.h>
-+
- #endif
-@@ -84,12 +86,7 @@ static bool txPrintFlag = TRUE;
- void
--txFprintfBasic(va_alist)
--va_dcl
-+txFprintfBasic(FILE *f, const char * fmt, ...)
- {
-     va_list args;
--    char *fmt;
--    FILE *f;
- 
--    va_start(args);
--    f = va_arg(args, FILE *);
--    fmt = va_arg(args, char *);
-+    va_start(args, fmt);
-     (void) GrVfprintf(f, fmt, args);
-@@ -137,7 +134,5 @@ txFprintfBasic(f, format, a1, a2, a3, a4
- void
--TxPrintf(va_alist)
--va_dcl
-+TxPrintf(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
-     FILE *f;
-@@ -158,4 +153,3 @@ va_dcl
- 	    TxUnPrompt();
--	    va_start(args);
--	    fmt = va_arg(args, char *);
-+	    va_start(args, fmt);
- 	    (void) GrVfprintf(f, fmt, args);
-@@ -166,4 +160,3 @@ va_dcl
- 	{
--	    va_start(args);
--	    fmt = va_arg(args, char *);
-+	    va_start(args, fmt);
- 	    (void) GrVfprintf(f, fmt, args);
-@@ -308,7 +301,5 @@ TxFlush()
- void
--TxError(va_alist)
--va_dcl
-+TxError(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
-     FILE *f;
-@@ -323,4 +314,3 @@ va_dcl
- 	TxUnPrompt();
--	va_start(args);
--	fmt = va_arg(args, char *);
-+	va_start(args, fmt);
- 	(void) GrVfprintf(f, fmt, args);
-@@ -330,4 +320,3 @@ va_dcl
-     else {
--	va_start(args);
--	fmt = va_arg(args, char *);
-+	va_start(args,fmt);
- 	(void) GrVfprintf(f, fmt, args);
-diff -p1 -ur utils/LIBtextio.c magic-7.1/utils/LIBtextio.c
---- utils/LIBtextio.c	2003-11-17 11:15:48.000000000 +0100
-+++ magic-7.1/utils/LIBtextio.c	2003-11-17 12:25:20.000000000 +0100
-@@ -19,2 +19,4 @@
- 
-+#include <stdarg.h>
-+
- #ifndef	lint
-@@ -24,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep
- #include <stdio.h>
--#include <varargs.h>
-+
- 
-@@ -67,5 +69,3 @@ TxGetLine(buf, size)
-     /*VARARGS*/
--TxError(fmt, va_alist)
--    char *fmt;
--    va_dcl
-+TxError(const char *fmt, ...)
- {
-@@ -75,3 +75,3 @@ TxError(fmt, va_alist)
-     (void) fflush(stderr);
--    va_start(ap);
-+    va_start(ap,fmt);
-     vfprintf(stderr, fmt, ap);
-@@ -98,5 +98,3 @@ TxError(fmt, va_alist)
-     /*VARARGS*/
--TxPrintf(fmt, va_alist)
--    char *fmt;
--    va_dcl
-+TxPrintf(const char *fmt, ...)
- {
-@@ -106,3 +104,3 @@ TxPrintf(fmt, va_alist)
-     (void) fflush(stdout);
--    va_start(ap);
-+    va_start(ap,fmt);
-     vfprintf(stdout, fmt, ap);
-diff -p1 -ur windows/windCmdAM.c magic-7.1/windows/windCmdAM.c
---- windows/windCmdAM.c	2003-11-17 11:15:50.000000000 +0100
-+++ magic-7.1/windows/windCmdAM.c	2003-11-17 12:29:08.000000000 +0100
-@@ -304,6 +304,3 @@ windFilesCmd(w, cmd)
- 	    } else {
--		if (errno < sys_nerr)
--		    TxError("file descriptor %d: %s\n", fd, STRERROR(errno));
--		else
--		    TxError("file descriptor %d: unknown error\n", fd);
-+		TxError("file descriptor %d: %s\n", fd, strerror(errno));
- 	    }
---- tech/tech.c	2003-11-17 13:18:16.000000000 +0100
-+++ tech/tech.c.new	2003-11-17 13:20:13.000000000 +0100
-@@ -22,6 +22,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdarg.h>
- #include "misc/magic.h"
- #include "utils/geometry.h"
- #include "utils/utils.h"
-@@ -30,10 +31,6 @@
- #include "graphics/graphics.h"
- #include "utils/malloc.h"
- 
--#ifndef NO_VARARGS
--#include <varargs.h>
--#endif  NO_VARARGS
--
- global char *TechDefault = NULL;
- 
- int techLineNumber;
-@@ -415,15 +412,12 @@
-  /*VARARGS0*/
- 
- void
--TechError(va_alist)
--va_dcl
-+TechError(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
- 
-     TechPrintLine();
--    va_start(args);
--    fmt = va_arg(args, char *);
-+    va_start(args, fmt);
-     (void) GrVfprintf(stderr, fmt, args);
-     va_end(args);
- }
-diff -ru Makefile magic-7.1/Makefile
---- Makefile	2001-01-14 20:22:26.000000000 +0100
-+++ magic-7.1/Makefile	2003-11-17 17:05:41.000000000 +0100
-@@ -56,7 +56,7 @@
- 
- install-real: install-dirs
- 	for dir in ${INSTALL_CAD_DIRS}; do \
--		(cd $$dir && ${MAKE} install); done
-+		(cd $$dir && ${MAKE} DESTDIR="${DESTDIR}" install); done
- 
- install-dirs:
- 	${MAGICDIR}/scripts/mkdirs ${BINDIR} ${MANDIR} ${SYSDIR} ${SCMDIR}
-diff -ru misc/paths.h magic-7.1/misc/paths.h
---- misc/paths.h	2003-11-17 17:01:50.000000000 +0100
-+++ magic-7.1/misc/paths.h	2003-11-17 17:09:29.000000000 +0100
-@@ -27,18 +27,18 @@
-  *
-  */
- 
--#define	EXT_PATH	"~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial"
--#define DOT_MAGIC_PATH	"~cad/share/lib/magic/sys ~ ."
-+#define	EXT_PATH	"/usr/share/magic/%s /usr/share/magic/tutorial"
-+#define DOT_MAGIC_PATH	"/usr/share/magic/sys ~ ."
- 
- /*
-  * Paths used by 'magic'.
-  *
-  */
--#define MAGIC_CMOS_PATH	"~cad/share/lib/magic/cmos ~cad/share/lib/magic/tutorial"
--#define MAGIC_NMOS_PATH	"~cad/share/lib/magic/nmos ~cad/share/lib/magic/tutorial"
--#define MAGIC_SYS_PATH	". ~cad/share/lib/magic/sys ~cad/share/lib/magic/sys/current"
--#define MAGIC_SYS_DOT	"~cad/share/lib/magic/sys/.magic"
--#define MAGIC_LIB_PATH	"~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial"
-+#define MAGIC_CMOS_PATH	"/usr/share/magic/cmos /usr/share/magic/tutorial"
-+#define MAGIC_NMOS_PATH	"/usr/share/magic/nmos /usr/share/magic/tutorial"
-+#define MAGIC_SYS_PATH	". /usr/share/magic/sys /usr/share/magic/sys/current"
-+#define MAGIC_SYS_DOT	"/usr/share/magic/sys/.magic"
-+#define MAGIC_LIB_PATH	"/usr/share/magic/%s /usr/share/magic/tutorial"
- #define HELPER_PATH	". ~cad/bin"	/* Used by graphics drivers */
- 
- /*
-diff -ru utils/flock.c magic-7.1/utils/flock.c
---- utils/flock.c	2003-11-17 17:59:45.000000000 +0100
-+++ utils/flock.c	2003-11-17 18:01:01.000000000 +0100
-@@ -123,7 +123,7 @@
-     struct timeval name_time;
-     struct timezone dtime;
-     char cur_path[400];
--    char *cad_path;
-+    /* char *cad_path; */
-     char cad_buf[400];
-     FILE *lfile, *mfile;	/* local file and master file */
-     char *normal_cad = "~cad";
-@@ -132,7 +132,7 @@
-     /* environment variable CAD_HOME overrides, otherwise do tilde expansion	*/
-     /* on "~cad".								*/
- 
--    if ((cad_path = getenv("CAD_HOME")) == NULL)
-+    /* if ((cad_path = getenv("CAD_HOME")) == NULL)
-     {
- 	cad_path = cad_buf;
- 	if (PaConvertTilde (&normal_cad, &cad_path, 400) == -1)
-@@ -145,7 +145,7 @@
- 	}
-     }
- 
--    sprintf(lock_buf, "%s/flock", cad_path);
-+    */ strcpy(lock_buf,"/var/lock/magic");
-     dir = stat(lock_buf, &dirstat);
-     if((dir == -1) || !(( dirstat.st_mode) & S_IFDIR))
-     {
-@@ -161,7 +161,7 @@
- 
-     /* Open the master file to create a link in CAD_HOME/flock */
- 
--    sprintf(lock_buf, "%s/flock/lock_%u%u", cad_path,
-+    sprintf(lock_buf, "/var/lock/magic/lock_%u%u",
- 		name_time.tv_sec, name_time.tv_usec);
- 
-     if ((mfile = fopen(lock_buf, "w")) == NULL)
---- 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 $NO_RCS_Header: /ufs/repository/magic/magic/proto.magic,v 1.4 2001/09/26 18:24:39 tim Exp $
--#
- #ifndef USE_NEW_MACROS
--###############################################################################
--#  Default .magic macro file (original)
--###############################################################################
- echo ""
- macro s "select"
- macro S "select more"
-@@ -222,19 +214,13 @@
- macro XK_F11 "paint pc"
- macro XK_F12 "paint via"
- #endif
--#endif	(USE_NEW_MACROS)
-+#endif
- #ifndef NO_PLOT
--#
--# additions for plot package
--#
- plot parameter spoolCommand "echo use 'lpr -P%s -v -s -JMagic %s' to print plot"
- plot parameter directory "."
--#endif	(NO_PLOT)
-+#endif
- #ifndef NO_SCHEME_INTERPRETER
--#
--# additions for default scm path
--#
- define scm-library-path "~cad/lib/magic/scm"
- load-scm "default.scm"
- load-scm "layout.scm"
--#endif (NO_SCHEME_INTERPRETER)
-+#endif
diff --git a/sci-electronics/magic/files/magic-7.1-ppc-endian.patch b/sci-electronics/magic/files/magic-7.1-ppc-endian.patch
deleted file mode 100644
index be88c2fac9d2..000000000000
--- a/sci-electronics/magic/files/magic-7.1-ppc-endian.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index cae4d3fd4f75..000000000000
--- a/sci-electronics/magic/files/magic-7.1-remove-decl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-r5.ebuild b/sci-electronics/magic/magic-7.1-r5.ebuild
deleted file mode 100644
index cf87bce05750..000000000000
--- a/sci-electronics/magic/magic-7.1-r5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2006 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.3 2006/07/08 17:09:39 wormo 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"'
-}
diff --git a/sci-electronics/magic/magic-7.4.14.ebuild b/sci-electronics/magic/magic-7.4.14.ebuild
deleted file mode 100644
index e7e35e69fe5f..000000000000
--- a/sci-electronics/magic/magic-7.4.14.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.14.ebuild,v 1.1 2006/04/23 21:34:53 calchan Exp $
-
-DESCRIPTION="The VLSI design CAD tool."
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
-	ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
-	dev-tcltk/blt"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_compile() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/share \
-		--mandir=/usr/share/man \
-		|| die "configure failed"
-	cd ..
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc README README.Tcl TODO
-
-	# Install latest MOSIS tech files
-	cp -pPR ${WORKDIR}/2002a ${D}/usr/share/magic/sys/current
-
-	keepdir /var/lock/magic
-	chmod +t ${D}/var/lock/magic
-	chmod ugo+rwx ${D}/var/lock/magic
-}
-
-pkg_postinst() {
-	ewarn 'Magic now uses "~/.magicrc" as the personal startup file rather'
-	ewarn 'than "~/.magic" or the previously Gentoo specific "~/.magic-cad".'
-}
diff --git a/sci-electronics/magic/magic-7.4.16.ebuild b/sci-electronics/magic/magic-7.4.16.ebuild
deleted file mode 100644
index 6c847a580c5c..000000000000
--- a/sci-electronics/magic/magic-7.4.16.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.16.ebuild,v 1.2 2006/05/17 09:07:32 calchan Exp $
-
-DESCRIPTION="The VLSI design CAD tool."
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
-	ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
-	dev-tcltk/blt"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_compile() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/share \
-		--mandir=/usr/share/man \
-		|| die "configure failed"
-	cd ..
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc README README.Tcl TODO
-
-	# Install latest MOSIS tech files
-	cp -pPR ${WORKDIR}/2002a ${D}/usr/share/magic/sys/current
-
-	keepdir /var/lock/magic
-	chmod +t ${D}/var/lock/magic
-	chmod ugo+rwx ${D}/var/lock/magic
-
-	# Fix bug #133444
-	rm -rf ${D}/var/tmp
-}
-
-pkg_postinst() {
-	ewarn 'Magic now uses "~/.magicrc" as the personal startup file rather'
-	ewarn 'than "~/.magic" or the previously Gentoo specific "~/.magic-cad".'
-}