Version bump, remove old. Verbose build (bug 466808), upstream accepted patches.

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

4 files changed, 30 insertions, 48 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 8ecd030dedca..04af7d69b9e1 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,14 @@
 # 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.72 2013/05/15 11:51:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.73 2013/05/15 12:15:49 xmw Exp $
+
+*magic-8.0.138 (15 May 2013)
+
+  15 May 2013; Michael Weber <xmw@gentoo.org> +magic-8.0.138.ebuild,
+  -files/magic-8.0.109-ldflags.patch, -files/magic-8.0.131-sed.patch,
+  -magic-8.0.131.ebuild, magic-7.5.231.ebuild:
+  Version bump, remove old. Verbose build (bug 466808), upstream accepted
+  patches.
 
   15 May 2013; Michael Weber <xmw@gentoo.org>
   +files/magic-7.5.231-ldflags.patch, +files/magic-7.5.231-verbose-build.patch,
diff --git a/sci-electronics/magic/files/magic-8.0.109-ldflags.patch b/sci-electronics/magic/files/magic-8.0.109-ldflags.patch
deleted file mode 100644
index f471aa7bcff3..000000000000
--- a/sci-electronics/magic/files/magic-8.0.109-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- magic-8.0.109/scripts/defs.mak.in
-+++ magic-8.0.109/scripts/defs.mak.in
-@@ -53,7 +53,7 @@
- M4		       = @M4@
- RANLIB                 = @RANLIB@
- SHDLIB_EXT             = @SHDLIB_EXT@
--LDDL_FLAGS             = @LDDL_FLAGS@
-+LDDL_FLAGS             = ${LDFLAGS} @LDDL_FLAGS@
- LD_RUN_PATH	       = @LD_RUN_PATH@
- LIB_SPECS	       = @LIB_SPECS@
- WISH_EXE	       = @WISH_EXE@
---- magic-8.0.109/tcltk/Makefile
-+++ magic-8.0.109/tcltk/Makefile
-@@ -43,11 +43,11 @@
- 	(cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl)
- 
- magicexec: magicexec.c ${MAGICDIR}/defs.mak
--	${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \
-+	${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \
- 		${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
- 
- magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
--	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \
-+	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \
- 		${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
- 
- magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak
diff --git a/sci-electronics/magic/files/magic-8.0.131-sed.patch b/sci-electronics/magic/files/magic-8.0.131-sed.patch
deleted file mode 100644
index 2d7d2f42eac3..000000000000
--- a/sci-electronics/magic/files/magic-8.0.131-sed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-8.0.131.ebuild b/sci-electronics/magic/magic-8.0.138.ebuild
index b3483fd9090b..2483622677ee 100644
--- a/sci-electronics/magic/magic-8.0.131.ebuild
+++ b/sci-electronics/magic/magic-8.0.138.ebuild
@@ -1,6 +1,6 @@
 # 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.131.ebuild,v 1.1 2013/04/22 09:18:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.138.ebuild,v 1.1 2013/05/15 12:15:49 xmw Exp $
 
 EAPI=5
 
@@ -14,23 +14,29 @@ SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
 LICENSE="HPND GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="debug opengl"
 
 RDEPEND="sys-libs/ncurses
 	sys-libs/readline
 	dev-lang/tcl
 	dev-lang/tk
-	dev-tcltk/blt"
+	dev-tcltk/blt
+	opengl? ( virtual/glu
+		virtual/opengl )"
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
 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
+	einfo remove bundled readline-4.3
+	rm -r readline || die
+
+	epatch \
+		"${FILESDIR}/${PN}-7.5.231-verbose-build.patch"
+
+	cd scripts || die
 	eautoreconf
-	cd ..
+	cd .. || die
+
 	sed -i -e "s: -pg : :" tcltk/Makefile || die
 }
 
@@ -38,7 +44,13 @@ src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
 	# fix tcl/tk detection #447868
 	cd scripts
-	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
+	CPP="cpp" econf \
+		--with-tcl=yes \
+		--with-tcllibs="/usr/$(get_libdir)" \
+		--with-tklibs="/usr/$(get_libdir)" \
+		--enable-modular \
+		$(use_enable debug memdebug) \
+		$(use_with opengl)
 }
 
 src_compile() {