Added live CVS ebuild.

(Portage version: 2203-svn)

8 files changed, 248 insertions, 6 deletions

diff --git a/sci-electronics/ng-spice-rework/ChangeLog b/sci-electronics/ng-spice-rework/ChangeLog
index db26ef49daf7..54bd8a1eac15 100644
--- a/sci-electronics/ng-spice-rework/ChangeLog
+++ b/sci-electronics/ng-spice-rework/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-electronics/ng-spice-rework
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.10 2006/01/01 22:07:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.11 2006/05/10 11:28:50 calchan Exp $
+
+*ng-spice-rework-9999 (10 May 2006)
+
+  10 May 2006; Denis Dupeyron <calchan@gentoo.org>
+  +files/ng-spice-rework-com_let.patch,
+  +files/ng-spice-rework-numparam.patch,
+  +files/ng-spice-rework-pipemode.patch,
+  +files/ng-spice-rework-postscript.patch, +ng-spice-rework-9999.ebuild:
+  Added live CVS ebuild. Options numparam and dot-global are enabled.
+  Additional patches for postscript and 'let' command fixes. Patch enabling
+  pipe mode for xcircuit.
 
   01 Jan 2006; <plasmaroo@gentoo.org> ng-spice-rework-17.ebuild:
   Add debug and readline USE flags; bug #106496.
diff --git a/sci-electronics/ng-spice-rework/Manifest b/sci-electronics/ng-spice-rework/Manifest
index 77ec196091c2..1f003e1eb599 100644
--- a/sci-electronics/ng-spice-rework/Manifest
+++ b/sci-electronics/ng-spice-rework/Manifest
@@ -1,7 +1,13 @@
-MD5 01f7c3b8eea754a993867899491145a4 ChangeLog 2068
-MD5 64f8beb626a1f8e9accfac187842abc1 ng-spice-rework-15.ebuild 1031
+MD5 8ea818b3cdbefe0f6e8a53d59aab3060 ChangeLog 2524
+MD5 cdcbac36f6d0470a9935636cb8ca3306 files/digest-ng-spice-rework-15 66
+MD5 97a43f9bb7be5b0caae27989f8027eec files/digest-ng-spice-rework-17 71
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ng-spice-rework-9999 0
+MD5 c9ab994f230b3c02ffca2d9d02e7d33b files/ng-spice-rework-15.gcc-3.4.patch 804
+MD5 8e6c0b550f83239d57f566eaf99c7e84 files/ng-spice-rework-com_let.patch 504
+MD5 9c454830eb554090989af6b37825e0ba files/ng-spice-rework-numparam.patch 1335
+MD5 e354e1af1ad9d7d634ad8cdeeb284c92 files/ng-spice-rework-pipemode.patch 1462
+MD5 1fd91e68ec6e9ed3a1639bc3e2c04fd0 files/ng-spice-rework-postscript.patch 2842
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
+MD5 64f8beb626a1f8e9accfac187842abc1 ng-spice-rework-15.ebuild 1031
 MD5 bb642ce158bd8e69cad2ab4cfcbed947 ng-spice-rework-17.ebuild 1180
-MD5 c9ab994f230b3c02ffca2d9d02e7d33b files/ng-spice-rework-15.gcc-3.4.patch 804
-MD5 97a43f9bb7be5b0caae27989f8027eec files/digest-ng-spice-rework-17 71
-MD5 cdcbac36f6d0470a9935636cb8ca3306 files/digest-ng-spice-rework-15 66
+MD5 521505e147bcd72c738fcec278566d84 ng-spice-rework-9999.ebuild 1667
diff --git a/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-9999 b/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-9999
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-9999
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
new file mode 100644
index 000000000000..2fc7626e1eca
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-com_let.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..744f2355755b
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-numparam.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..871355f6cced
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-pipemode.patch
@@ -0,0 +1,40 @@
+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/files/ng-spice-rework-postscript.patch b/sci-electronics/ng-spice-rework/files/ng-spice-rework-postscript.patch
new file mode 100644
index 000000000000..e9e1a67e4444
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/ng-spice-rework-postscript.patch
@@ -0,0 +1,79 @@
+diff -Nadurp ng-spice-rework-17/src/frontend/postsc.c ng-spice-rework-17-r1/src/frontend/postsc.c
+--- ng-spice-rework-17/src/frontend/postsc.c	2005-05-30 22:28:30.000000000 +0200
++++ ng-spice-rework-17-r1/src/frontend/postsc.c	2006-05-04 09:44:06.000000000 +0200
+@@ -88,14 +88,13 @@ PS_Init(void)
+ 	    scale = 1.0;
+     }
+ 
++  dispdev->numlinestyles = NUMELEMS(linestyle);
+   if (!cp_getvar("hcopypscolor", VT_STRING, pscolor)) {
+     colorflag = 0;
+     dispdev->numcolors = 2;
+-    dispdev->numlinestyles = NUMELEMS(linestyle);
+   } else {
+     colorflag = 1;
+     dispdev->numcolors = 18;   /* don't know what the maximum should be */
+-    dispdev->numlinestyles = 1;
+   }
+   pscolor[0]='\0';
+ 
+@@ -118,6 +117,10 @@ PS_Init(void)
+       dispdev->height = 10000;
+   }
+ 
++  dispdev->width *= 1000;
++  dispdev->height *= 1000;
++  scale *= 1000.0;
++
+     /* The following side effects have to be considered 
+      * when the printer is called by com_hardcopy !
+      * gr_init:
+@@ -160,6 +163,7 @@ PS_NewViewport(GRAPH *graph)
+ {
+     int x1,x2,y1,y2;
+     hcopygraphid = graph->graphid;
++    bool nobg;
+ 
+     if (!(plotfile = fopen(graph->devdep, "w"))) {
+       perror(graph->devdep);
+@@ -180,29 +184,33 @@ PS_NewViewport(GRAPH *graph)
+     graph->absolute.width = dispdev->width;
+     graph->absolute.height = dispdev->height;
+     /* Also done in gr_init, if called . . . */
+-    graph->viewportxoff = 8 * fontwidth;
+-    graph->viewportyoff = 4 * fontheight;
++    graph->viewportxoff = 8 * graph->fontwidth;
++    graph->viewportyoff = 4 * graph->fontheight;
+ 
+     xoff = scale * XOFF;
+     yoff = scale * YOFF;
+ 
+     x1 = 0.75 * 72;
+     y1 = x1;
+-    x2 = graph->absolute.width + .75 * 72;
+-    y2 = graph->absolute.height + .75 * 72;
++    x2 = graph->absolute.width / 1000 + 0.75 * 72;
++    y2 = graph->absolute.height / 1000 + 0.75 * 72;
+     /* start file off with a % */
+     fprintf(plotfile, "%%!PS-Adobe-3.0 EPSF-3.0\n");
+     fprintf(plotfile, "%%%%Creator: nutmeg\n");
+     fprintf(plotfile, "%%%%BoundingBox: %d %d %d %d\n",x1,y1,x2,y2);
+ 
+     fprintf(plotfile, "%g %g scale\n", 1.0 / scale, 1.0 / scale);
++    fprintf(plotfile, "1000 setlinewidth\n");
+ 
+-    if (colorflag == 1){            /* set the background to color0 */
++    cp_getvar("hcopypsnobg", VT_BOOL, &nobg);
++    if (!nobg && colorflag == 1){            /* set the background to color0 */
+ 	PS_SelectColor(0);
+ 	fprintf(plotfile,"%s setrgbcolor\n",pscolor);
+ 	fprintf(plotfile,"newpath\n");
+-	fprintf(plotfile,"%d %d moveto %d %d lineto\n",x1,y1,x2,y1);
+-	fprintf(plotfile,"%d %d lineto %d %d lineto\n",x2,y2,x1,y2);
++	fprintf(plotfile,"%d %d moveto %d %d lineto\n",
++          x1*1000,y1*1000,x2*1000,y1*1000);
++	fprintf(plotfile,"%d %d lineto %d %d lineto\n",
++          x2*1000,y2*1000,x1*1000,y2*1000);
+ 	fprintf(plotfile,"closepath fill\n");
+     }
+ 
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-9999.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-9999.ebuild
new file mode 100644
index 000000000000..fcee9f1cbba7
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/ng-spice-rework-9999.ebuild
@@ -0,0 +1,68 @@
+# 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-9999.ebuild,v 1.1 2006/05/10 11:28:50 calchan Exp $
+
+inherit eutils cvs
+
+ECVS_SERVER="cvs.sourceforge.net:/cvsroot/ngspice"
+ECVS_MODULE="ngspice/ng-spice-rework"
+ECVS_USER="anonymous"
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator) from CVS HEAD."
+SRC_URI=""
+HOMEPAGE="http://ngspice.sourceforge.net"
+LICENSE="BSD GPL-2"
+
+SLOT="0"
+IUSE="readline debug"
+KEYWORDS="-*"
+
+DEPEND="readline? ( >=sys-libs/readline-5.0 )"
+
+S=${WORKDIR}/ngspice/ng-spice-rework
+
+src_unpack() {
+	cvs_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-com_let.patch
+	epatch ${FILESDIR}/${PN}-numparam.patch
+	epatch ${FILESDIR}/${PN}-pipemode.patch
+	epatch ${FILESDIR}/${PN}-postscript.patch
+
+	# Getting rid of this for now
+	sed -i -e "/src\/spicelib\/devices\/adms\//d" configure.in
+}
+
+src_compile() {
+	./autogen.sh
+	econf \
+		--enable-maintainer-mode \
+		--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
+}