Revbump to fix current stable version (install binaries, bug 422687, detect tcl/tk, bug 447868, include stdlib). Version bump to latest upstream stable. Version bump to latest upstream development. Drop old and broken versions.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

9 files changed, 89 insertions, 136 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 569e58dcb346..2b6740e95ca2 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-electronics/magic
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.64 2013/04/22 06:39:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.65 2013/04/22 09:18:03 xmw Exp $
+
+*magic-8.0.131 (22 Apr 2013)
+*magic-7.5.202-r1 (22 Apr 2013)
+
+  22 Apr 2013; Michael Weber <xmw@gentoo.org> -magic-7.4.46.ebuild,
+  +magic-7.5.202-r1.ebuild, +files/magic-7.5.202-include.patch,
+  +files/magic-7.5.202-install.patch, -magic-7.5.220.ebuild,
+  magic-7.5.230.ebuild, -magic-8.0.109.ebuild, -magic-8.0.125.ebuild,
+  +magic-8.0.131.ebuild, +files/magic-8.0.131-sed.patch:
+  Revbump to fix current stable version (install binaries, bug 422687, detect
+  tcl/tk, bug 447868, include stdlib). Version bump to latest upstream stable.
+  Version bump to latest upstream development. Drop old and broken versions.
 
 *magic-7.5.230 (22 Apr 2013)
 
diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch
new file mode 100644
index 000000000000..d04c4b9cc646
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.5.202-include.patch
@@ -0,0 +1,10 @@
+--- magic-7.5.202/textio/txInput.c
++++ magic-7.5.202/textio/txInput.c
+@@ -21,6 +21,7 @@
+ #endif  /* not lint */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/sci-electronics/magic/files/magic-7.5.202-install.patch b/sci-electronics/magic/files/magic-7.5.202-install.patch
new file mode 100644
index 000000000000..6e28b950c510
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.5.202-install.patch
@@ -0,0 +1,15 @@
+--- magic-7.5.202/rules.mak
++++ magic-7.5.202/rules.mak
+@@ -43,9 +43,9 @@
+ 	${RM} ${MODULE}
+ 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS}
+ 
+-${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT}
+-	${RM} ${BINDIR}/${MODULE}${EXEEXT}
+-	${CP} ${MODULE}${EXEEXT} ${BINDIR}
++${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT}
++	${RM} ${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}
++	${CP} ${MODULE}${EXEEXT} ${DESTDIR}${BINDIR}
+ 
+ ../database/database.h: ../database/database.h.in
+ 	@echo --- making header file database/database.h
diff --git a/sci-electronics/magic/files/magic-8.0.131-sed.patch b/sci-electronics/magic/files/magic-8.0.131-sed.patch
new file mode 100644
index 000000000000..2d7d2f42eac3
--- /dev/null
+++ b/sci-electronics/magic/files/magic-8.0.131-sed.patch
@@ -0,0 +1,11 @@
+--- magic-8.0.131/scmos/cif_template/Makefile
++++ magic-8.0.131/scmos/cif_template/Makefile
+@@ -11,7 +11,7 @@
+ SUBCIFIN   = $(OBJS_DIR)/SUBCIFin
+ SUBCIFOUT  = $(OBJS_DIR)/SUBCIFout
+ 
+-SED_CMD    = sed -e "s/\\/\\\\/" -e "/^\#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/"
++SED_CMD    = sed -e "s/\\\\/\\\\\\\\/" -e "/^\#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/"
+ 
+ include ${MAGICDIR}/defs.mak
+ 
diff --git a/sci-electronics/magic/magic-7.4.46.ebuild b/sci-electronics/magic/magic-7.4.46.ebuild
deleted file mode 100644
index 65a96e8decfc..000000000000
--- a/sci-electronics/magic/magic-7.4.46.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.46.ebuild,v 1.6 2012/12/14 10:43:26 ulm 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="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-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
-	CPP="cpp" econf --libdir=/usr/share
-	cd ..
-	emake -j1 || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Installation failed"
-	dodoc README README.Tcl TODO
-
-	# Install latest MOSIS tech files
-	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/share/magic/sys/current
-}
-
-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.5.220.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
index ee09cc34acee..96fc115cd952 100644
--- a/sci-electronics/magic/magic-7.5.220.ebuild
+++ b/sci-electronics/magic/magic-7.5.202-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.220.ebuild,v 1.2 2012/12/14 10:43:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202-r1.ebuild,v 1.1 2013/04/22 09:18:03 xmw Exp $
 
-EAPI=2
+EAPI=5
 
 inherit multilib eutils autotools
 
@@ -26,36 +26,39 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-install.patch" #422687
+	epatch "${FILESDIR}/${P}-include.patch"
 	cd scripts
 	eautoreconf
 	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "tcltk patch failed"
+	sed -i -e "s: -pg : :" tcltk/Makefile || die
 }
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
+	# fix tcl/tk detection #447868
 	cd scripts
-	CPP="cpp" econf
+	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
 }
 
 src_compile() {
-	emake -j1 || die "Compilation failed"
+	emake -j1
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
-	dodoc README README.Tcl TODO || die
+	dodoc README README.Tcl TODO
 
 	# Move docs from libdir to docdir and add symlink.
 	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
 	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" || die
+	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
 
 	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN} || die
+	dodir /usr/share/${PN}
 	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" || die
+	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
 
 	# Install latest MOSIS tech files
 	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
diff --git a/sci-electronics/magic/magic-7.5.230.ebuild b/sci-electronics/magic/magic-7.5.230.ebuild
index 5f160316f9ca..8c8c6e7cddbc 100644
--- a/sci-electronics/magic/magic-7.5.230.ebuild
+++ b/sci-electronics/magic/magic-7.5.230.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.230.ebuild,v 1.1 2013/04/22 06:39:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.230.ebuild,v 1.2 2013/04/22 09:18:03 xmw Exp $
 
-EAPI=2
+EAPI=5
 
 inherit multilib eutils autotools
 
@@ -26,36 +26,39 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-ldflags.patch"
+	epatch "${FILESDIR}/${PN}-7.5.202-install.patch" #422687
+	epatch "${FILESDIR}/${PN}-7.5.202-include.patch"
 	cd scripts
 	eautoreconf
 	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "tcltk patch failed"
+	sed -i -e "s: -pg : :" tcltk/Makefile || die
 }
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
+	# fix tcl/tk detection #447868
 	cd scripts
-	CPP="cpp" econf
+	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
 }
 
 src_compile() {
-	emake -j1 || die "Compilation failed"
+	emake -j1
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
-	dodoc README README.Tcl TODO || die
+	dodoc README README.Tcl TODO
 
 	# Move docs from libdir to docdir and add symlink.
 	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
 	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" || die
+	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
 
 	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN} || die
+	dodir /usr/share/${PN}
 	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" || die
+	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
 
 	# Install latest MOSIS tech files
 	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
diff --git a/sci-electronics/magic/magic-8.0.109.ebuild b/sci-electronics/magic/magic-8.0.109.ebuild
deleted file mode 100644
index 83a9d2f2c583..000000000000
--- a/sci-electronics/magic/magic-8.0.109.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.109.ebuild,v 1.2 2012/12/14 10:43:26 ulm Exp $
-
-EAPI=2
-
-inherit multilib eutils autotools
-
-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="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
-	dev-tcltk/blt"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	cd scripts
-	eautoreconf
-	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "tcltk patch failed"
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
-	CPP="cpp" econf
-}
-
-src_compile() {
-	emake -j1 || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc README README.Tcl TODO || die
-
-	# Move docs from libdir to docdir and add symlink.
-	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
-	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" || die
-
-	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN} || die
-	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" || die
-
-	# Install latest MOSIS tech files
-	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
-}
diff --git a/sci-electronics/magic/magic-8.0.125.ebuild b/sci-electronics/magic/magic-8.0.131.ebuild
index 665c88a8c905..b3483fd9090b 100644
--- a/sci-electronics/magic/magic-8.0.125.ebuild
+++ b/sci-electronics/magic/magic-8.0.131.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.125.ebuild,v 1.1 2013/01/21 11:12:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.131.ebuild,v 1.1 2013/04/22 09:18:03 xmw Exp $
 
-EAPI=2
+EAPI=5
 
 inherit multilib eutils autotools
 
@@ -26,36 +26,39 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-8.0.109-ldflags.patch"
+	epatch "${FILESDIR}/${PN}-8.0.131-sed.patch"
+	epatch "${FILESDIR}/${PN}-7.5.202-include.patch"
 	cd scripts
 	eautoreconf
 	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "tcltk patch failed"
+	sed -i -e "s: -pg : :" tcltk/Makefile || die
 }
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
+	# fix tcl/tk detection #447868
 	cd scripts
-	CPP="cpp" econf
+	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
 }
 
 src_compile() {
-	emake -j1 || die "Compilation failed"
+	emake -j1
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
-	dodoc README README.Tcl TODO || die
+	dodoc README README.Tcl TODO
 
 	# Move docs from libdir to docdir and add symlink.
 	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
 	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" || die
+	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
 
 	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN} || die
+	dodir /usr/share/${PN}
 	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" || die
+	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
 
 	# Install latest MOSIS tech files
 	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die