Fixed dependencies (bug #131842)

Package-Manager: portage-2.1-r1

3 files changed, 28 insertions, 19 deletions

diff --git a/sci-libs/libqalculate/ChangeLog b/sci-libs/libqalculate/ChangeLog
index b35bca057afb..80942a41ae8f 100644
--- a/sci-libs/libqalculate/ChangeLog
+++ b/sci-libs/libqalculate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libqalculate
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/ChangeLog,v 1.15 2006/06/05 21:15:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/ChangeLog,v 1.16 2006/06/26 20:01:47 ribosome Exp $
+
+  26 Jun 2006; Olivier Fisette <ribosome@gentoo.org>
+  libqalculate-0.9.4.ebuild:
+  Fixed dependencies: NLS is not optional, intltool is needed, better
+  DEPEND/RDEPEND separation. (This fixes bug #131842; thanks to Thomas de
+  Grenier de Latour <degrenier@easyconnect.fr> for his work.)
 
 *libqalculate-0.9.4 (05 Jun 2006)
 
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 0b6cfcd26e2b..d47f519099cf 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -9,14 +9,14 @@ EBUILD libqalculate-0.9.2.ebuild 1131 RMD160 116817ccc75939bf313e324bcdae2f21bc0
 MD5 3b5ef64a5f79bd19b646405ae1962b91 libqalculate-0.9.2.ebuild 1131
 RMD160 116817ccc75939bf313e324bcdae2f21bc0fcee3 libqalculate-0.9.2.ebuild 1131
 SHA256 8b3e1f43a96a21def719a06de6a0ddc62fde5d6eb770682bff5e5c348390f8e1 libqalculate-0.9.2.ebuild 1131
-EBUILD libqalculate-0.9.4.ebuild 1134 RMD160 1ec12ed129a9a380e035501254f4c4ed041c8629 SHA1 070bceb7d58e18f5536342d311cf644926e67a60 SHA256 a28455539d4b7f56106fbb31d1d75e6837da8fcfbc3af9f0aa7c2c39dab07e1c
-MD5 203ce0c91fc036e8c59033fcc35c98dd libqalculate-0.9.4.ebuild 1134
-RMD160 1ec12ed129a9a380e035501254f4c4ed041c8629 libqalculate-0.9.4.ebuild 1134
-SHA256 a28455539d4b7f56106fbb31d1d75e6837da8fcfbc3af9f0aa7c2c39dab07e1c libqalculate-0.9.4.ebuild 1134
-MISC ChangeLog 2250 RMD160 b8c5d577c86363bbdb5c743267ae4e72ad13cbdc SHA1 4fd90d1ad73a517cb63e2302ba82771bd2b5accf SHA256 78fe9809d9a0b22cfd46079fd0b0462389771e84707c4942ada9953b9e7063d9
-MD5 58ce17d0a3268d6b5ea3394ba80e25aa ChangeLog 2250
-RMD160 b8c5d577c86363bbdb5c743267ae4e72ad13cbdc ChangeLog 2250
-SHA256 78fe9809d9a0b22cfd46079fd0b0462389771e84707c4942ada9953b9e7063d9 ChangeLog 2250
+EBUILD libqalculate-0.9.4.ebuild 1171 RMD160 ccd50e813503c1c5a36fff21807b76de671a9f18 SHA1 5dba9906419082e492956fb503a2e119f525929f SHA256 336fa069e7df60b6a74464d7073b6fe3cd40ca729f6c033b16f9c5a45b36397a
+MD5 60070e9849e2a4fdadcbaf49f846b422 libqalculate-0.9.4.ebuild 1171
+RMD160 ccd50e813503c1c5a36fff21807b76de671a9f18 libqalculate-0.9.4.ebuild 1171
+SHA256 336fa069e7df60b6a74464d7073b6fe3cd40ca729f6c033b16f9c5a45b36397a libqalculate-0.9.4.ebuild 1171
+MISC ChangeLog 2539 RMD160 38144288d5323490ec1a2ed91dfc161b48eb60a4 SHA1 50ad80e55514919c7971d36b6205ae864a673565 SHA256 885aebcab88d53421ce48b9cca538509ad987c516e3677f7e6d79def27301c8b
+MD5 51b51696bbe24935f9991d86721be862 ChangeLog 2539
+RMD160 38144288d5323490ec1a2ed91dfc161b48eb60a4 ChangeLog 2539
+SHA256 885aebcab88d53421ce48b9cca538509ad987c516e3677f7e6d79def27301c8b ChangeLog 2539
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 metadata.xml 157
diff --git a/sci-libs/libqalculate/libqalculate-0.9.4.ebuild b/sci-libs/libqalculate/libqalculate-0.9.4.ebuild
index b80652775c31..9f9c5fe0607a 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.4.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.4.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-libs/libqalculate/libqalculate-0.9.4.ebuild,v 1.1 2006/06/05 21:15:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libqalculate/libqalculate-0.9.4.ebuild,v 1.2 2006/06/26 20:01:47 ribosome Exp $
 
 DESCRIPTION="A modern multi-purpose calculator library"
 LICENSE="GPL-2"
@@ -8,21 +8,24 @@ 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_compile() {
 	# The CLN test is buggy and will often fail though an appropriate version
 	# of the library is installed.