diff options
author | 2010-10-29 00:18:03 +0000 | |
---|---|---|
committer | 2010-10-29 00:18:03 +0000 | |
commit | d6c9e520b39544eef36ca2233b02568e0f9181ff (patch) | |
tree | 01b8e94da066895f5b7d7a846e116ed1cf96eb4f /net-im | |
parent | Stable on amd64 wrt bug #341755 (diff) | |
download | gentoo-2-d6c9e520b39544eef36ca2233b02568e0f9181ff.tar.gz gentoo-2-d6c9e520b39544eef36ca2233b02568e0f9181ff.tar.bz2 gentoo-2-d6c9e520b39544eef36ca2233b02568e0f9181ff.zip |
Add conditional otr dependency on net-libs/libotr (bug #343181 by Manu Wächter) and install the plugin in the correct place for multilib.
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/bitlbee/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-3.0.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index efcf123e1f83..02073e0c5274 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/bitlbee # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.130 2010/10/28 20:34:11 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.131 2010/10/29 00:18:03 radhermit Exp $ + + 29 Oct 2010; Tim Harder <radhermit@gentoo.org> bitlbee-3.0.ebuild: + Add conditional otr dependency on net-libs/libotr (bug #343181 by Manu + Wächter) and install the plugin in the correct place for multilib. 28 Oct 2010; Alex Alexander <wired@gentoo.org> -bitlbee-1.2.4.ebuild, -bitlbee-1.2.4-r1.ebuild, -bitlbee-1.2.6a.ebuild, -bitlbee-1.2.7.ebuild: diff --git a/net-im/bitlbee/bitlbee-3.0.ebuild b/net-im/bitlbee/bitlbee-3.0.ebuild index a87ca94062b6..a0a9ea69d433 100644 --- a/net-im/bitlbee/bitlbee-3.0.ebuild +++ b/net-im/bitlbee/bitlbee-3.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v 1.1 2010/10/28 19:53:41 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v 1.2 2010/10/29 00:18:03 radhermit Exp $ EAPI="3" -inherit eutils toolchain-funcs confutils +inherit eutils toolchain-funcs confutils multilib DESCRIPTION="irc to IM gateway that support multiple IM protocols" HOMEPAGE="http://www.bitlbee.org/" @@ -17,6 +17,7 @@ IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl COMMON_DEPEND="purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent ) !libevent? ( >=dev-libs/glib-2.4 ) + otr? ( net-libs/libotr ) msn? ( gnutls? ( net-libs/gnutls ) !gnutls? ( nss? ( dev-libs/nss ) ) !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) @@ -138,7 +139,8 @@ src_configure() { # NOTE: bitlbee's configure script is not an autotool creation, # so that is why we don't use econf. ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" + --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ + --strip=0 ${myconf} || die "econf failed" sed -i \ -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ |