From 9685009939068e32bf3c00b9122675984e03bb96 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Wed, 5 Dec 2007 21:57:35 +0000 Subject: Fix up gnutls dep as notified in bug #198132 Package-Manager: portage-2.1.4_rc7 --- net-im/climm/ChangeLog | 5 ++++- net-im/climm/Manifest | 22 +++++++++++----------- net-im/climm/climm-0.6.1-r1.ebuild | 22 +++++++++++++++++++--- 3 files changed, 34 insertions(+), 15 deletions(-) (limited to 'net-im') diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog index d70788eabaed..42ec607d47f0 100644 --- a/net-im/climm/ChangeLog +++ b/net-im/climm/ChangeLog @@ -1,6 +1,9 @@ # 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.4 2007/10/28 11:25:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.5 2007/12/05 21:57:35 jokey Exp $ + + 05 Dec 2007; Markus Ullmann climm-0.6.1-r1.ebuild: + Fix up gnutls dep as notified in bug #198132 28 Oct 2007; Markus Ullmann climm-0.6.1-r1.ebuild: Add a dep to otr 3.0 for bug #195862 and add a check for ssl/gloox useflags diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest index 7147d5d5e9f5..4b0b2c4ea872 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 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-r1.ebuild 1335 RMD160 6fc4c7429ffa7a3ca635bf23de36fd37cedf781b SHA1 5be7c126d09b04450bb0ab22236c5778e9f3c9b8 SHA256 6b4fcdd86dda2ca8f502594ce956c95bda81f0a69efc2d1e3b6da9d432baa106 +MD5 905bfea10558cafe6c3a909fef707924 climm-0.6.1-r1.ebuild 1335 +RMD160 6fc4c7429ffa7a3ca635bf23de36fd37cedf781b climm-0.6.1-r1.ebuild 1335 +SHA256 6b4fcdd86dda2ca8f502594ce956c95bda81f0a69efc2d1e3b6da9d432baa106 climm-0.6.1-r1.ebuild 1335 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 939 RMD160 3cb3bab48138feb55392927622ccd755fa6a15ff SHA1 fa97bc2daa9feea1cce5a0426e1aad79f35f7bf0 SHA256 62989007ec50a8d59686bc0ea3e077fef12fdaf265e77174eb7b559860a31211 -MD5 659045b8240fb68476ce762cd591ec34 ChangeLog 939 -RMD160 3cb3bab48138feb55392927622ccd755fa6a15ff ChangeLog 939 -SHA256 62989007ec50a8d59686bc0ea3e077fef12fdaf265e77174eb7b559860a31211 ChangeLog 939 +MISC ChangeLog 1059 RMD160 2b42affb07d1c644e8b7cf236970e76a07b7cd22 SHA1 3a3514f72af9c27cc6953a1af3dbb90b215a7370 SHA256 48d9e1189814caacfe3b57b898c5e7182e152c5f5f86c560bee83c7f920c6bc3 +MD5 d52f48865a6d694b83007ca0f1ac2d5c ChangeLog 1059 +RMD160 2b42affb07d1c644e8b7cf236970e76a07b7cd22 ChangeLog 1059 +SHA256 48d9e1189814caacfe3b57b898c5e7182e152c5f5f86c560bee83c7f920c6bc3 ChangeLog 1059 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) -iD8DBQFHJHHAz974XjDVpbkRAvCzAJ93N65HRLKvnTtLT4towuaOMe1vtQCePzZZ -Jh2FBv5mVU9Eurf/fyndJP8= -=De9i +iD8DBQFHVx7Zz974XjDVpbkRAgOIAKDWxgS/KiHIAMw+SJfWUVajpIe6pQCcDKo8 +mo9gp5Mo3xIw1+9PGdmHTZY= +=qtyo -----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 2aef15826474..037e684367fe 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.2 2007/10/28 11:25:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v 1.3 2007/12/05 21:57:35 jokey Exp $ DESCRIPTION="ICQ text-mode client with many features" HOMEPAGE="http://www.climm.org/" @@ -9,10 +9,12 @@ SRC_URI="http://www.climm.org/source/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gloox otr tcl ssl" +IUSE="gloox gnutls otr tcl ssl" DEPEND="gloox? ( net-libs/gloox ) - ssl? ( >=net-libs/gnutls-0.8.10 dev-libs/openssl ) + ssl? ( + || ( gnutls? ( >=net-libs/gnutls-0.8.10 ) + dev-libs/openssl ) ) tcl? ( dev-lang/tcl ) otr? ( >=net-libs/libotr-3.0.0 )" @@ -25,11 +27,25 @@ pkg_setup() { } src_compile() { + local myconf + if use ssl ; then + if ! use gnutls ; then + elog "Using openSSL" + myconf = "--enable-ssl=openssl" + else + elog "Using gnutls" + myconf = "--enable-ssl=gnutls" + fi + else + myconf = "--disable-ssl" + fi + econf \ $(use_enable gloox) \ $(use_enable otr) \ $(use_enable ssl) \ $(use_enable tcl) \ + ${myconf} \ || die "econf failed" emake || die "emake failed" -- cgit v1.2.3-65-gdbad