Add a dep to otr 3.0 for bug #195862 and add a check for ssl/gloox useflags to fix jabber connection issues reported by armin76 on IRC

Package-Manager: portage-2.1.3.16

3 files changed, 27 insertions, 14 deletions

diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog
index f4d87fc5d94a..d70788eabaed 100644
--- a/net-im/climm/ChangeLog
+++ b/net-im/climm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/climm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.3 2007/10/22 21:51:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.4 2007/10/28 11:25:40 jokey Exp $
+
+  28 Oct 2007; Markus Ullmann <jokey@gentoo.org> climm-0.6.1-r1.ebuild:
+  Add a dep to otr 3.0 for bug #195862 and add a check for ssl/gloox useflags
+  to fix jabber connection issues reported by armin76 on IRC
 
 *climm-0.6.1-r1 (22 Oct 2007)
 
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
index 4d4230fe46fe..7147d5d5e9f5 100644
--- a/net-im/climm/Manifest
+++ b/net-im/climm/Manifest
@@ -3,10 +3,10 @@ Hash: SHA1
 
 DIST climm-0.6.1.tgz 1177518 RMD160 11ec17ee64515c03eff621168200cb4ea0ada405 SHA1 d4b60397d22f7232faedc877810bfbd34f5b3aeb SHA256 900b054c4cfc27e3f0363038705eaee5c2457a0b3d0ae5e587deaf7cfb94eea2
 DIST climm-0.6.tgz 1173313 RMD160 6bf717d3584462e408524790bdd6489cb95c1ce1 SHA1 a9a005db723d44a21a1cfdcba4be85d1c9b4a8c4 SHA256 ec0d0288a3e1fcde6d7d07f1371a5da25b12645d8868ed02500452ff9a6199cb
-EBUILD climm-0.6.1-r1.ebuild 840 RMD160 51c9fd80f3e140c08c32d874b0722a99113707d2 SHA1 f61919e7eb1a52aa7326a79dedbacb70e5bc6a28 SHA256 bef6c351c63240985cbe2027f36a1bc92d0039c9d6e53b0b353476022102a778
-MD5 13da037f8a434f64e331b98659d955fd climm-0.6.1-r1.ebuild 840
-RMD160 51c9fd80f3e140c08c32d874b0722a99113707d2 climm-0.6.1-r1.ebuild 840
-SHA256 bef6c351c63240985cbe2027f36a1bc92d0039c9d6e53b0b353476022102a778 climm-0.6.1-r1.ebuild 840
+EBUILD climm-0.6.1-r1.ebuild 1067 RMD160 e5521ba413bf317934a6bca0a1e2042b103c6624 SHA1 108f702b013d8532fd4eee50f6108b5c77107064 SHA256 e7f50a8ee88f1a255377d9489e952ca0eda3b7f68a2636c1e8fea4a41727cb00
+MD5 7793140e971f294ea96c2c901057605b climm-0.6.1-r1.ebuild 1067
+RMD160 e5521ba413bf317934a6bca0a1e2042b103c6624 climm-0.6.1-r1.ebuild 1067
+SHA256 e7f50a8ee88f1a255377d9489e952ca0eda3b7f68a2636c1e8fea4a41727cb00 climm-0.6.1-r1.ebuild 1067
 EBUILD climm-0.6.1.ebuild 773 RMD160 c87fc597ef369b34a07a57aa19634e0f7781663e SHA1 a497b07d9cd2dcd96fb69a354b1aea264459a499 SHA256 2bf7550f9f484d2c6eb48913ddca4bf30cde46dbd2d36db5210b5659d8340d8d
 MD5 564ceda514a3a8710a3d1184ef383f91 climm-0.6.1.ebuild 773
 RMD160 c87fc597ef369b34a07a57aa19634e0f7781663e climm-0.6.1.ebuild 773
@@ -15,10 +15,10 @@ EBUILD climm-0.6.ebuild 771 RMD160 6123fe2e98e819ae5fcd397090438d7a97d882d5 SHA1
 MD5 b01ab9121a8a2befd1b5ecab7d54b9ef climm-0.6.ebuild 771
 RMD160 6123fe2e98e819ae5fcd397090438d7a97d882d5 climm-0.6.ebuild 771
 SHA256 bbc0d400268e14ae433ff1fd517f77186385ed6fe31be72b129c660cd8f53c8d climm-0.6.ebuild 771
-MISC ChangeLog 727 RMD160 c9e86764b3aad46cf9a23ea04eeae308b3861383 SHA1 3f2841648e7d3cc271277fe43151b6784dc3fb14 SHA256 5d4868dc4030fa158f7743738ec129833d131955b70093be798b4399abcf69ab
-MD5 c4cacde44a5149fa3add3f603f70ebc1 ChangeLog 727
-RMD160 c9e86764b3aad46cf9a23ea04eeae308b3861383 ChangeLog 727
-SHA256 5d4868dc4030fa158f7743738ec129833d131955b70093be798b4399abcf69ab ChangeLog 727
+MISC ChangeLog 939 RMD160 3cb3bab48138feb55392927622ccd755fa6a15ff SHA1 fa97bc2daa9feea1cce5a0426e1aad79f35f7bf0 SHA256 62989007ec50a8d59686bc0ea3e077fef12fdaf265e77174eb7b559860a31211
+MD5 659045b8240fb68476ce762cd591ec34 ChangeLog 939
+RMD160 3cb3bab48138feb55392927622ccd755fa6a15ff ChangeLog 939
+SHA256 62989007ec50a8d59686bc0ea3e077fef12fdaf265e77174eb7b559860a31211 ChangeLog 939
 MISC metadata.xml 250 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf SHA1 adf080dc000855fff7cb5595582e3b1acfe62dca SHA256 9f906a6688066a1ded86eb663ff87e162ac0d2e4c02a22f73fc158323bec0a61
 MD5 4d2cb8d36da15cc6069c5e4cd8051f7a metadata.xml 250
 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf metadata.xml 250
@@ -35,7 +35,7 @@ SHA256 ad0d493a202ada53e821ee9d3d952e35ed6e47d5d0d8db819fcd1374bf843191 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHRtxz974XjDVpbkRAqOzAKCC0zQ3oHPHzqYW4K3fGp6jaMD+6gCfV5ze
-xo94bRdHJYIaeursEqv4I9U=
-=j+yH
+iD8DBQFHJHHAz974XjDVpbkRAvCzAJ93N65HRLKvnTtLT4towuaOMe1vtQCePzZZ
+Jh2FBv5mVU9Eurf/fyndJP8=
+=De9i
 -----END PGP SIGNATURE-----
diff --git a/net-im/climm/climm-0.6.1-r1.ebuild b/net-im/climm/climm-0.6.1-r1.ebuild
index 35b54042da7b..2aef15826474 100644
--- a/net-im/climm/climm-0.6.1-r1.ebuild
+++ b/net-im/climm/climm-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v 1.1 2007/10/22 21:51:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v 1.2 2007/10/28 11:25:40 jokey Exp $
 
 DESCRIPTION="ICQ text-mode client with many features"
 HOMEPAGE="http://www.climm.org/"
@@ -13,7 +13,16 @@ IUSE="gloox otr tcl ssl"
 
 DEPEND="gloox? ( net-libs/gloox )
 	ssl? ( >=net-libs/gnutls-0.8.10 dev-libs/openssl )
-	tcl? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )
+	otr? ( >=net-libs/libotr-3.0.0 )"
+
+pkg_setup() {
+	if use gloox && ! use ssl ; then
+		eerror "You need to set the ssl flag when you want to use the gloox"
+		eerror "Jabber library"
+		die "Set ssl or unset gloox for ${PN}"
+	fi
+}
 
 src_compile() {
 	econf \