Version bump (fixes bug #184544).

Package-Manager: portage-2.1.3_rc7

8 files changed, 72 insertions, 86 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/Manifest b/sci-libs/libqalculate/Manifest
index 8c25c8bb456a..4dad2b4acc97 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libqalculate-0.9.0.tar.gz 693984 RMD160 9448e6dae8ad9b77b8bd90c96b68e03f25f2d191 SHA1 f8416d28e3edb0bc106ef9e8914d4936bd0b4334 SHA256 5cad6916d9fb38fab662ef812bff55d79653d144e734ab4c66cd1424ef556449
-DIST libqalculate-0.9.2.tar.gz 727986 RMD160 8d6a5b1a1b0e417b07abb0adbd46fca5dcc9d3cd SHA1 1e9e65de9c117c0e045f150350d51cb3bc542194 SHA256 34c599be5c0c1c8b8009c974688e62d4e698e737aea121a1fe11e44742b450d6
+AUX libqalculate-0.9.6-check-fix.patch 687 RMD160 e35afa4e94a22c2741396d0d0128673d7adba90a SHA1 d8ad58203a8760fe46d0a3b54c1ef3f56745a1a8 SHA256 040a67e8f69eac2805f2b14c772d11696530846618a3c1b38b3eabc4f404311a
+MD5 6d3e7f0fd951ce81ab8183c5aa711346 files/libqalculate-0.9.6-check-fix.patch 687
+RMD160 e35afa4e94a22c2741396d0d0128673d7adba90a files/libqalculate-0.9.6-check-fix.patch 687
+SHA256 040a67e8f69eac2805f2b14c772d11696530846618a3c1b38b3eabc4f404311a files/libqalculate-0.9.6-check-fix.patch 687
 DIST libqalculate-0.9.4.tar.gz 1055947 RMD160 8d14a0ac6790eeab0d8fe2d7b8f87381d1ad223c SHA1 78468f5a0329b01e146a71ff8d1b9b823ed52262 SHA256 4eff5995b73664ae307cbaf2c6c6ee840938f2763243c7fd67d8de7ee90df701
 DIST libqalculate-0.9.5.tar.gz 1118827 RMD160 7839c56e275979157f6bace072d1fc9f500c8953 SHA1 df44162bfb41907851817306b6599d27d74de0ce SHA256 f9f40c0753890779cf9507548cc5212961d3c7c4ff699db517f0422e0b5a2b0d
-EBUILD libqalculate-0.9.0.ebuild 1130 RMD160 7d6157e77eaaf86eacc8f9fa8eba183858d64aa3 SHA1 c7c8d66f7be7ac604e9ba2d24999fd9b538d2b03 SHA256 d1da65b6d7a85982b799b4e67ce9b1e902e96c688f85c79dccb83e7d65b0474d
-MD5 8533de82652a7bc6a658df8b9a19f04d libqalculate-0.9.0.ebuild 1130
-RMD160 7d6157e77eaaf86eacc8f9fa8eba183858d64aa3 libqalculate-0.9.0.ebuild 1130
-SHA256 d1da65b6d7a85982b799b4e67ce9b1e902e96c688f85c79dccb83e7d65b0474d libqalculate-0.9.0.ebuild 1130
-EBUILD libqalculate-0.9.2.ebuild 1131 RMD160 116817ccc75939bf313e324bcdae2f21bc0fcee3 SHA1 fbf443f2b4dfd2ed61f51dec1c6d73c325ec92eb SHA256 8b3e1f43a96a21def719a06de6a0ddc62fde5d6eb770682bff5e5c348390f8e1
-MD5 3b5ef64a5f79bd19b646405ae1962b91 libqalculate-0.9.2.ebuild 1131
-RMD160 116817ccc75939bf313e324bcdae2f21bc0fcee3 libqalculate-0.9.2.ebuild 1131
-SHA256 8b3e1f43a96a21def719a06de6a0ddc62fde5d6eb770682bff5e5c348390f8e1 libqalculate-0.9.2.ebuild 1131
+DIST libqalculate-0.9.6.tar.gz 1111134 RMD160 30f819530236da6b6b78088754643408c8aeb70d SHA1 0bcd42e13c23db9489ce594767d5017bdcb338ad SHA256 d9bd34a026e130d987e92994d9fd9437fc3187c022ef0931bea335e8479722fc
 EBUILD libqalculate-0.9.4.ebuild 1168 RMD160 2d967615dc71e4884e3b7c46b581d3697c76642c SHA1 b89a4de64c72f8a3df051a9410087d7af0fdf73c SHA256 e6b41186f7009144ffda604ac912499eec27b8d6ab998fcf21ea2c452de562fb
 MD5 744152acc169231a760f57e43957b771 libqalculate-0.9.4.ebuild 1168
 RMD160 2d967615dc71e4884e3b7c46b581d3697c76642c libqalculate-0.9.4.ebuild 1168
@@ -21,30 +13,24 @@ EBUILD libqalculate-0.9.5.ebuild 1171 RMD160 7c1b523633d90e4c604fad2e1b5e3f87f37
 MD5 32ca9263fb58e3d73beee95a17fb7679 libqalculate-0.9.5.ebuild 1171
 RMD160 7c1b523633d90e4c604fad2e1b5e3f87f3711ea7 libqalculate-0.9.5.ebuild 1171
 SHA256 4f718dda0a7ccf8c2aaeef44ecd6d9c11721efb06ccd475d150772bdcc29d328 libqalculate-0.9.5.ebuild 1171
-MISC ChangeLog 2881 RMD160 3477e53e5d64052ee67b82468f462d31806ee156 SHA1 143cd58bb0a4904a1ff786045d8b0fe9f909e8de SHA256 5e68a30d68c7ab6f66eaefe4f95782d0da7f9ab38ddc2d4cb5e3e8828227d83f
-MD5 30ae0af245ec85418a3feb67ed1a5259 ChangeLog 2881
-RMD160 3477e53e5d64052ee67b82468f462d31806ee156 ChangeLog 2881
-SHA256 5e68a30d68c7ab6f66eaefe4f95782d0da7f9ab38ddc2d4cb5e3e8828227d83f ChangeLog 2881
+EBUILD libqalculate-0.9.6.ebuild 1272 RMD160 7efc696fc638b128ae5acc2d569f163e726e1e22 SHA1 8ca1f7cb924a65f84382f70469c4d788425a4c64 SHA256 2032b8c0252b79cbb597cc5b59bb0900176e0dafffadab9c5b8f00788288be2c
+MD5 f722aca803b5cfab16845748bffd4f76 libqalculate-0.9.6.ebuild 1272
+RMD160 7efc696fc638b128ae5acc2d569f163e726e1e22 libqalculate-0.9.6.ebuild 1272
+SHA256 2032b8c0252b79cbb597cc5b59bb0900176e0dafffadab9c5b8f00788288be2c libqalculate-0.9.6.ebuild 1272
+MISC ChangeLog 3214 RMD160 8d45941dfb1d13ece441929610113bc7af0b177b SHA1 3c147222b6a007e7bafd9534201061f23cb792d7 SHA256 82f684b415da075e864f535c42f5e7dec183b159fbb5f9da844df644606d6231
+MD5 a9d802d9b95a17f59a35db19e10a343e ChangeLog 3214
+RMD160 8d45941dfb1d13ece441929610113bc7af0b177b ChangeLog 3214
+SHA256 82f684b415da075e864f535c42f5e7dec183b159fbb5f9da844df644606d6231 ChangeLog 3214
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 metadata.xml 157
 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac metadata.xml 157
-MD5 adcb8607b9db80d7fb6c819df5810adf files/digest-libqalculate-0.9.0 256
-RMD160 a73fcf098040d56886d45025e5151e16d0df8302 files/digest-libqalculate-0.9.0 256
-SHA256 03c05f4799602f6a9f5aa90f5e1ef686e0ed0fec5c23647210669ae45a9df2db files/digest-libqalculate-0.9.0 256
-MD5 50eaf932c2303333a70cf686d709b2ad files/digest-libqalculate-0.9.2 256
-RMD160 05f143279b5a88861753c3d9ef60c3e5758f783c files/digest-libqalculate-0.9.2 256
-SHA256 37c1e8db6cc8348fa016194d2b11c5dcaef96e0b9e735a08f47139cec540d7b6 files/digest-libqalculate-0.9.2 256
 MD5 14104139ac3879e3ecbffabea5f99a47 files/digest-libqalculate-0.9.4 259
 RMD160 7670fddb98b5898c0adcf81ab4c281b3a0ca800d files/digest-libqalculate-0.9.4 259
 SHA256 d4063323f742081b3db8d771efdfbd1b0d55e590c696c8f80de7892fb721e86d files/digest-libqalculate-0.9.4 259
 MD5 b8310e7aac6c1479816e801b05614890 files/digest-libqalculate-0.9.5 259
 RMD160 8d2e416428acea62e0ee7a8d02e82d79255a442d files/digest-libqalculate-0.9.5 259
 SHA256 3aacbdaf40ed7d033e40706c5bf8bd11a21d2152b29b09a22eb9debc080aab41 files/digest-libqalculate-0.9.5 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3PAAz974XjDVpbkRAi/TAKDXEQyTDbH2wJ3869xPatb72c6/rQCeMvah
-XPEQpsQKTRzOtlngDa2CEek=
-=EEKg
------END PGP SIGNATURE-----
+MD5 78bfac441561ae1f45f578a4da1bb896 files/digest-libqalculate-0.9.6 259
+RMD160 7bca141626062295ddc7deb797ed716f516fc488 files/digest-libqalculate-0.9.6 259
+SHA256 8da62b71c164b90f24e65042343a4fe3a7b428c391ed1640af2998983b60d801 files/digest-libqalculate-0.9.6 259
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.