Enabled xspice and intnoise after testing them, which closes bug #140402. Added optional ngspice and xspice documentation. Fixed X dependencies and made them optional. Fixed collision with external xgraph. Fixed debug messing with compilation optimizations. Made debug even more chatty.

Package-Manager: portage-2.1.2.7

4 files changed, 150 insertions, 5 deletions

diff --git a/sci-electronics/ng-spice-rework/ChangeLog b/sci-electronics/ng-spice-rework/ChangeLog
index b03431087b38..8c554734fb36 100644
--- a/sci-electronics/ng-spice-rework/ChangeLog
+++ b/sci-electronics/ng-spice-rework/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-electronics/ng-spice-rework
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.16 2007/01/31 18:14:15 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ng-spice-rework/ChangeLog,v 1.17 2007/05/26 20:57:56 calchan Exp $
+
+*ng-spice-rework-17-r2 (26 May 2007)
+
+  26 May 2007; Denis Dupeyron <calchan@gentoo.org>
+  +ng-spice-rework-17-r2.ebuild:
+  Enabled xspice and intnoise after testing them, which closes bug #140402.
+  Added optional ngspice and xspice documentation. Fixed X dependencies and
+  made them optional. Fixed collision with external xgraph. Fixed debug
+  messing with compilation optimizations. Made debug even more chatty.
 
   31 Jan 2007; Denis Dupeyron <calchan@gentoo.org>
   ng-spice-rework-9999.ebuild:
diff --git a/sci-electronics/ng-spice-rework/Manifest b/sci-electronics/ng-spice-rework/Manifest
index b9197150e723..052bcdd21054 100644
--- a/sci-electronics/ng-spice-rework/Manifest
+++ b/sci-electronics/ng-spice-rework/Manifest
@@ -18,6 +18,11 @@ AUX ng-spice-rework-postscript.patch 2842 RMD160 47c3187efa6f60f30b1c32b39e5a188
 MD5 1fd91e68ec6e9ed3a1639bc3e2c04fd0 files/ng-spice-rework-postscript.patch 2842
 RMD160 47c3187efa6f60f30b1c32b39e5a188b0f62d29a files/ng-spice-rework-postscript.patch 2842
 SHA256 ccc80d63df56e7d501437b63918ff68e92f08041685a91b471b74835a7c87604 files/ng-spice-rework-postscript.patch 2842
+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 ngspice-rework15.tgz 4813438 RMD160 09daf48b42ac2fb7c763cf1ceeda209f02a9e08f SHA1 4b6674c3342b69c573fce16e727c6f498286c2ad SHA256 3abd75c2dc73a59ea8f09b2108a5a2be34aae0b457a0d73eeb407aa14a413a3c
 EBUILD ng-spice-rework-15.ebuild 1031 RMD160 b4789fadd7cd927322f629d2b690d769a5b5b2b9 SHA1 deb69d8f2c949fd00e56620c4c565e9ed7ac7e03 SHA256 01b0672d4550543c19ad9ff9def0961c43d892384b8744bb4c0e328a43c8b76d
@@ -28,14 +33,18 @@ EBUILD ng-spice-rework-17-r1.ebuild 1546 RMD160 d78b87544c696bc5e505e5816441d2b8
 MD5 7c1e88f9dc31344648a298b26377a168 ng-spice-rework-17-r1.ebuild 1546
 RMD160 d78b87544c696bc5e505e5816441d2b8814f76c5 ng-spice-rework-17-r1.ebuild 1546
 SHA256 55cf9012521c635c6c9fafc401b8ea83db4dc5e16bf1dc645a93d3aa5b0f0aa6 ng-spice-rework-17-r1.ebuild 1546
+EBUILD ng-spice-rework-17-r2.ebuild 3047 RMD160 5ef28cb77f35555d78db6980b17599b66a748890 SHA1 224930d65fc3df6344885b424b3f7fa3e7f0f5fa SHA256 f14e4f99f7ecd1538782547888b68bdf7df42aa94412fe1a2c127503aa51c314
+MD5 502a785c4923c5cea1beb1c37aeff8d0 ng-spice-rework-17-r2.ebuild 3047
+RMD160 5ef28cb77f35555d78db6980b17599b66a748890 ng-spice-rework-17-r2.ebuild 3047
+SHA256 f14e4f99f7ecd1538782547888b68bdf7df42aa94412fe1a2c127503aa51c314 ng-spice-rework-17-r2.ebuild 3047
 EBUILD ng-spice-rework-9999.ebuild 1795 RMD160 c9eb7cd0d982928e278d0097f097986f3380c348 SHA1 e4da4730f297c35dc270b0bb19daaa54a3063df6 SHA256 7aefe7e875df2a93f1b009b9a6a74a82dbda3912e1cd693f8a256b019435139e
 MD5 28bb390ace29af7a9702a999a2b97df6 ng-spice-rework-9999.ebuild 1795
 RMD160 c9eb7cd0d982928e278d0097f097986f3380c348 ng-spice-rework-9999.ebuild 1795
 SHA256 7aefe7e875df2a93f1b009b9a6a74a82dbda3912e1cd693f8a256b019435139e ng-spice-rework-9999.ebuild 1795
-MISC ChangeLog 3165 RMD160 ac5a067c5dadcac57ac422df74f23a4081affa25 SHA1 6b7e28d31c8b0fb1b40b1777910c8366b4fc3024 SHA256 5ecf8fef3bae91df331f29fb16143d0e1140b88a4a527eec3c147c4e69d54adc
-MD5 40b0accc4166d7e266a9c083dcb6ec55 ChangeLog 3165
-RMD160 ac5a067c5dadcac57ac422df74f23a4081affa25 ChangeLog 3165
-SHA256 5ecf8fef3bae91df331f29fb16143d0e1140b88a4a527eec3c147c4e69d54adc ChangeLog 3165
+MISC ChangeLog 3583 RMD160 7ff3fc145e57243804e1f822149b4c111b2733e6 SHA1 5eb6986905591da610c5a2935fee3e9410ba7d9a SHA256 28fa9050b948e8ef8d85566905495f10c4a86d5f239c2685eed68ccc65405961
+MD5 ea38b919bcbbbfb6663e66ab92cf664a ChangeLog 3583
+RMD160 7ff3fc145e57243804e1f822149b4c111b2733e6 ChangeLog 3583
+SHA256 28fa9050b948e8ef8d85566905495f10c4a86d5f239c2685eed68ccc65405961 ChangeLog 3583
 MISC metadata.xml 361 RMD160 6a0aea151a531b83b4df35307363793de698bc16 SHA1 3e5c1bc6ec70c652533c17535a248e06577be702 SHA256 0cb29147232be6569c365b9e694962c7b606a81ce4c4ce7b404a937378a1d0b8
 MD5 921fcc44ad34d71c06a40e571dcf2d86 metadata.xml 361
 RMD160 6a0aea151a531b83b4df35307363793de698bc16 metadata.xml 361
@@ -46,6 +55,9 @@ SHA256 795a5ae42bb0d7eb0e6d2712000d3cf21fc59fcdf6e1f3783349ee39912e587b files/di
 MD5 3ae6317642f0e94a7abced651296d868 files/digest-ng-spice-rework-17-r1 259
 RMD160 076219722d64354cee58fda4b3c83d5c4902b1e2 files/digest-ng-spice-rework-17-r1 259
 SHA256 b0c80b0c2fd1c736600c67d593954cd2312944139ae0d6f4f00b3a08529c4f79 files/digest-ng-spice-rework-17-r1 259
+MD5 6e354e897e5dd8bba71c7885d1978119 files/digest-ng-spice-rework-17-r2 1698
+RMD160 774038de49223afe7f1f13804c0b4540552bff0e files/digest-ng-spice-rework-17-r2 1698
+SHA256 791fdc7067d02a35e06cca499856368f50b930fdc814fa203bab892531e783dd files/digest-ng-spice-rework-17-r2 1698
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ng-spice-rework-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ng-spice-rework-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ng-spice-rework-9999 0
diff --git a/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-17-r2 b/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-17-r2
new file mode 100644
index 000000000000..0a50b207ecdb
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/files/digest-ng-spice-rework-17-r2
@@ -0,0 +1,18 @@
+MD5 dba091c44f884e9cb9e547ee079ff69c XSpice_CodeModelSubsysInterfaceDesign.pdf 2285998
+RMD160 83669a35a58065ea5ffe636356841c6cbc3e730b XSpice_CodeModelSubsysInterfaceDesign.pdf 2285998
+SHA256 498bc50a64b9a303c10153bb3f454acb8dbe7099a6cd532df0ae5bc9edeec20e XSpice_CodeModelSubsysInterfaceDesign.pdf 2285998
+MD5 b407ba0b5a5d84a723100917cc598da7 XSpice_CodeModelSubsysSoftwareDesign.pdf 6941750
+RMD160 a7550868a48adfde4e1f5b95fe8015e91f2d1768 XSpice_CodeModelSubsysSoftwareDesign.pdf 6941750
+SHA256 4df8e25a6e19cab761a744ddf2e88f38e26cdc5eaef8e365b9bce4612b89c5f5 XSpice_CodeModelSubsysSoftwareDesign.pdf 6941750
+MD5 891ec5f66cd31b4e471a05cf7970b8dd XSpice_InterfaceDesignDoc_Sep92.pdf 1449807
+RMD160 c64386eb40f63f0cc2b67382a3d70d42d36d7a95 XSpice_InterfaceDesignDoc_Sep92.pdf 1449807
+SHA256 013e99b2b249b5f30fdc197dae8ffa6d8f54409ecc805628072f4997eb27ff87 XSpice_InterfaceDesignDoc_Sep92.pdf 1449807
+MD5 4d3eb43416bc726a279efb992a0364ab XSpice_SoftwareDesignDoc_Sep92.pdf 9675304
+RMD160 bd987708a9c5d5e54854edda64988c279ba084e3 XSpice_SoftwareDesignDoc_Sep92.pdf 9675304
+SHA256 597fac4778aaf5d24697dbfc5fa5b550080dd123c783fd226ab1258243d8c3d8 XSpice_SoftwareDesignDoc_Sep92.pdf 9675304
+MD5 80309d87a97dfc9c45ddc869beeefbf2 Xspice_Users_Manual.pdf 6662909
+RMD160 6c0e5b1174811f4a598b0b6fd6cdd105e7970627 Xspice_Users_Manual.pdf 6662909
+SHA256 6f1fbecb03d50517ee99fc7fc17023482a0b1bbec1ff862dab29bcdf361c7311 Xspice_Users_Manual.pdf 6662909
+MD5 abe283dea98b913a2122f085076865b1 ng-spice-rework-17.tar.gz 5919637
+RMD160 2345cbdb608bfb182d33c1a6497408b22acffb77 ng-spice-rework-17.tar.gz 5919637
+SHA256 58ec02a0ab48369724c9e98f9a6aa3e0f400ae7b361ba194f4bf06d1420f4496 ng-spice-rework-17.tar.gz 5919637
diff --git a/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild b/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild
new file mode 100644
index 000000000000..bdfa926adc41
--- /dev/null
+++ b/sci-electronics/ng-spice-rework/ng-spice-rework-17-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 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 $
+
+inherit 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_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
+	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
+}
+
+src_compile() {
+	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) \
+		|| 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
+
+	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
+}