Version bump (fixes bug #184544).

(Portage version: 2.1.3_rc7)

7 files changed, 56 insertions, 56 deletions

diff --git a/sci-libs/libqalculate/ChangeLog b/sci-libs/libqalculate/ChangeLog
index f58e6f110382..0ef9d4db7b72 100644
--- a/sci-libs/libqalculate/ChangeLog
+++ b/sci-libs/libqalculate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/libqalculate
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/ChangeLog,v 1.19 2007/02/22 01:22:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/ChangeLog,v 1.20 2007/07/09 15:44:46 markusle Exp $
+
+*libqalculate-0.9.6 (08 Jul 2007)
+
+  08 Jul 2007; Markus Dittrich <markusle@gentoo.org>
+  -libqalculate-0.9.0.ebuild, -libqalculate-0.9.2.ebuild, 
+  +files/libqalculate-0.9.6-check-fix.patch, +libqalculate-0.9.6.ebuild:
+  Version bump (fixes bug #184544). Thanks much to
+  Juan Aguado <juantxorena666@gmail.com> for his patches.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-libs/libqalculate/files/digest-libqalculate-0.9.0 b/sci-libs/libqalculate/files/digest-libqalculate-0.9.0
deleted file mode 100644
index c14bbb3ce801..000000000000
--- a/sci-libs/libqalculate/files/digest-libqalculate-0.9.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c730ef9865fc5ef850ae7c7dbe4eb93 libqalculate-0.9.0.tar.gz 693984
-RMD160 9448e6dae8ad9b77b8bd90c96b68e03f25f2d191 libqalculate-0.9.0.tar.gz 693984
-SHA256 5cad6916d9fb38fab662ef812bff55d79653d144e734ab4c66cd1424ef556449 libqalculate-0.9.0.tar.gz 693984
diff --git a/sci-libs/libqalculate/files/digest-libqalculate-0.9.2 b/sci-libs/libqalculate/files/digest-libqalculate-0.9.2
deleted file mode 100644
index c33198bd7a06..000000000000
--- a/sci-libs/libqalculate/files/digest-libqalculate-0.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz 727986
-RMD160 8d6a5b1a1b0e417b07abb0adbd46fca5dcc9d3cd libqalculate-0.9.2.tar.gz 727986
-SHA256 34c599be5c0c1c8b8009c974688e62d4e698e737aea121a1fe11e44742b450d6 libqalculate-0.9.2.tar.gz 727986
diff --git a/sci-libs/libqalculate/files/digest-libqalculate-0.9.6 b/sci-libs/libqalculate/files/digest-libqalculate-0.9.6
new file mode 100644
index 000000000000..eb3bcd32b5de
--- /dev/null
+++ b/sci-libs/libqalculate/files/digest-libqalculate-0.9.6
@@ -0,0 +1,3 @@
+MD5 e14432fc490f9a697e23e31a74e0eb19 libqalculate-0.9.6.tar.gz 1111134
+RMD160 30f819530236da6b6b78088754643408c8aeb70d libqalculate-0.9.6.tar.gz 1111134
+SHA256 d9bd34a026e130d987e92994d9fd9437fc3187c022ef0931bea335e8479722fc libqalculate-0.9.6.tar.gz 1111134
diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch b/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch
new file mode 100644
index 000000000000..b09c1bf08037
--- /dev/null
+++ b/sci-libs/libqalculate/files/libqalculate-0.9.6-check-fix.patch
@@ -0,0 +1,22 @@
+diff -Naur libqalculate-0.9.6.old/po/POTFILES.in libqalculate-0.9.6/po/POTFILES.in
+--- libqalculate-0.9.6.old/po/POTFILES.in	2005-06-01 14:13:50.000000000 -0400
++++ libqalculate-0.9.6/po/POTFILES.in	2007-07-08 20:21:17.000000000 -0400
+@@ -1,6 +1,7 @@
+ # List of source files containing translatable strings.
+ [encoding: UTF-8]
+ src/qalc.cc
++src/defs2doc.cc
+ libqalculate/BuiltinFunctions.cc
+ libqalculate/Calculator.cc
+ libqalculate/DataSet.cc
+@@ -12,3 +13,10 @@
+ libqalculate/Unit.cc
+ libqalculate/Variable.cc
+ libqalculate/util.cc
++data/currencies.xml.in
++data/datasets.xml.in
++data/elements.xml.in
++data/functions.xml.in
++data/planets.xml.in
++data/units.xml.in
++data/variables.xml.in
diff --git a/sci-libs/libqalculate/libqalculate-0.9.0.ebuild b/sci-libs/libqalculate/libqalculate-0.9.0.ebuild
deleted file mode 100644
index 437fa1c9cfb5..000000000000
--- a/sci-libs/libqalculate/libqalculate-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/libqalculate-0.9.0.ebuild,v 1.3 2006/01/29 19:43:02 cryos Exp $
-
-DESCRIPTION="A modern multi-purpose calculator library"
-LICENSE="GPL-2"
-HOMEPAGE="http://qalculate.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
-
-SLOT="0"
-IUSE="nls readline"
-KEYWORDS="~amd64 ~sparc x86"
-
-DEPEND="dev-lang/perl
-	dev-perl/XML-Parser
-	>=dev-util/pkgconfig-0.12.0"
-
-RDEPEND=">=sci-libs/cln-1.1
-	dev-libs/libxml2
-	>=dev-libs/glib-2.4
-	>=sci-visualization/gnuplot-3.7
-	net-misc/wget
-	nls? ( sys-devel/gettext )
-	readline? ( sys-libs/readline )"
-
-src_compile() {
-	# The CLN test is buggy and will often fail though an appropriate version
-	# of the library is installed.
-	CONFIG="$(use_with readline) --disable-clntest"
-	econf ${CONFIG} || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die "Installation failed."
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	dodoc ${DOCS} || die "Documentation installation failed."
-}
diff --git a/sci-libs/libqalculate/libqalculate-0.9.2.ebuild b/sci-libs/libqalculate/libqalculate-0.9.6.ebuild
index 8f82ea80a00e..c8560523aeb4 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.2.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/libqalculate-0.9.2.ebuild,v 1.2 2006/01/29 19:43:34 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/libqalculate-0.9.6.ebuild,v 1.1 2007/07/09 15:44:46 markusle Exp $
+
+inherit eutils
 
 DESCRIPTION="A modern multi-purpose calculator library"
 LICENSE="GPL-2"
@@ -8,21 +10,30 @@ HOMEPAGE="http://qalculate.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
 
 SLOT="0"
-IUSE="nls readline"
+IUSE="readline"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-DEPEND="dev-lang/perl
-	dev-perl/XML-Parser
-	>=dev-util/pkgconfig-0.12.0"
-
-RDEPEND=">=sci-libs/cln-1.1
+COMMON_DEPEND=">=sci-libs/cln-1.1
 	dev-libs/libxml2
 	>=dev-libs/glib-2.4
-	>=sci-visualization/gnuplot-3.7
-	net-misc/wget
-	nls? ( sys-devel/gettext )
+	sys-libs/zlib
 	readline? ( sys-libs/readline )"
 
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	>=sci-visualization/gnuplot-3.7
+	net-misc/wget"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-check-fix.patch
+}
+
 src_compile() {
 	# The CLN test is buggy and will often fail though an appropriate version
 	# of the library is installed.