Version bump.

(Portage version: 2.0.54-r2)

6 files changed, 107 insertions, 25 deletions

diff --git a/sci-electronics/gnucap/ChangeLog b/sci-electronics/gnucap/ChangeLog
index 0a5b575f9300..25c6a4e75cca 100644
--- a/sci-electronics/gnucap/ChangeLog
+++ b/sci-electronics/gnucap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/gnucap
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.11 2006/04/07 22:40:57 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.12 2006/05/21 17:55:45 calchan Exp $
+
+*gnucap-20060506 (21 May 2006)
+
+  21 May 2006; Denis Dupeyron <calchan@gentoo.org>
+  +files/gnucap-flags.patch, +files/gnucap-no-readline.patch,
+  +gnucap-20060506.ebuild:
+  Version bump.
 
 *gnucap-20060117 (07 Apr 2006)
 
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index 047e1487152a..56fcbf6dbc0a 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -1,36 +1,16 @@
 MD5 c68e946a9369668761cb5437eccec3b2 ChangeLog 2129
-RMD160 1de3f9b8e45d37a1f07b587fd546ab23f4b7d51c ChangeLog 2129
-SHA256 ff4ba58a879114fecb61c0fd38c2c1362ef03f1dec28a9f39bb90db85e47b7b6 ChangeLog 2129
 MD5 422d28bb9715c39495a5df8a4b5f8410 files/digest-gnucap-0.34 64
-RMD160 10f18cc12578fe761e88f5a1b24ed8ea37dc0732 files/digest-gnucap-0.34 64
-SHA256 1e9798b9569cc679ae06fd2d8d23ada64ba3b3ed4b6f3667314dc4ef30939c0a files/digest-gnucap-0.34 64
 MD5 f09632390e8c869dd1850966edf9693e files/digest-gnucap-20050220 70
-RMD160 b8fd7e9724c7b3ffce2767f7b83de2ebd095e157 files/digest-gnucap-20050220 70
-SHA256 7a66a3f467edd8e38932ba53d198241d48c591102b2b11d57e321e09b1923650 files/digest-gnucap-20050220 70
 MD5 383fd70cc120eb386a140830136033bf files/digest-gnucap-20050808 70
-RMD160 cf77a5f0c18ed73fc9e7eb3a6414a711e030f02a files/digest-gnucap-20050808 70
-SHA256 c1e3438d0e008ac9a7685ff0430e06fd052421b6177cc570b4efb479df9a3b7e files/digest-gnucap-20050808 70
 MD5 8b3f12e6757a9f382847afdcef8bda7b files/digest-gnucap-20060117 256
-RMD160 407059babe09917148314ba5c2d6acc8624adf0f files/digest-gnucap-20060117 256
-SHA256 63ad0fff073640cb6f5a934e248ed71cb8098c1828a0b0f630575c941fc08a19 files/digest-gnucap-20060117 256
+MD5 1eade68bb0e4ab2d0c589377c8c57c3c files/digest-gnucap-20060506 70
 MD5 cfff235a3e29ee1da31b2cf30d18d014 files/gnucap-0.34-gcc-3.4.patch 9178
-RMD160 dc83ef96d258927b6675d332729e92f1f5b7e294 files/gnucap-0.34-gcc-3.4.patch 9178
-SHA256 136bbb245eb29c3e415d8877a61ef4faa0dbb2f005d9e41904f80653d1108340 files/gnucap-0.34-gcc-3.4.patch 9178
 MD5 f1c66cfefc01399cf1186db158c87e22 files/gnucap-20060117.gcc-4.1.patch 1111
-RMD160 85aca1251400ebb2f378af3b92476c934a08eb33 files/gnucap-20060117.gcc-4.1.patch 1111
-SHA256 be1c02acb9494a452495eaf0c82948b9681724d38d61621958b438c2189b8fd0 files/gnucap-20060117.gcc-4.1.patch 1111
+MD5 29f56bb661d166d99688f9b7277dfe61 files/gnucap-flags.patch 1075
+MD5 d79620106aff9bf852a2ab06639fb521 files/gnucap-no-readline.patch 458
 MD5 8f70e78bea1ebff08374724d629205f5 gnucap-0.34.ebuild 787
-RMD160 4289f17fb71a86541da256d8e6b2f77b5768f6dc gnucap-0.34.ebuild 787
-SHA256 50828651a82cac2b0d699cdabc2cd7cc248fb1b9db6480b4279c777b74985282 gnucap-0.34.ebuild 787
 MD5 a53cf51580556107d0c3c054655a8eb9 gnucap-20050220.ebuild 784
-RMD160 633014c58200c34f9fc3c464ffde41633e2db940 gnucap-20050220.ebuild 784
-SHA256 d4a32fd4a4935fbf590506bd7660a8a54ca1f871ce43145d80e4783e9cfc380b gnucap-20050220.ebuild 784
 MD5 9d75c2efd6342037621d7211eaa6791c gnucap-20050808.ebuild 784
-RMD160 e34c8f474cc26d73954e0cf00bd6a50a6e91135b gnucap-20050808.ebuild 784
-SHA256 2b04c8f637a13648d3eb5c74e162adca2bcf8a7a11937a92abfe35e34b581e37 gnucap-20050808.ebuild 784
 MD5 5faa68a2d17c7e67a05f4d331a67b5a2 gnucap-20060117.ebuild 921
-RMD160 c9071eb23b68929f7c22ec330e3119ba3799736e gnucap-20060117.ebuild 921
-SHA256 d4c069784d45638bf0f0d7c8f2fc4fd5729fa5268919227a54a35306a975cf52 gnucap-20060117.ebuild 921
+MD5 89bc0263e80bd1d9ca98f9f84dc971b7 gnucap-20060506.ebuild 1057
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-RMD160 97dc1fa1de002625a0e04371d72e5d457e63045e metadata.xml 220
-SHA256 2f6b6030e20679df7ccb7dab65f5ca6890144aa443f815d11e494a035ffef399 metadata.xml 220
diff --git a/sci-electronics/gnucap/files/digest-gnucap-20060506 b/sci-electronics/gnucap/files/digest-gnucap-20060506
new file mode 100644
index 000000000000..8e61d9ffc335
--- /dev/null
+++ b/sci-electronics/gnucap/files/digest-gnucap-20060506
@@ -0,0 +1 @@
+MD5 e815477ada662c573070c1da3bd14b09 gnucap-2006-05-06.tar.gz 1356673
diff --git a/sci-electronics/gnucap/files/gnucap-flags.patch b/sci-electronics/gnucap/files/gnucap-flags.patch
new file mode 100644
index 000000000000..79fce004a31a
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-flags.patch
@@ -0,0 +1,34 @@
+diff -Nadurp gnucap-2006-05-06/modelgen/Make2.g++ gnucap-2006-05-06-gentoo/modelgen/Make2.g++
+--- gnucap-2006-05-06/modelgen/Make2.g++	2006-05-06 07:02:51.000000000 +0200
++++ gnucap-2006-05-06-gentoo/modelgen/Make2.g++	2006-05-21 17:45:07.000000000 +0200
+@@ -25,9 +25,8 @@ VPATH = .:..
+ 
+ CCC = g++
+ CCFLAGS = \
+--DUNIX -O2 -DNDEBUG -I.. -I. -fexceptions -W
++-DUNIX -O2 -DNDEBUG -I.. -I. -fexceptions -W $(CXXFLAGS)
+ LIBS = -lm
+-LDFLAGS =
+ 
+ .SUFFIXES : .o .cc
+ .cc.o:; $(CCC) $(CCFLAGS) -c $<
+diff -Nadurp gnucap-2006-05-06/src/configure gnucap-2006-05-06-gentoo/src/configure
+--- gnucap-2006-05-06/src/configure	2005-09-06 21:08:39.000000000 +0200
++++ gnucap-2006-05-06-gentoo/src/configure	2006-05-21 17:50:10.000000000 +0200
+@@ -19,7 +19,7 @@ else
+ fi
+ rm -f a.out
+ 
+-echo "-DUNIX -O2 -DNDEBUG -I.. -I. -W" >>Make.ccflags
++echo "-DUNIX -O2 -DNDEBUG -I.. -I. -W ${CXXFLAGS}" >>Make.ccflags
+ echo "" >>Make.libs
+ echo "" >>Make.libs
+ 
+@@ -28,7 +28,6 @@ cat <<CAT_EOF >Make.sys
+ VPATH = .:..
+ CCC = g++
+ 
+-LDFLAGS =
+ 
+ .SUFFIXES : .o .cc
+ .cc.o:; \$(CCC) \$(CCFLAGS) -c \$<
diff --git a/sci-electronics/gnucap/files/gnucap-no-readline.patch b/sci-electronics/gnucap/files/gnucap-no-readline.patch
new file mode 100644
index 000000000000..6951c8c54e1a
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-no-readline.patch
@@ -0,0 +1,11 @@
+diff -Nadurp gnucap-2006-05-06/src/configure gnucap-2006-05-06-no-readline/src/configure
+--- gnucap-2006-05-06/src/configure	2006-05-21 18:02:49.000000000 +0200
++++ gnucap-2006-05-06-no-readline/src/configure	2006-05-21 18:05:23.000000000 +0200
+@@ -10,6 +10,7 @@ echo "LIBS = \\" >Make.libs
+ 
+ rm -f a.out
+ g++ -lreadline -ltermcap test_readline.cc
++rm -f a.out
+ if [ -f a.out ] ; then
+     echo "using readline"
+     echo "-DHAS_READLINE \\" >>Make.ccflags
diff --git a/sci-electronics/gnucap/gnucap-20060506.ebuild b/sci-electronics/gnucap/gnucap-20060506.ebuild
new file mode 100644
index 000000000000..8192ecc8feec
--- /dev/null
+++ b/sci-electronics/gnucap/gnucap-20060506.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-20060506.ebuild,v 1.1 2006/05/21 17:55:46 calchan Exp $
+
+inherit eutils
+
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6}"
+
+DESCRIPTION="GNUCap is the GNU Circuit Analysis Package"
+SRC_URI="http://geda.seul.org/dist/gnucap-${MY_PV}.tar.gz"
+HOMEPAGE="http://www.geda.seul.org/tools/gnucap"
+
+IUSE="readline"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+DEPEND="readline? (
+		sys-libs/readline
+		sys-libs/libtermcap-compat )"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A} || die "Failed to unpack!"
+
+	# Fix hardcoded CXXFLAGS and LDFLAGS
+	epatch ${FILESDIR}/gnucap-flags.patch || die "epatch failed"
+
+	# Don't let gnucap decide whether to use readline
+	if ! use readline ; then
+		epatch ${FILESDIR}/gnucap-no-readline.patch || die "epatch failed"
+	fi
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install () {
+	insinto /usr/bin
+	doins src/O/gnucap
+	fperms 755 /usr/bin/gnucap
+
+	dodoc man/gnucap-man.pdf
+	cd doc
+	doman gnucap.1 gnucap-ibis.1
+	dodoc acs-tutorial history whatisit
+}