Version Bump, #270876; Prevend stripping, #252036, removed old versions
authorJustin Lecher <jlec@gentoo.org>
Thu, 24 Jun 2010 10:41:52 +0000 (10:41 +0000)
committerJustin Lecher <jlec@gentoo.org>
Thu, 24 Jun 2010 10:41:52 +0000 (10:41 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

13 files changed:
sci-electronics/ng-spice-rework/ChangeLog
sci-electronics/ng-spice-rework/Manifest
sci-electronics/ng-spice-rework/files/ng-spice-rework-15.gcc-3.4.patch [deleted file]
sci-electronics/ng-spice-rework/files/ng-spice-rework-18-nostrip.patch [new file with mode: 0644]
sci-electronics/ng-spice-rework/files/ng-spice-rework-21-nostrip.patch [new file with mode: 0644]
sci-electronics/ng-spice-rework/files/ng-spice-rework-21-src_makefile.patch [new file with mode: 0644]
sci-electronics/ng-spice-rework/files/ng-spice-rework-com_let.patch [deleted file]
sci-electronics/ng-spice-rework/files/ng-spice-rework-numparam.patch [deleted file]
sci-electronics/ng-spice-rework/files/ng-spice-rework-pipemode.patch [deleted file]
sci-electronics/ng-spice-rework/ng-spice-rework-15.ebuild [deleted file]
sci-electronics/ng-spice-rework/ng-spice-rework-17-r1.ebuild [deleted file]
sci-electronics/ng-spice-rework/ng-spice-rework-18-r1.ebuild [new file with mode: 0644]
sci-electronics/ng-spice-rework/ng-spice-rework-21.ebuild [moved from sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild with 73% similarity]

index 955f1560b5c0bb0db7d4057c151940f3cb3cff88..af1ef976db296cff02cc0b682b76f8f04c60c8a7 100644 (file)
@@ -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)
 
index 9729dab3019294b3aa082d989f142827747ff4ac..7aa05e1b56a1e89f1a4aec5c5162a2310585b4b8 100644 (file)
@@ -1,21 +1,28 @@
-AUX ng-spice-rework-15.gcc-3.4.patch 804 RMD160 d5dff5f8e39d828b6eb189dc6fe84141628c9f43 SHA1 f8e5e6956315959e0016c7252ace1996b720ecdf SHA256 788ab5054992038777aafd2dad2fe9307f9352c7d9600e91dd1aa7e273870a2a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ng-spice-rework-18-nostrip.patch 1043 RMD160 26a89bfd5dc485fc3a1040d04690bee8d1745cea SHA1 5976ae5cd0bbe90c63c7b8d06d52617c86fc37a4 SHA256 a59ec65aef218ba32dc392531d5ec7568bd19b9b643a733752e87749ce207e30
 AUX ng-spice-rework-18-src_makefile.patch 955 RMD160 dcc58a27fa58a0d6efc2523c46d62e32ffe52a3c SHA1 82cd4f457c5b86d8bf2614f42d38c444a7c453ce SHA256 601f63cf6b64a2fa0d76dae28aa11ef2d6930d5a972dfa71c42486466b500854
-AUX ng-spice-rework-com_let.patch 504 RMD160 cba8324b3a157936f9014f1d4aabbf8051c4d415 SHA1 14763d9a1bfcf6269b9b5aee36b30dd36a2b2157 SHA256 37b61f085883fe53896c04bbad22c4134dc47ad62697ba5c55674c3d2f6418a8
-AUX ng-spice-rework-numparam.patch 1335 RMD160 b181c90de971e08c931d03cb14a91263fc7585da SHA1 ce1b75c38e7d2d46472adae70bdf6c85a08c4dc9 SHA256 85d93abd480187e5ab62544b37067ec3910beb4e674c6afe64e901c58cc65be0
-AUX ng-spice-rework-pipemode.patch 1462 RMD160 466a50ed92c0c8bd922a5e270ce5cc73097a0ae4 SHA1 7f7362e98a226698c6ce3a93a5c971d4cce54d81 SHA256 6cbe5d9b8ab667e628a2d98242457b864c1951067327da1c1e491a7af25ebb2b
+AUX ng-spice-rework-21-nostrip.patch 986 RMD160 ca7283181dc8084aaeb651b0b7069737dd3ace0a SHA1 bec0d2148c7ac388667d4213bb5c2ae8667a7021 SHA256 9f725feb74569bf9e41947ce5297138debed160b3a400efe68a473a7a7db3c4b
+AUX ng-spice-rework-21-src_makefile.patch 761 RMD160 a35b0a2a469434a67e77f8d57b2ea78513695927 SHA1 892a23a27b3d2c6c072a34b380144f3f37fbda6c SHA256 5fd6eb8ae1a7a5955009d1bbfad904861957b15e76f79394b66a91c030b52ba8
 AUX ng-spice-rework-postscript.patch 2842 RMD160 47c3187efa6f60f30b1c32b39e5a188b0f62d29a SHA1 1fb74659001b079c966d5f0fb5c53e5bc8cf9560 SHA256 ccc80d63df56e7d501437b63918ff68e92f08041685a91b471b74835a7c87604
 DIST XSpice_CodeModelSubsysInterfaceDesign.pdf 2285998 RMD160 83669a35a58065ea5ffe636356841c6cbc3e730b SHA1 e0e33c73d22a3490e2fc9349d380b8128cf70eaa SHA256 498bc50a64b9a303c10153bb3f454acb8dbe7099a6cd532df0ae5bc9edeec20e
 DIST XSpice_CodeModelSubsysSoftwareDesign.pdf 6941750 RMD160 a7550868a48adfde4e1f5b95fe8015e91f2d1768 SHA1 78ffe86672774500f6557a6cdc53c3d1a7f46d53 SHA256 4df8e25a6e19cab761a744ddf2e88f38e26cdc5eaef8e365b9bce4612b89c5f5
 DIST XSpice_InterfaceDesignDoc_Sep92.pdf 1449807 RMD160 c64386eb40f63f0cc2b67382a3d70d42d36d7a95 SHA1 429b4c8d62b34c970267ec75764f63db34174c17 SHA256 013e99b2b249b5f30fdc197dae8ffa6d8f54409ecc805628072f4997eb27ff87
 DIST XSpice_SoftwareDesignDoc_Sep92.pdf 9675304 RMD160 bd987708a9c5d5e54854edda64988c279ba084e3 SHA1 d4da4f26b65393cc6fb185e7f474efbe97d9c685 SHA256 597fac4778aaf5d24697dbfc5fa5b550080dd123c783fd226ab1258243d8c3d8
 DIST Xspice_Users_Manual.pdf 6662909 RMD160 6c0e5b1174811f4a598b0b6fd6cdd105e7970627 SHA1 9187e6c892972add140af5a027ab4b3227499fdd SHA256 6f1fbecb03d50517ee99fc7fc17023482a0b1bbec1ff862dab29bcdf361c7311
-DIST ng-spice-rework-17.tar.gz 5919637 RMD160 2345cbdb608bfb182d33c1a6497408b22acffb77 SHA1 5ce17a6dff309fae069e0b1e7309eb1c16b4671b SHA256 58ec02a0ab48369724c9e98f9a6aa3e0f400ae7b361ba194f4bf06d1420f4496
 DIST ng-spice-rework-18.tar.gz 7061554 RMD160 e123c97060ce427ff11e6859b61dbd471ebf0cf9 SHA1 fd97cf87e164ad5b9f8ff8c73cfcef4480c4047e SHA256 1ae8ff5db42a0ca89803faed17fca75836f7c4f8dc026530efabc57eb4956954
-DIST ngspice-rework15.tgz 4813438 RMD160 09daf48b42ac2fb7c763cf1ceeda209f02a9e08f SHA1 4b6674c3342b69c573fce16e727c6f498286c2ad SHA256 3abd75c2dc73a59ea8f09b2108a5a2be34aae0b457a0d73eeb407aa14a413a3c
-EBUILD ng-spice-rework-15.ebuild 1031 RMD160 b4789fadd7cd927322f629d2b690d769a5b5b2b9 SHA1 deb69d8f2c949fd00e56620c4c565e9ed7ac7e03 SHA256 01b0672d4550543c19ad9ff9def0961c43d892384b8744bb4c0e328a43c8b76d
-EBUILD ng-spice-rework-17-r1.ebuild 1546 RMD160 d78b87544c696bc5e505e5816441d2b8814f76c5 SHA1 140c24ada8e70c06801d8bc7dc4e00d94eca69c0 SHA256 55cf9012521c635c6c9fafc401b8ea83db4dc5e16bf1dc645a93d3aa5b0f0aa6
-EBUILD ng-spice-rework-17-r2.ebuild 3047 RMD160 5ef28cb77f35555d78db6980b17599b66a748890 SHA1 224930d65fc3df6344885b424b3f7fa3e7f0f5fa SHA256 f14e4f99f7ecd1538782547888b68bdf7df42aa94412fe1a2c127503aa51c314
+DIST ng-spice-rework-21.tar.gz 5760859 RMD160 f48bc6549a08cc9c3e0886fd4e09ff46debf86dc SHA1 4a66885b0de2333c0d07cefc6af41b557c46ffde SHA256 450ad25f236d45394aaa9c727a2894bf65f263fda0f7b85e47feeb360675bbc2
+EBUILD ng-spice-rework-18-r1.ebuild 3088 RMD160 8559f2d40b6970603233f5f19d148f60bc748e2e SHA1 9d5d212578ced22ca94732d27030c4705c652cb1 SHA256 0c503967a0d63fc492286e3157a8919ea5523205525cfe91f20f8b8cd922eaa4
 EBUILD ng-spice-rework-18.ebuild 3030 RMD160 ab3c27f76b02bfb61ae2f3ce47b9fb9d00fa13a3 SHA1 a6273bf40261cf7f4b76f3e83f2331b54f56acc4 SHA256 57aa9369bbd073e841b900d3a85229035b465fa19897c6110ae0d2d0a467bc28
+EBUILD ng-spice-rework-21.ebuild 2991 RMD160 eb043dd7a60f4080482200fb20fdfc8e1ef334a7 SHA1 0a7df72d56b8b994d04c8f443caa386701d855ba SHA256 ac0bacfc092de9292cf66063fc15012cf1272c83075c9a462b31952d58bf1f51
 EBUILD ng-spice-rework-9999.ebuild 1795 RMD160 c9eb7cd0d982928e278d0097f097986f3380c348 SHA1 e4da4730f297c35dc270b0bb19daaa54a3063df6 SHA256 7aefe7e875df2a93f1b009b9a6a74a82dbda3912e1cd693f8a256b019435139e
-MISC ChangeLog 3775 RMD160 8834a2803576961034e6b37f8238a4501a721a76 SHA1 2baeddfd3b340b3e799dde53dff38b0c8d4e6f78 SHA256 3f9e882c3b3830daa76ccf6bd8ee69016a3714a8fede2452c6f1e0f04519bf53
+MISC ChangeLog 4416 RMD160 3656cea3e1d907c7d3f0066e3dbcec8cc5a10abd SHA1 fe098ca02b246f8af909ffc7469a42591b0d0eb5 SHA256 1ff13ca0e5163dd57b86432fd5859c581264426a11b2c712f0a5108a7b5b5313
 MISC metadata.xml 361 RMD160 6a0aea151a531b83b4df35307363793de698bc16 SHA1 3e5c1bc6ec70c652533c17535a248e06577be702 SHA256 0cb29147232be6569c365b9e694962c7b606a81ce4c4ce7b404a937378a1d0b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjNnYACgkQgAnW8HDreRbe9ACfTsN2kb/rq5FUZQLotov9hsc3
+1G8An0prETAX153dgvGYo+aSkY0jtiH7
+=tywm
+-----END PGP SIGNATURE-----
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 (file)
index cd9f6ba..0000000
+++ /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 (file)
index 0000000..e789c28
--- /dev/null
@@ -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 (file)
index 0000000..22caec1
--- /dev/null
@@ -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 (file)
index 0000000..127bf9e
--- /dev/null
@@ -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 (file)
index 2fc7626..0000000
+++ /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 (file)
index 744f235..0000000
+++ /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 (file)
index 871355f..0000000
+++ /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 (file)
index e72b12c..0000000
+++ /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 (file)
index 729a6ae..0000000
+++ /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 (file)
index 0000000..f053173
--- /dev/null
@@ -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
+}
similarity index 73%
rename from sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild
rename to sci-electronics/ng-spice-rework/ng-spice-rework-21.ebuild
index bdfa926adc412c8e9d3e9676e9b8d9cd3bca7364..ace6c50bca8c55febd639af4f20e4bb0e62e8e3a 100644 (file)
@@ -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 () {