Declaring as stable, removing old garbage.

6 files changed, 3 insertions, 98 deletions

diff --git a/app-sci/magic/Manifest b/app-sci/magic/Manifest
index f198c030101c..0f53cb56aa27 100644
--- a/app-sci/magic/Manifest
+++ b/app-sci/magic/Manifest
@@ -1,13 +1,9 @@
-MD5 c2a27d44d0be46e39aba2a6390466cb4 magic-7.1.ebuild 1117
-MD5 5b846a413bc6a8748980558985636cad magic-7.1-r1.ebuild 1203
 MD5 10384643c6c5f54cd10d4daf78713d63 ChangeLog 1335
-MD5 54098f50027ee4007eb68d64c78a7dff magic-7.1-r2.ebuild 1912
+MD5 9cf2cda0df09fb22a15a01ad384ab7cf magic-7.1-r2.ebuild 1911
 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 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
 MD5 0b1ea7223162f5c38659ab26393d20ec files/defs.mak-7.1-r1 2098
diff --git a/app-sci/magic/files/digest-magic-7.1 b/app-sci/magic/files/digest-magic-7.1
deleted file mode 100644
index c5697f649c10..000000000000
--- a/app-sci/magic/files/digest-magic-7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9269a17f1ad9c69155b54462cfd044dd magic-current.tar.gz 3838852
diff --git a/app-sci/magic/files/digest-magic-7.1-r1 b/app-sci/magic/files/digest-magic-7.1-r1
deleted file mode 100644
index b5c06b5e7f42..000000000000
--- a/app-sci/magic/files/digest-magic-7.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13364b77566f5b47fd3f2783e188d3df magic-7.1.tar.gz 3860487
diff --git a/app-sci/magic/magic-7.1-r1.ebuild b/app-sci/magic/magic-7.1-r1.ebuild
deleted file mode 100644
index 9f2139135fb4..000000000000
--- a/app-sci/magic/magic-7.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-r1.ebuild,v 1.7 2003/09/06 22:23:06 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The VLSI design CAD tool"
-SRC_URI="http://vlsi.cornell.edu/magic/${P}.tar.gz"
-HOMEPAGE="http://vlsi.cornell.edu/magic/"
-KEYWORDS="x86"
-LICENSE="as-is"
-DEPEND="sys-apps/findutils
-	dev-lang/perl
-	>=app-shells/tcsh-6.10-r3
-	sys-libs/libtermcap-compat"
-RDEPEND="sys-libs/libtermcap-compat"
-SLOT="7"
-
-src_unpack() {
-	unpack ${A}
-
-	# Patch to use FHS paths
-	patch -p1 < ${FILESDIR}/${P}-fhs.patch
-
-	# Patch for GCC 3.2 compatibility
-	patch -p1 < ${FILESDIR}/${P}-gcc3.2.patch
-
-	# Insert our idea of configuration file
-	cp ${FILESDIR}/defs.mak-${PV}-r1 ${S}/defs.mak
-
-	# 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() {
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10magic
-}
diff --git a/app-sci/magic/magic-7.1-r2.ebuild b/app-sci/magic/magic-7.1-r2.ebuild
index 932959c88aa3..683a3b065a60 100644
--- a/app-sci/magic/magic-7.1-r2.ebuild
+++ b/app-sci/magic/magic-7.1-r2.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2003/11/26 09:17:40 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/magic-7.1-r2.ebuild,v 1.5 2003/12/12 08:25:14 phosphan Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The VLSI design CAD tool"
 SRC_URI="http://vlsi.cornell.edu/magic/${P}.tar.gz"
 HOMEPAGE="http://vlsi.cornell.edu/magic/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="as-is"
 DEPEND="sys-apps/findutils
 	dev-lang/perl
diff --git a/app-sci/magic/magic-7.1.ebuild b/app-sci/magic/magic-7.1.ebuild
deleted file mode 100644
index 612ad2241b34..000000000000
--- a/app-sci/magic/magic-7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.ebuild,v 1.9 2003/09/06 22:23:06 msterret Exp $
-
-IUSE="readline"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The VLSI design CAD tool"
-SRC_URI="http://vlsi.cornell.edu/magic/magic-current.tar.gz"
-HOMEPAGE="http://vlsi.cornell.edu/magic/"
-KEYWORDS="x86"
-LICENSE="as-is"
-DEPEND=">=app-shells/tcsh-6.10-r3"
-RDEPEND="readline? ( >=sys-libs/readline-4.1-r4 )"
-SLOT="7"
-
-src_unpack() {
-	unpack ${DISTFILES}/magic-current.tar.gz
-
-	# Patch to use FHS paths
-	patch -p1 < ${FILESDIR}/magic-7.1-fhs.patch
-
-	# Insert our idea of configuration file
-	cp ${FILESDIR}/defs.mak-7.1 ${S}/defs.mak
-}
-
-src_compile() {
-	if [ -n "`use readline`" ] ; then
-		export READLINE_LIBS="-lreadline -lcurses"
-		export READLINE_DEFS="-DUSE_READLINE -DHAVE_READLINE"
-	fi
-
-	emake || die
-
-	[ -n "$READLINE_LIBS" ] && unset READLINE_LIBS
-	[ -n "$READLINE_DEFS" ] && unset READLINE_DEFS
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10magic
-}