diff options
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-3.2.2.ebuild | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index 6e3b6da2229f..85e9e1fa5f6b 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/bitlbee # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.179 2015/04/19 07:01:59 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.180 2015/05/16 11:06:33 pacho Exp $ + + 16 May 2015; Pacho Ramos <pacho@gentoo.org> bitlbee-3.2.2.ebuild: + Rename jabber to xmpp USE (#216300) 19 Apr 2015; Pacho Ramos <pacho@gentoo.org> bitlbee-3.2.2.ebuild: x86 stable wrt bug #529512 diff --git a/net-im/bitlbee/bitlbee-3.2.2.ebuild b/net-im/bitlbee/bitlbee-3.2.2.ebuild index 417f335f1860..23fd523b2402 100644 --- a/net-im/bitlbee/bitlbee-3.2.2.ebuild +++ b/net-im/bitlbee/bitlbee-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild,v 1.6 2015/04/19 07:01:59 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild,v 1.7 2015/05/16 11:06:33 pacho Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -14,7 +14,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple selinux +IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux skype ssl test twitter +yahoo xinetd" COMMON_DEPEND=" @@ -42,12 +42,12 @@ RDEPEND="${COMMON_DEPEND} ) xinetd? ( sys-apps/xinetd )" -REQUIRED_USE="|| ( purple jabber msn oscar yahoo ) +REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) msn? ( || ( gnutls nss ssl ) ) - jabber? ( !nss )" + xmpp? ( !nss )" pkg_setup() { - if use jabber && ! use gnutls && ! use ssl ; then + if use xmpp && ! use gnutls && ! use ssl ; then einfo elog "You have enabled support for Jabber but do not have SSL" elog "support enabled. This *will* prevent bitlbee from being" @@ -81,7 +81,8 @@ src_prepare() { src_configure() { # setup plugins, protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar plugins purple skype twitter yahoo ; do + use xmpp && myconf="${myconf} --jabber=1" + for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do if use ${flag} ; then myconf="${myconf} --${flag}=1" else |