4 files changed, 69 insertions, 87 deletions
diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 15847d635800..569e58dcb346 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2013/01/21 11:12:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.64 2013/04/22 06:39:26 xmw Exp $
+
+*magic-7.5.230 (22 Apr 2013)
+
+  22 Apr 2013; Michael Weber <xmw@gentoo.org> +magic-7.5.230.ebuild,
+  -magic-7.5.127.ebuild, -magic-7.5.129.ebuild:
+  Version bump of upstream stable 7.5 branch, drop old.
 
 *magic-8.0.125 (21 Jan 2013)
 
diff --git a/sci-electronics/magic/magic-7.5.127.ebuild b/sci-electronics/magic/magic-7.5.127.ebuild
deleted file mode 100644
index a5ca70ec99b1..000000000000
--- a/sci-electronics/magic/magic-7.5.127.ebuild
+++ /dev/null
@@ -1,43 +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.5.127.ebuild,v 1.3 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "Patch failed"
-}
-
-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
-}
diff --git a/sci-electronics/magic/magic-7.5.129.ebuild b/sci-electronics/magic/magic-7.5.129.ebuild
deleted file mode 100644
index 09d50b353293..000000000000
--- a/sci-electronics/magic/magic-7.5.129.ebuild
+++ /dev/null
@@ -1,43 +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.5.129.ebuild,v 1.3 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s: -pg : :" tcltk/Makefile || die "Patch failed"
-}
-
-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
-}
diff --git a/sci-electronics/magic/magic-7.5.230.ebuild b/sci-electronics/magic/magic-7.5.230.ebuild
new file mode 100644
index 000000000000..5f160316f9ca
--- /dev/null
+++ b/sci-electronics/magic/magic-7.5.230.ebuild
@@ -0,0 +1,62 @@
+# 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 $
+
+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}/${PN}-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
+}