pacho 15/05/16 11:06:33 Modified: bitlbee-3.2.2.ebuild ChangeLog Log: Rename jabber to xmpp USE (#216300) (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.7 net-im/bitlbee/bitlbee-3.2.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild?r1=1.6&r2=1.7 Index: bitlbee-3.2.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.2.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bitlbee-3.2.2.ebuild 19 Apr 2015 07:01:59 -0000 1.6 +++ bitlbee-3.2.2.ebuild 16 May 2015 11:06:33 -0000 1.7 @@ -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 @@ 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 @@ ) 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_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 1.180 net-im/bitlbee/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.180&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.180&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?r1=1.179&r2=1.180 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- ChangeLog 19 Apr 2015 07:01:59 -0000 1.179 +++ ChangeLog 16 May 2015 11:06:33 -0000 1.180 @@ -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 <[email protected]> bitlbee-3.2.2.ebuild: + Rename jabber to xmpp USE (#216300) 19 Apr 2015; Pacho Ramos <[email protected]> bitlbee-3.2.2.ebuild: x86 stable wrt bug #529512
