Version Bump, #270876; Prevend stripping, #252036, removed old versions

(Portage version: 2.2_rc67/cvs/Linux x86_64)

12 files changed, 232 insertions, 237 deletions

diff --git a/sci-electronics/ng-spice-rework/ChangeLog b/sci-electronics/ng-spice-rework/ChangeLog
index 955f1560b5c0..af1ef976db29 100644
--- a/sci-electronics/ng-spice-rework/ChangeLog
+++ b/sci-electronics/ng-spice-rework/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sci-electronics/ng-spice-rework
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.18 2008/12/10 16:27:25 calchan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.19 2010/06/24 10:41:52 jlec Exp $
+
+*ng-spice-rework-21 (24 Jun 2010)
+*ng-spice-rework-18-r1 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> -ng-spice-rework-15.ebuild,
+  -files/ng-spice-rework-15.gcc-3.4.patch, -ng-spice-rework-17-r1.ebuild,
+  -ng-spice-rework-17-r2.ebuild, +ng-spice-rework-18-r1.ebuild,
+  +files/ng-spice-rework-18-nostrip.patch, +ng-spice-rework-21.ebuild,
+  +files/ng-spice-rework-21-nostrip.patch,
+  +files/ng-spice-rework-21-src_makefile.patch,
+  -files/ng-spice-rework-com_let.patch,
+  -files/ng-spice-rework-numparam.patch,
+  -files/ng-spice-rework-pipemode.patch:
+  Version Bump, #270876; Prevend stripping, #252036, removed old versions
 
 *ng-spice-rework-18 (10 Dec 2008)
 
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-15.gcc-3.4.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-15.gcc-3.4.patch
deleted file mode 100644
index cd9f6ba49ad8..000000000000
--- a/sci-electronics/ng-spice-rework/files/ng-spice-rework-15.gcc-3.4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/frontend/control.c.old	2004-12-29 13:53:16.012519944 +0000
-+++ src/frontend/control.c	2004-12-29 13:53:17.683265952 +0000
-@@ -818,6 +818,17 @@
-     return (0); /* va: which value? */
- }
- 
-+/* va: This totally frees the control structures */
-+void cp_free_control(void) 
-+{
-+    int i;
-+    
-+    for (i=stackp; i>=0; i--) ctl_free(control[i]);
-+    
-+    control[0] = cend[0] = NULL;
-+    stackp = 0;
-+}
-+
- /* This blows away the control structures... */
- void
- cp_resetcontrol(void)
-@@ -878,16 +889,3 @@
-             cend[stackp] = cend[stackp]->co_parent;
-     return;
- }
--
--
--/* va: This totally frees the control structures */
--void cp_free_control(void) 
--{
--    int i;
--    
--    for (i=stackp; i>=0; i--) ctl_free(control[i]);
--    
--    control[0] = cend[0] = NULL;
--    stackp = 0;
--}
--
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-18-nostrip.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-18-nostrip.patch
new file mode 100644
index 000000000000..e789c283eaa9
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-18-nostrip.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.in b/configure.in
+index 270be67..d87472b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -205,7 +205,7 @@ dnl the above AC_PROG_CC may set CFLAGS to "-O2 -g"
+ if test "$enable_debug" = "no"; then
+ 	if test "x$GCC" = "xyes"; then
+ 		AC_MSG_WARN(Removing debugging option!)
+-		CFLAGS="$ext_CFLAGS -O2 -Wall -s"
++		CFLAGS="$ext_CFLAGS -O2 -Wall"
+ 	else
+ 		AC_MSG_WARN(Removing debugging option!)
+ 		CFLAGS="$ext_CFLAGS -O2"
+diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in
+index e1b0fa9..b17d0de 100644
+--- a/src/xspice/icm/makedefs.in
++++ b/src/xspice/icm/makedefs.in
+@@ -37,13 +37,13 @@ endif
+ CMPP = $(TOPDIR)$(top_builddir)/src/xspice/cmpp/cmpp
+ 
+ # Flags to use when linking shared library
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ ifeq "$(strip $(uname))" "Darwin"
+-  LDFLAGS = -bundle -flat_namespace -undefined suppress
++  LDFLAGS += -bundle -flat_namespace -undefined suppress
+ endif
+ ifeq "$(strip $(uname))" "SunOS"
+   ifneq "$(CC)" "gcc"
+-    LDFLAGS = -G
++    LDFLAGS += -G
+   endif
+ endif
+ 
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-nostrip.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-nostrip.patch
new file mode 100644
index 000000000000..22caec10aa57
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-nostrip.patch
@@ -0,0 +1,29 @@
+diff --git a/configure.in b/configure.in
+index 63fc1b3..b8e3624 100644
+--- a/configure.in
++++ b/configure.in
+@@ -210,7 +210,7 @@ dnl the above AC_PROG_CC may set CFLAGS to "-O2 -g"
+ if test "$enable_debug" = "no"; then
+ 	if test "x$GCC" = "xyes"; then
+ 		AC_MSG_WARN(Removing debugging option!)
+-		CFLAGS="$ext_CFLAGS -O2 -Wall -s"
++		CFLAGS="$ext_CFLAGS -O2 -Wall"
+ 	else
+ 		AC_MSG_WARN(Removing debugging option!)
+ 		CFLAGS="$ext_CFLAGS -O2"
+diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in
+index 5dad7b0..e0b4931 100644
+--- a/src/xspice/icm/makedefs.in
++++ b/src/xspice/icm/makedefs.in
+@@ -39,9 +39,9 @@ endif
+ CMPP = $(TOPDIR)$(top_builddir)/src/xspice/cmpp/cmpp
+ 
+ # Flags to use when linking shared library
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ ifeq "$(strip $(uname))" "Darwin"
+-  LDFLAGS = -bundle -flat_namespace -undefined suppress
++  LDFLAGS += -bundle -flat_namespace -undefined suppress
+ endif
+ ifeq "$(strip $(uname))" "SunOS"
+   ifneq "$(CC)" "gcc"
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-src_makefile.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-src_makefile.patch
new file mode 100644
index 000000000000..127bf9e502f6
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-21-src_makefile.patch
@@ -0,0 +1,23 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f0c4779..4257b5a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -127,6 +127,9 @@ endif
+ winmain.o: winmain.c ../config.h
+ 	$(COMPILE) -DSIMULATOR -o winmain.o  -c $(srcdir)/winmain.c
+ 
++mkdepdir:
++	test -d $(DEPDIR) || mkdir $(DEPDIR)
++
+ spice.lo: main.c ../config.h
+ 	$(LTCOMPILE) -DSIMULATOR -c -o spice.o $<
+ 
+@@ -307,7 +310,7 @@ install-tclspice:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)/spice
+ 	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir)/spice
+ 
+-tclspice.lo: tclspice.c
++tclspice.lo: tclspice.c mkdepdir
+ 	$(LTCOMPILE) -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\"" -MT tclspice.lo -MD -MP -MF $(DEPDIR)/tclspice.Tpo -c -o tclspice.o $<
+ 	mv -f $(DEPDIR)/tclspice.Tpo $(DEPDIR)/tclspice.Plo
+ 
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-com_let.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-com_let.patch
deleted file mode 100644
index 2fc7626e1eca..000000000000
--- a/sci-electronics/ng-spice-rework/files/ng-spice-rework-com_let.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nadurp ng-spice-rework-17/src/frontend/com_let.c ng-spice-rework-17-r1/src/frontend/com_let.c
---- ng-spice-rework-17/src/frontend/com_let.c	2003-12-25 18:30:50.000000000 +0100
-+++ ng-spice-rework-17-r1/src/frontend/com_let.c	2006-05-06 23:14:10.000000000 +0200
-@@ -156,7 +156,7 @@ com_let(wordlist *wl)
- 	n->v_flags = (t->v_flags | VF_PERMANENT);
- 	n->v_length = t->v_length;
- 
--	if (!t->v_numdims) {
-+	if ((!t->v_numdims)<=1) {
- 	    n->v_numdims = 1;
- 	    n->v_dims[0] = n->v_length;
- 	} else {
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-numparam.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-numparam.patch
deleted file mode 100644
index 744f2355755b..000000000000
--- a/sci-electronics/ng-spice-rework/files/ng-spice-rework-numparam.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nadurp ng-spice-rework-17/src/frontend/numparam/general.h ng-spice-rework-17-r1/src/frontend/numparam/general.h
---- ng-spice-rework-17/src/frontend/numparam/general.h	2005-04-24 23:18:02.000000000 +0200
-+++ ng-spice-rework-17-r1/src/frontend/numparam/general.h	2006-05-06 23:07:39.000000000 +0200
-@@ -136,7 +136,7 @@ Type(Pchar, char AT)
- #define Str(n,a)      char a[n+3]={0,0,(char)n}  /* n<255 ! */
- #define Sini(s)       sini(s,sizeof(s)-4)
- 
--Cconst(Maxstr,2004) /* was 255, string maxlen, may be up to 32000 or so */
-+Cconst(Maxstr,32004) /* was 255, string maxlen, may be up to 32000 or so */
- 
- typedef char string[258];
- 
-diff -Nadurp ng-spice-rework-17/src/frontend/numparam/numparam.h ng-spice-rework-17-r1/src/frontend/numparam/numparam.h
---- ng-spice-rework-17/src/frontend/numparam/numparam.h	2005-05-29 03:18:20.000000000 +0200
-+++ ng-spice-rework-17-r1/src/frontend/numparam/numparam.h	2006-05-06 23:06:37.000000000 +0200
-@@ -28,8 +28,8 @@ Cconst(Llen,1000)
- typedef char str20 [24];
- typedef char str80 [84];
- 
--Cconst(Maxline, 1000) /* size of initial unexpanded circuit code */
--Cconst(Maxckt,  5000)  /* size of expanded circuit code */
-+Cconst(Maxline, 10000) /* size of initial unexpanded circuit code */
-+Cconst(Maxckt,  30000)  /* size of expanded circuit code */
- 
- 
- typedef Pchar auxtable; /* dummy */
diff --git a/sci-electronics/ng-spice-rework/files/ng-spice-rework-pipemode.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-pipemode.patch
deleted file mode 100644
index 871355f6cced..000000000000
--- a/sci-electronics/ng-spice-rework/files/ng-spice-rework-pipemode.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nadurp ng-spice-rework-17/src/main.c ng-spice-rework-17-r1/src/main.c
---- ng-spice-rework-17/src/main.c	2005-05-31 18:47:48.000000000 +0200
-+++ ng-spice-rework-17-r1/src/main.c	2006-05-09 10:24:47.000000000 +0200
-@@ -516,6 +516,7 @@ show_help(void)
- 	   "  -i, --interactive         run in interactive mode\n"
- 	   "  -n, --no-spiceinit        don't load the local or user's config file\n"
- 	   "  -o, --output=FILE         set the outputfile\n"
-+	   "  -p, --pipe                run in I/O pipe mode\n"
- 	   "  -q, --completion          activate command completion\n"
- 	   "  -r, --rawfile=FILE        set the rawfile output\n"             
- 	   "  -s, --server              run spice as a server process\n"
-@@ -738,6 +739,7 @@ main(int argc, char **argv)
- 	    {"interactive", 0, 0, 'i'},
- 	    {"no-spiceinit", 0, 0, 'n'},
- 	    {"output", 0, 0, 'o'},
-+	    {"pipe", 0, 0, 'p'},
- 	    {"completion", 0, 0, 'q'},
- 	    {"rawfile", 1, 0, 'r'},
- 	    {"server", 0, 0, 's'},
-@@ -745,7 +747,7 @@ main(int argc, char **argv)
- 	    {0, 0, 0, 0}
- 	};
- 
--	c = getopt_long (argc, argv, "hvbc:ihno:qr:st:",
-+	c = getopt_long (argc, argv, "hvbc:ihno:pqr:st:",
- 			 long_options, &option_index);
- 	if (c == -1)
- 	    break;
-@@ -779,6 +781,11 @@ main(int argc, char **argv)
- 		iflag = TRUE;
- 		break;
- 
-+	    case 'p':		/* Pipe mode */
-+		iflag = TRUE;
-+		istty = TRUE;
-+		break;
-+
- 	    case 'n':		/* Don't read initialisation file */
- 		readinit = FALSE;
- 		break;
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-15.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-15.ebuild
deleted file mode 100644
index e72b12c44ff0..000000000000
--- a/sci-electronics/ng-spice-rework/ng-spice-rework-15.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ng-spice-rework-15.ebuild,v 1.4 2005/05/17 18:20:43 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="NGSpice - The Next Generation Spice (Circuit Emulator)"
-SRC_URI="http://www.geda.seul.org/dist/ngspice-rework${PV}.tgz"
-HOMEPAGE="http://ngspice.sourceforge.net"
-
-SLOT="0"
-IUSE=""
-LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ppc ~x86"
-
-DEPEND=">=sys-libs/glibc-2.1.3"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}.gcc-3.4.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	local infoFile
-	for infoFile in doc/ngspice.info*; do
-		echo 'INFO-DIR-SECTION EDA' >> ${infoFile}
-		echo 'START-INFO-DIR-ENTRY' >> ${infoFile}
-		echo '* NGSPICE: (ngspice). Electronic Circuit Simulator.' >> ${infoFile}
-		echo 'END-INFO-DIR-ENTRY' >> ${infoFile}
-	done
-
-	make DESTDIR=${D} install || die
-	dodoc COPYING COPYRIGHT CREDITS ChangeLog README
-}
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-17-r1.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-17-r1.ebuild
deleted file mode 100644
index 729a6ae3ea14..000000000000
--- a/sci-electronics/ng-spice-rework/ng-spice-rework-17-r1.ebuild
+++ /dev/null
@@ -1,57 +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/ng-spice-rework/ng-spice-rework-17-r1.ebuild,v 1.2 2006/09/05 18:26:10 gustavoz Exp $
-
-inherit eutils
-
-DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)."
-SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz"
-HOMEPAGE="http://ngspice.sourceforge.net"
-LICENSE="BSD GPL-2"
-
-SLOT="0"
-IUSE="readline debug"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="readline? ( >=sys-libs/readline-5.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-com_let.patch
-	epatch ${FILESDIR}/${PN}-numparam.patch
-	epatch ${FILESDIR}/${PN}-pipemode.patch
-	epatch ${FILESDIR}/${PN}-postscript.patch
-}
-
-src_compile() {
-	econf \
-		--enable-numparam \
-		--enable-dot-global \
-		--disable-dependency-tracking \
-		$(use_with debug) \
-		$(use_with readline) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	local infoFile
-	for infoFile in doc/ngspice.info*; do
-		echo 'INFO-DIR-SECTION EDA' >> ${infoFile}
-		echo 'START-INFO-DIR-ENTRY' >> ${infoFile}
-		echo '* NGSPICE: (ngspice). Electronic Circuit Simulator.' >> ${infoFile}
-		echo 'END-INFO-DIR-ENTRY' >> ${infoFile}
-	done
-
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ANALYSES AUTHORS BUGS ChangeLog DEVICES NEWS \
-		README Stuarts_Poly_Notes || die "failed to install documentation"
-
-	# We don't need makeidx to be installed
-	rm ${D}/usr/bin/makeidx
-}
-
-src_test () {
-	# Bug 108405
-	true
-}
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-18-r1.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-18-r1.ebuild
new file mode 100644
index 000000000000..f053173eab82
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/ng-spice-rework-18-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ng-spice-rework-18-r1.ebuild,v 1.1 2010/06/24 10:41:52 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)."
+SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
+	doc? ( http://users.ece.gatech.edu/~mrichard/Xspice/Xspice_Users_Manual.pdf \
+		http://users.ece.gatech.edu/~mrichard/Xspice/XSpice_SoftwareDesignDoc_Sep92.pdf \
+		http://users.ece.gatech.edu/~mrichard/Xspice/XSpice_InterfaceDesignDoc_Sep92.pdf \
+		http://users.ece.gatech.edu/~mrichard/Xspice/XSpice_CodeModelSubsysSoftwareDesign.pdf \
+		http://users.ece.gatech.edu/~mrichard/Xspice/XSpice_CodeModelSubsysInterfaceDesign.pdf )"
+HOMEPAGE="http://ngspice.sourceforge.net"
+LICENSE="BSD GPL-2"
+
+SLOT="0"
+IUSE="X debug doc readline"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="readline? ( >=sys-libs/readline-5.0 )
+	X? ( x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libX11
+		sci-visualization/xgraph )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nostrip.patch
+	rm -rf xgraph
+	epatch "${FILESDIR}"/${PN}-postscript.patch
+	epatch "${FILESDIR}"/${P}-src_makefile.patch
+	sed -i -e 's/\-O2//' configure.in || die "sed failed"
+	if use doc ; then
+		cp "${DISTDIR}"/Xspice_Users_Manual.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_SoftwareDesignDoc_Sep92.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_InterfaceDesignDoc_Sep92.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_CodeModelSubsysSoftwareDesign.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_CodeModelSubsysInterfaceDesign.pdf "${S}"
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local MYCONF
+	if use debug ; then
+		MYCONF="--enable-debug \
+			--enable-ftedebug \
+			--enable-cpdebug \
+			--enable-asdebug \
+			--enable-stepdebug \
+			--enable-pzdebug"
+	else
+		MYCONF="--disable-debug \
+			--disable-ftedebug \
+			--disable-cpdebug \
+			--disable-asdebug \
+			--disable-stepdebug \
+			--disable-pzdebug"
+	fi
+	# Those don't compile
+	MYCONF="${MYCONF} \
+		--disable-sensdebug \
+		--disable-blktmsdebug \
+		--disable-smltmsdebug"
+
+	econf \
+		${MYCONF} \
+		--enable-intnoise \
+		--enable-xspice \
+		--enable-numparam \
+		--enable-dot-global \
+		--disable-xgraph \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_with readline)
+#	sed 's:INSTALL_STRIP_FLAG=-s:INSTALL_STRIP_FLAG=:g' -i Makefile src/Makefile
+}
+
+src_install () {
+	local infoFile
+	for infoFile in doc/ngspice.info*; do
+		echo 'INFO-DIR-SECTION EDA' >> ${infoFile}
+		echo 'START-INFO-DIR-ENTRY' >> ${infoFile}
+		echo '* NGSPICE: (ngspice). Electronic Circuit Simulator.' >> ${infoFile}
+		echo 'END-INFO-DIR-ENTRY' >> ${infoFile}
+	done
+
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ANALYSES AUTHORS BUGS ChangeLog DEVICES NEWS \
+		README Stuarts_Poly_Notes || die "failed to install documentation"
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins doc/ngspice.pdf
+		doins *.pdf
+	fi
+
+	# We don't need makeidx to be installed
+	rm "${D}"/usr/bin/makeidx
+}
+
+src_test () {
+	# Bug 108405
+	true
+}
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-21.ebuild
index bdfa926adc41..ace6c50bca8c 100644
--- a/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild
+++ b/sci-electronics/ng-spice-rework/ng-spice-rework-21.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild,v 1.1 2007/05/26 20:57:56 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ng-spice-rework-21.ebuild,v 1.1 2010/06/24 10:41:52 jlec Exp $
 
-inherit eutils
+EAPI="3"
+
+inherit autotools eutils
 
 DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)."
 SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
@@ -24,24 +26,24 @@ DEPEND="readline? ( >=sys-libs/readline-5.0 )
 		x11-libs/libX11
 		sci-visualization/xgraph )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-com_let.patch
-	epatch ${FILESDIR}/${PN}-numparam.patch
-	epatch ${FILESDIR}/${PN}-pipemode.patch
-	epatch ${FILESDIR}/${PN}-postscript.patch
-	sed -i -e 's/CFLAGS=" "/CFLAGS="\${CFLAGS}"/' configure
+S="${WORKDIR}"/ngspice-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nostrip.patch
+	rm -rf xgraph
+	epatch "${FILESDIR}"/${P}-src_makefile.patch
+	sed -i -e 's/\-O2//' configure.in || die "sed failed"
 	if use doc ; then
-		cp ${DISTDIR}/Xspice_Users_Manual.pdf ${S}
-		cp ${DISTDIR}/XSpice_SoftwareDesignDoc_Sep92.pdf ${S}
-		cp ${DISTDIR}/XSpice_InterfaceDesignDoc_Sep92.pdf ${S}
-		cp ${DISTDIR}/XSpice_CodeModelSubsysSoftwareDesign.pdf ${S}
-		cp ${DISTDIR}/XSpice_CodeModelSubsysInterfaceDesign.pdf ${S}
+		cp "${DISTDIR}"/Xspice_Users_Manual.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_SoftwareDesignDoc_Sep92.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_InterfaceDesignDoc_Sep92.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_CodeModelSubsysSoftwareDesign.pdf "${S}"
+		cp "${DISTDIR}"/XSpice_CodeModelSubsysInterfaceDesign.pdf "${S}"
 	fi
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local MYCONF
 	if use debug ; then
 		MYCONF="--enable-debug \
@@ -64,7 +66,8 @@ src_compile() {
 		--disable-blktmsdebug \
 		--disable-smltmsdebug"
 
-	econf ${MYCONF} \
+	econf \
+		${MYCONF} \
 		--enable-intnoise \
 		--enable-xspice \
 		--enable-numparam \
@@ -72,9 +75,7 @@ src_compile() {
 		--disable-xgraph \
 		--disable-dependency-tracking \
 		$(use_with X x) \
-		$(use_with readline) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_with readline)
 }
 
 src_install () {
@@ -97,7 +98,7 @@ src_install () {
 	fi
 
 	# We don't need makeidx to be installed
-	rm ${D}/usr/bin/makeidx
+	rm "${D}"/usr/bin/makeidx
 }
 
 src_test () {