The readline library is in the base profile. So there is no need to explicitely depend on it or make it an option. This fixes bug #148576, thanks to Karl Heiss and Jurek Bartuszek.

Package-Manager: portage-2.1.2_pre1

3 files changed, 17 insertions, 26 deletions

diff --git a/sci-electronics/gnucap/ChangeLog b/sci-electronics/gnucap/ChangeLog
index 0927a2a3425f..b05b57b24f74 100644
--- a/sci-electronics/gnucap/ChangeLog
+++ b/sci-electronics/gnucap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2006/09/19 16:54:30 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/ChangeLog,v 1.24 2006/09/23 12:38:26 calchan Exp $
+
+  23 Sep 2006; Denis Dupeyron <calchan@gentoo.org> gnucap-20060830.ebuild:
+  The readline library is in the base profile. So there is no need to
+  explicitely depend on it or make it an option. This fixes bug #148576,
+  thanks to Karl Heiss and Jurek Bartuszek.
 
   19 Sep 2006; Denis Dupeyron <calchan@gentoo.org>
   -files/gnucap-0.34-gcc-3.4.patch, -gnucap-0.34.ebuild,
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index e4257e897353..63c80a151f37 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -4,14 +4,14 @@ EBUILD gnucap-20060708.ebuild 1518 RMD160 a528e000ac066614e3f7f8810879be6a1a3a06
 MD5 4209d4c3600f4edff055dcb54b875cfa gnucap-20060708.ebuild 1518
 RMD160 a528e000ac066614e3f7f8810879be6a1a3a06b6 gnucap-20060708.ebuild 1518
 SHA256 5959845f625a2be829b3eb27bb3b615dbf95c3b9fe27242c5abc6ed808705f7a gnucap-20060708.ebuild 1518
-EBUILD gnucap-20060830.ebuild 1522 RMD160 1c74dbdfedf49e5ad3fedd34bec46be8e6974c23 SHA1 b057ff08756b3dc6efdd803eb03ad1add1767838 SHA256 647678d6b4fcde52896f38597f4bebb79326a140fbcfcc1ff20e448260149ceb
-MD5 3d083740abaaa5328048cf34f3d9561a gnucap-20060830.ebuild 1522
-RMD160 1c74dbdfedf49e5ad3fedd34bec46be8e6974c23 gnucap-20060830.ebuild 1522
-SHA256 647678d6b4fcde52896f38597f4bebb79326a140fbcfcc1ff20e448260149ceb gnucap-20060830.ebuild 1522
-MISC ChangeLog 3876 RMD160 730229e599f086250709e35cb3f326ad29f1408c SHA1 d7726ce00daa34a7cc3f0fa086814147e9e94e00 SHA256 73cbabce38f2e2b4a9949fb6ab40ca85d4bcde80029c06b9528598d499143f05
-MD5 d0b225b322c0b0bd8afbdb754c1a2a03 ChangeLog 3876
-RMD160 730229e599f086250709e35cb3f326ad29f1408c ChangeLog 3876
-SHA256 73cbabce38f2e2b4a9949fb6ab40ca85d4bcde80029c06b9528598d499143f05 ChangeLog 3876
+EBUILD gnucap-20060830.ebuild 1146 RMD160 27b4627111a1b42c1ea188f94d007aa568803b0d SHA1 5de11b1472d7c664164eef7a13eee208570cc774 SHA256 5c6598b156f524de3f33302e047b0a821a7dd0774a530047e7069dcdce79a947
+MD5 673b2c9a26a365e3810a3a78a16728f0 gnucap-20060830.ebuild 1146
+RMD160 27b4627111a1b42c1ea188f94d007aa568803b0d gnucap-20060830.ebuild 1146
+SHA256 5c6598b156f524de3f33302e047b0a821a7dd0774a530047e7069dcdce79a947 gnucap-20060830.ebuild 1146
+MISC ChangeLog 4139 RMD160 3a4064c83dfa97974a7dac4c75d8ed104cd2ea63 SHA1 929854d2f589c3d9f2f2adc60a8e65872cdaafc2 SHA256 c5c5c71943113a4ff1cf534970b0f430cc5cc2030b119c86523f564886a1cdf9
+MD5 93394a7781d3df67a7f4b96ccbcc5941 ChangeLog 4139
+RMD160 3a4064c83dfa97974a7dac4c75d8ed104cd2ea63 ChangeLog 4139
+SHA256 c5c5c71943113a4ff1cf534970b0f430cc5cc2030b119c86523f564886a1cdf9 ChangeLog 4139
 MISC metadata.xml 639 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e SHA1 7c60875a5cf344f4c4ac272f1d49ecba5d813ae2 SHA256 ff13dbf0ea2bc18a97e2b456c50c0b57082e14e5bde50ebb04395d955e3d9076
 MD5 3da70d3ad23068a8a39c22cdce8999af metadata.xml 639
 RMD160 ddee6180e0025cae9e4ea9af68209788a0fc282e metadata.xml 639
diff --git a/sci-electronics/gnucap/gnucap-20060830.ebuild b/sci-electronics/gnucap/gnucap-20060830.ebuild
index 21e6a8592b30..0af54ae33622 100644
--- a/sci-electronics/gnucap/gnucap-20060830.ebuild
+++ b/sci-electronics/gnucap/gnucap-20060830.ebuild
@@ -1,6 +1,6 @@
 # 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-20060830.ebuild,v 1.2 2006/09/16 14:22:51 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnucap/gnucap-20060830.ebuild,v 1.3 2006/09/23 12:38:26 calchan Exp $
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6}"
 
@@ -8,27 +8,18 @@ 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="doc examples readline"
+IUSE="doc examples"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="doc? ( app-text/tetex )
-	readline? ( sys-libs/readline )"
+DEPEND="doc? ( app-text/tetex )"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_unpack() {
 	unpack ${A} || die "Failed to unpack!"
 	cd ${S}
 
-	# Don't let gnucap decide whether to use readline
-	if ! use readline ; then
-		sed -i \
-			-e 's:LIBS="-lreadline $LIBS":LIBS="$LIBS":' \
-			-e 's:#define HAVE_LIBREADLINE 1:#define HAVE_LIBREADLINE 0:' \
-			configure || die "sed failed"
-	fi
-
 	# No need to install COPYING and INSTALL
 	sed -i \
 		-e 's: COPYING INSTALL::' \
@@ -48,11 +39,6 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	econf || die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
 src_install () {
 	make DESTDIR=${D} install || die "Installation failed"
 }