| 1 |
jokey 07/12/05 21:57:36 |
| 2 |
|
| 3 |
Modified: ChangeLog climm-0.6.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix up gnutls dep as notified in bug #198132 |
| 6 |
(Portage version: 2.1.4_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 net-im/climm/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/ChangeLog?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- ChangeLog 28 Oct 2007 11:25:40 -0000 1.4 |
| 22 |
+++ ChangeLog 5 Dec 2007 21:57:35 -0000 1.5 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for net-im/climm |
| 25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.4 2007/10/28 11:25:40 jokey Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.5 2007/12/05 21:57:35 jokey Exp $ |
| 28 |
+ |
| 29 |
+ 05 Dec 2007; Markus Ullmann <jokey@g.o> climm-0.6.1-r1.ebuild: |
| 30 |
+ Fix up gnutls dep as notified in bug #198132 |
| 31 |
|
| 32 |
28 Oct 2007; Markus Ullmann <jokey@g.o> climm-0.6.1-r1.ebuild: |
| 33 |
Add a dep to otr 3.0 for bug #195862 and add a check for ssl/gloox useflags |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.3 net-im/climm/climm-0.6.1-r1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild?rev=1.3&view=markup |
| 40 |
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 |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild?r1=1.2&r2=1.3 |
| 42 |
|
| 43 |
Index: climm-0.6.1-r1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v |
| 46 |
retrieving revision 1.2 |
| 47 |
retrieving revision 1.3 |
| 48 |
diff -u -r1.2 -r1.3 |
| 49 |
--- climm-0.6.1-r1.ebuild 28 Oct 2007 11:25:40 -0000 1.2 |
| 50 |
+++ climm-0.6.1-r1.ebuild 5 Dec 2007 21:57:35 -0000 1.3 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2007 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $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 $ |
| 55 |
+# $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 $ |
| 56 |
|
| 57 |
DESCRIPTION="ICQ text-mode client with many features" |
| 58 |
HOMEPAGE="http://www.climm.org/" |
| 59 |
@@ -9,10 +9,12 @@ |
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~x86" |
| 63 |
-IUSE="gloox otr tcl ssl" |
| 64 |
+IUSE="gloox gnutls otr tcl ssl" |
| 65 |
|
| 66 |
DEPEND="gloox? ( net-libs/gloox ) |
| 67 |
- ssl? ( >=net-libs/gnutls-0.8.10 dev-libs/openssl ) |
| 68 |
+ ssl? ( |
| 69 |
+ || ( gnutls? ( >=net-libs/gnutls-0.8.10 ) |
| 70 |
+ dev-libs/openssl ) ) |
| 71 |
tcl? ( dev-lang/tcl ) |
| 72 |
otr? ( >=net-libs/libotr-3.0.0 )" |
| 73 |
|
| 74 |
@@ -25,11 +27,25 @@ |
| 75 |
} |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
+ local myconf |
| 79 |
+ if use ssl ; then |
| 80 |
+ if ! use gnutls ; then |
| 81 |
+ elog "Using openSSL" |
| 82 |
+ myconf = "--enable-ssl=openssl" |
| 83 |
+ else |
| 84 |
+ elog "Using gnutls" |
| 85 |
+ myconf = "--enable-ssl=gnutls" |
| 86 |
+ fi |
| 87 |
+ else |
| 88 |
+ myconf = "--disable-ssl" |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
econf \ |
| 92 |
$(use_enable gloox) \ |
| 93 |
$(use_enable otr) \ |
| 94 |
$(use_enable ssl) \ |
| 95 |
$(use_enable tcl) \ |
| 96 |
+ ${myconf} \ |
| 97 |
|| die "econf failed" |
| 98 |
|
| 99 |
emake || die "emake failed" |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@g.o mailing list |
Archives