Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/bitlbee: ChangeLog bitlbee-3.0.ebuild
Date: Fri, 29 Oct 2010 00:18:07
Message-Id: 20101029001803.24FF020051@flycatcher.gentoo.org
1 radhermit 10/10/29 00:18:03
2
3 Modified: ChangeLog bitlbee-3.0.ebuild
4 Log:
5 Add conditional otr dependency on net-libs/libotr (bug #343181 by Manu Wächter) and install the plugin in the correct place for multilib.
6
7 (Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.131 net-im/bitlbee/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.131&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.131&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?r1=1.130&r2=1.131
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v
19 retrieving revision 1.130
20 retrieving revision 1.131
21 diff -u -r1.130 -r1.131
22 --- ChangeLog 28 Oct 2010 20:34:11 -0000 1.130
23 +++ ChangeLog 29 Oct 2010 00:18:03 -0000 1.131
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-im/bitlbee
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.130 2010/10/28 20:34:11 wired Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.131 2010/10/29 00:18:03 radhermit Exp $
29 +
30 + 29 Oct 2010; Tim Harder <radhermit@g.o> bitlbee-3.0.ebuild:
31 + Add conditional otr dependency on net-libs/libotr (bug #343181 by Manu
32 + Wächter) and install the plugin in the correct place for multilib.
33
34 28 Oct 2010; Alex Alexander <wired@g.o> -bitlbee-1.2.4.ebuild,
35 -bitlbee-1.2.4-r1.ebuild, -bitlbee-1.2.6a.ebuild, -bitlbee-1.2.7.ebuild:
36
37
38
39 1.2 net-im/bitlbee/bitlbee-3.0.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild?r1=1.1&r2=1.2
44
45 Index: bitlbee-3.0.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- bitlbee-3.0.ebuild 28 Oct 2010 19:53:41 -0000 1.1
52 +++ bitlbee-3.0.ebuild 29 Oct 2010 00:18:03 -0000 1.2
53 @@ -1,9 +1,9 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v 1.1 2010/10/28 19:53:41 radhermit Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v 1.2 2010/10/29 00:18:03 radhermit Exp $
58
59 EAPI="3"
60 -inherit eutils toolchain-funcs confutils
61 +inherit eutils toolchain-funcs confutils multilib
62
63 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
64 HOMEPAGE="http://www.bitlbee.org/"
65 @@ -17,6 +17,7 @@
66 COMMON_DEPEND="purple? ( net-im/pidgin )
67 libevent? ( dev-libs/libevent )
68 !libevent? ( >=dev-libs/glib-2.4 )
69 + otr? ( net-libs/libotr )
70 msn? ( gnutls? ( net-libs/gnutls )
71 !gnutls? ( nss? ( dev-libs/nss ) )
72 !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) )
73 @@ -138,7 +139,8 @@
74 # NOTE: bitlbee's configure script is not an autotool creation,
75 # so that is why we don't use econf.
76 ./configure --prefix=/usr --datadir=/usr/share/bitlbee \
77 - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed"
78 + --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
79 + --strip=0 ${myconf} || die "econf failed"
80
81 sed -i \
82 -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \