fixing DEPEND wrt bug #165242

Package-Manager: portage-2.1.2.9

3 files changed, 20 insertions, 24 deletions

diff --git a/net-misc/logjam/ChangeLog b/net-misc/logjam/ChangeLog
index a1dd408f6d5f..2b330e77a87b 100644
--- a/net-misc/logjam/ChangeLog
+++ b/net-misc/logjam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/logjam
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.35 2006/11/13 15:15:01 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.36 2007/06/17 09:13:44 eva Exp $
+
+  17 Jun 2007; Gilles Dartiguelongue <dartigug@esiee.fr>
+  logjam-4.5.2.ebuild:
+  adjusting DEPEND to fix bug #165242
 
   13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> logjam-4.4.1.ebuild,
   logjam-4.5.2.ebuild:
diff --git a/net-misc/logjam/Manifest b/net-misc/logjam/Manifest
index 3c8371022aa1..1a5db2a8cc6b 100644
--- a/net-misc/logjam/Manifest
+++ b/net-misc/logjam/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST logjam-4.4.1.tar.bz2 715636 RMD160 91e28bedeed1b43f78d47116d432753d42dea60f SHA1 bad3485cb64a364d32f701ec69d7a0008254a89b SHA256 a4143ef49e6407222913e85a154b7f53af6ddefb333b2ae7b6ec95d898ee79d9
 DIST logjam-4.5.2.tar.bz2 748780 RMD160 bbc6a7a79d191ebb5ee1d97d44d408959c409cba SHA1 4c2ffd992379fd680e2a9e9cf926fcc896f01bc7 SHA256 00ba33099f7bb6b85f522c6c63ddb564314a5e78ac0a13100392fcb78a7a38e5
 EBUILD logjam-4.4.1.ebuild 1079 RMD160 9567fcb10003b10efdea81e84bed25405115bb55 SHA1 ed9e49be2af09e28e2b2242ca3172cc39e4aa804 SHA256 3705810831dec70d3980bc0d67a568f39e6b2ca77bdfa1236493ab5ecb14495f
 MD5 50a029e76dbfc28f3a89802daef15ab8 logjam-4.4.1.ebuild 1079
 RMD160 9567fcb10003b10efdea81e84bed25405115bb55 logjam-4.4.1.ebuild 1079
 SHA256 3705810831dec70d3980bc0d67a568f39e6b2ca77bdfa1236493ab5ecb14495f logjam-4.4.1.ebuild 1079
-EBUILD logjam-4.5.2.ebuild 1148 RMD160 ddff76cec7ae713802960e1be973eca628018fb3 SHA1 afcca09dbfa08112b1cca4070bfafec9f367b606 SHA256 3b1040026678641d02ce6a93276f60359e71060304915e044e61234d1bd992d0
-MD5 0dc28b4f41c69cca6ac16475c92ebd6c logjam-4.5.2.ebuild 1148
-RMD160 ddff76cec7ae713802960e1be973eca628018fb3 logjam-4.5.2.ebuild 1148
-SHA256 3b1040026678641d02ce6a93276f60359e71060304915e044e61234d1bd992d0 logjam-4.5.2.ebuild 1148
-MISC ChangeLog 4796 RMD160 56ad4f06eda786fd4e641935d8a5a9ea14d5e0b5 SHA1 e3ab6ae5b0f655d5505aead035e3e73bea612f89 SHA256 48be175626861d528d9f8444a49a0a111c4596875ee92393c5d6f98c29f61f70
-MD5 340263eb4c9358fc24f41a256c9b1c86 ChangeLog 4796
-RMD160 56ad4f06eda786fd4e641935d8a5a9ea14d5e0b5 ChangeLog 4796
-SHA256 48be175626861d528d9f8444a49a0a111c4596875ee92393c5d6f98c29f61f70 ChangeLog 4796
+EBUILD logjam-4.5.2.ebuild 1180 RMD160 72558d0871bbbf0c55bf69cae26a72e73984b5f7 SHA1 c5e9a71a0a9ac10f069781c07e8596a1a073f027 SHA256 d58e6d1c1c8adece5d131147ac391c90b9c0d3c695e202b9ca250e55dcb75f2f
+MD5 d15a5f793b090fa29bf35018bf97f918 logjam-4.5.2.ebuild 1180
+RMD160 72558d0871bbbf0c55bf69cae26a72e73984b5f7 logjam-4.5.2.ebuild 1180
+SHA256 d58e6d1c1c8adece5d131147ac391c90b9c0d3c695e202b9ca250e55dcb75f2f logjam-4.5.2.ebuild 1180
+MISC ChangeLog 4909 RMD160 82af9ffb0951bf59351a61e864ccedc3ccd54ad4 SHA1 528c36690019182a9c416568785d2413f1521e03 SHA256 9f375aa9e77bca8ed47f4c7c60aa785cccf16065bcf449c9b7a5f8a351537ad8
+MD5 b14dca7292d31b619eaa1b18bf762ae2 ChangeLog 4909
+RMD160 82af9ffb0951bf59351a61e864ccedc3ccd54ad4 ChangeLog 4909
+SHA256 9f375aa9e77bca8ed47f4c7c60aa785cccf16065bcf449c9b7a5f8a351537ad8 ChangeLog 4909
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -25,10 +22,3 @@ SHA256 d269a2ed92ffa563135f797a502c6ac0c91714ca111726a9c6b61e71363a9f8f files/di
 MD5 b5197ae678e0e1aa179cfcc1e291084d files/digest-logjam-4.5.2 241
 RMD160 a2d23f58eaac5f0c372ef79f78cbaa6ed74df73a files/digest-logjam-4.5.2 241
 SHA256 acb739769c89ae1a06bc18058b4e620c9bf106abb4241dbc066bc9c6b9233585 files/digest-logjam-4.5.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFWIv8AiZjviIA2XgRAqZ8AJ9q6R3tX+63RqTkVJb2MtRfpl2oLQCg6CIk
-qJvG92jcWKBU9b3oW9XpI7k=
-=2kgG
------END PGP SIGNATURE-----
diff --git a/net-misc/logjam/logjam-4.5.2.ebuild b/net-misc/logjam/logjam-4.5.2.ebuild
index 4db989ecddde..70977f1188d9 100644
--- a/net-misc/logjam/logjam-4.5.2.ebuild
+++ b/net-misc/logjam/logjam-4.5.2.ebuild
@@ -1,6 +1,6 @@
-# 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/net-misc/logjam/logjam-4.5.2.ebuild,v 1.4 2006/11/13 15:15:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.5.2.ebuild,v 1.5 2007/06/17 09:13:44 eva Exp $
 
 IUSE="gtk gtkhtml spell sqlite svg"
 
@@ -8,7 +8,7 @@ inherit
 
 DESCRIPTION="GTK2-based LiveJournal client"
 HOMEPAGE="http://logjam.danga.com/"
-SRC_URI="http://logjam.danga.com/download//${P}.tar.bz2"
+SRC_URI="http://logjam.danga.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,9 @@ RDEPEND=">=dev-libs/libxml2-2.0
 	net-misc/curl
 	>=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	gtkhtml? ( >=gnome-extra/gtkhtml-3 )
+	gtkhtml? ( || (
+		=gnome-extra/gtkhtml-3.6*
+		=gnome-extra/gtkhtml-3.0* ) )
 	spell? ( app-text/gtkspell )
 	svg? ( >=gnome-base/librsvg-2.2.3 )
 	sqlite? ( >=dev-db/sqlite-3 )"