diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-05-16 11:06:36 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-16 11:06:36 +0000 |
| commit | d8caba9dd32f64c9224480fb41163ee66b3f0f13 (patch) | |
| tree | 591078d3241e140ee4915cb07f5807485c7bf171 /net-im | |
| parent | Rename jabber to xmpp USE (#216300) (diff) | |
| download | historical-d8caba9dd32f64c9224480fb41163ee66b3f0f13.tar.gz historical-d8caba9dd32f64c9224480fb41163ee66b3f0f13.tar.bz2 historical-d8caba9dd32f64c9224480fb41163ee66b3f0f13.zip | |
Rename jabber to xmpp USE (#216300)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/bitlbee/Manifest | 10 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-3.2.2.ebuild | 13 |
3 files changed, 16 insertions, 12 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/Manifest b/net-im/bitlbee/Manifest index ce9c807affae..e0401cb1c322 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -13,13 +13,13 @@ AUX bitlbee.initd-r1 785 SHA256 e3986ada935afcca4f873c2f3409423f90a454962c38ddcc DIST bitlbee-3.0.5.tar.gz 727982 SHA256 a2b18ae0355650b7ec326b8ea7082eb06bb8f8816ad3b4985fe97f729ce84e59 DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae EBUILD bitlbee-3.0.5-r1.ebuild 4863 SHA256 f770bcfec2853005f8e3df6bebd85ea23d1d18f18f9ab17e061bcb781dd2ba1d SHA512 81a609e5dabde71dd896817f75ef8bb2bfaeb73e2de08f8be4b165d07404dd7e8b7869c66ae25497e6ec101848a0e909e4c40aa7dd04e2ce73879e4ba052b807 WHIRLPOOL 9f9d1cf2010c0b7f7d8f429128f332c9842ef8b1b1f00f753e37cf36cee8d0e4a11973adab27f532b71024d04ea7c7d339e65b2c3c8626c28a130d0e0390ae52 -EBUILD bitlbee-3.2.2.ebuild 4842 SHA256 4384d0e15fd8c5d39be0a35d45cd735b07334ea727a2fe0a459111dbf3448db3 SHA512 5d993d5f534d0128e293419e18eab881ffb44de36118aaec1ea7e90d563a54bd8591667063fd9e306ebc034911d5393b05d1c88f7aa9e0560785ef3e10746277 WHIRLPOOL 1274ed77a9959f0a660090e982f5164b9c80512f8faced8603f4fee3cea80f623d152044e9c1ab71ce52f2215183d37d7011b03ea5a01e59055aa50b65ec2773 -MISC ChangeLog 27871 SHA256 ae7f0e77eba298e92126bb7e42e36b05ecc03c465e08a7d42f4c24b0fa10475e SHA512 f23b8001153ed7c8069aa0761a0a7f32a7dec908befcc2d2b226365e8ef37c4bc127e50dbb15496eb5ed95d9ccdace3528677304fade7a2c5cc599c33ef26d26 WHIRLPOOL 000e8b04aa47e736b5bc951ee374eaf86e97d24259f55fd577cc4a4ec8f51992798a5c8a31e5a6d2b2c4ad230eb67a6eaf5bde4ed2b41ff55d55ccfaa8bbf52f +EBUILD bitlbee-3.2.2.ebuild 4870 SHA256 1eaaf0e73e195d74c96014c7fc16a175656d8db164739033d9e8ac44922a4a7f SHA512 1a88593688f75c3965c59786d9b48bf27374f4d5fc7da7242efdfc900619a64db50d2ff2fdb3690aedcf47f4ef78d5412ffd1526187a8990768b4b4cdf0bc01e WHIRLPOOL 6ac5814967d819223d8ce55e679893ce0b5b3e856c192e1243d3352d384c6c9123a99fbad400607184a347ba19a860f61ccd1905044fa3659901cc1d3f7c0404 +MISC ChangeLog 27978 SHA256 e1badf0fafeb63b8a9aa5e2ad92aa42d4002147bf8cfaa3575d8eeea428908e1 SHA512 09e9434f95cfaf5758614f00da6431cfbfe433e51780819e7fe80d798f274ceb0a972b8518b3c25c4c4d6f90646d7837746736f08958ca251c495654fec49dc6 WHIRLPOOL a783159c598c5ff57becb5c1f4dd85bc42a19a0d448be86c3b0b103f25286b9ae4a27c77495b5ec05980b81cc919bb920a7259e4d008a0e8f154b601618478d6 MISC metadata.xml 1013 SHA256 c0059a06732d902f41537aa682fc705ae7b09ab0d3ed49ade65ed18636ea3b77 SHA512 9f7c3fd74181988e03d3c569e2d55ee83df40804bf4c2496c05acd5a4a8b21db575b1d55b92a26e34c37c3fe4b4a2a771cd8adc80779c570a541751550a2f93e WHIRLPOOL 94eedc807937a9a46b830c1c629317916aa6e6a31e589ad0a70d4653660bf033fe049f6bcbf11260356e9271e9766875829486c71620e010ef6c844320a809da -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUzUugACgkQCaWpQKGI+9SueACgg2EzV2jT7LB7F7s+Z3h60o9v -kr4An0xUSqlq6pADfUYHBKzr/ZF6b2Ig -=+xqw +iEYEAREIAAYFAlVXJLoACgkQCaWpQKGI+9R6JACggcW/bvNq/5nwnAkEYKwP5rva +h+4An2gPYWGHR6/1Zgri/cTilNEAJ/kd +=ZhDY -----END PGP SIGNATURE----- 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 |