From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1J02FS-0007E4-5C for garchives@archives.gentoo.org; Wed, 05 Dec 2007 21:57:42 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lB5LvdwT031229; Wed, 5 Dec 2007 21:57:39 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lB5Lvb9c031189 for ; Wed, 5 Dec 2007 21:57:38 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 943B565F10 for ; Wed, 5 Dec 2007 21:57:37 +0000 (UTC) Received: from jokey by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1J02FM-0002q7-3v for gentoo-commits@lists.gentoo.org; Wed, 05 Dec 2007 21:57:36 +0000 From: "Markus Ullmann (jokey)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jokey@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-im/climm: ChangeLog climm-0.6.1-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog climm-0.6.1-r1.ebuild X-VCS-Directories: net-im/climm X-VCS-Committer: jokey X-VCS-Committer-Name: Markus Ullmann Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Markus Ullmann Date: Wed, 05 Dec 2007 21:57:36 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 76ab29fe-d8d2-4ff7-a236-52315da70576 X-Archives-Hash: 747942ce9bbfe903ce545e89b3a754f5 jokey 07/12/05 21:57:36 Modified: ChangeLog climm-0.6.1-r1.ebuild Log: Fix up gnutls dep as notified in bug #198132 (Portage version: 2.1.4_rc7) Revision Changes Path 1.5 net-im/climm/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?rev=1.5&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?r1=1.4&r2=1.5 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 28 Oct 2007 11:25:40 -0000 1.4 +++ ChangeLog 5 Dec 2007 21:57:35 -0000 1.5 @@ -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 1.3 net-im/climm/climm-0.6.1-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild?r1=1.2&r2=1.3 Index: climm-0.6.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- climm-0.6.1-r1.ebuild 28 Oct 2007 11:25:40 -0000 1.2 +++ climm-0.6.1-r1.ebuild 5 Dec 2007 21:57:35 -0000 1.3 @@ -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 @@ 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 @@ } 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" -- gentoo-commits@gentoo.org mailing list