Rename jabber to xmpp USE (#216300)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

12 files changed, 74 insertions, 54 deletions

diff --git a/net-im/ayttm/ChangeLog b/net-im/ayttm/ChangeLog
index e8b889560578..3ea7ccf08dbc 100644
--- a/net-im/ayttm/ChangeLog
+++ b/net-im/ayttm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/ayttm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ayttm/ChangeLog,v 1.20 2014/08/05 18:34:20 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ayttm/ChangeLog,v 1.21 2015/05/16 10:38:08 pacho Exp $
+
+  16 May 2015; Pacho Ramos <pacho@gentoo.org> ayttm-0.6.3.ebuild:
+  Rename jabber to xmpp USE (#216300)
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> ayttm-0.6.3.ebuild:
   Remove trailing '.' from DESCRIPTION.
diff --git a/net-im/ayttm/Manifest b/net-im/ayttm/Manifest
index b0bdc999c71b..1a87b67a0460 100644
--- a/net-im/ayttm/Manifest
+++ b/net-im/ayttm/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ayttm-0.6.3-opt-webcam.patch 887 SHA256 ed12015c4b71a16ae47969195066f0dadc2d2725149dfc4eb36d0d7ffebe7a7d SHA512 6d56796d124450554f929c0a8b6a447a86c978dda2aa7e815d9e512c7c62de7c7e8e9a2b3e26a900ca1cda7f17c017292f2afb3791bcc922447b6e4bf5665170 WHIRLPOOL b83e99f16c373153978570d85f5cec75f789754003551d6d1e0b6247c98987481e45240032569c1291258d8d365d47c257906b411ca81a35a81907bd2e03f8c4
 AUX ayttm-0.6.3-opt-xscreensaver.patch 409 SHA256 396cf3f223a9db93fe512c8792395290d3acdcb5022fdb4babd84ab523a6e649 SHA512 67a81ddfab8aeddac8d4fe0cdc8f9fdfee7e5ea2d206a374e480949c8ed738c147dc2ef679e7984d26b4ecbaa78152c9ba53eaa5ed2cd6c4836aded5fad5f14d WHIRLPOOL cc0788a48ac9b97962032c2b467c2ee264d20b87d1ea94c3ba3862cd2762d4e8ca72f5b552adb022aebb511d59efaf57b884c4bddca99794fa32cfb314041704
 DIST ayttm-0.6.3.tar.bz2 1377010 SHA256 2c48d3b8183139e7657c03dab9d17c997077624fd97a177d932f80ee6c596157
-EBUILD ayttm-0.6.3.ebuild 1636 SHA256 2fcd8f2375dea180d690275302f18a4a671d6fe5ab584c48de1fb482344a925a SHA512 dba69312379c069eabdbb25ff63988e84f6c425f0f15ca9e42959e481f6bc9f0125d6ac38f920fb134375ca7c699b98520a6efde3df810f262bdbfa2a3f52743 WHIRLPOOL 31dea2eed6360d457998049846fbe5b71afefe05aeb636347a0ff79a0ac4a7d4db62dc2770a0a76323828feb41120787803f12851aa9531efa90938aba8f8086
-MISC ChangeLog 818 SHA256 f4d527be56571cc3b92e8b7221ac8ac3f0a8e3584b2e792c845aa9f58bf9e602 SHA512 ee13a62c8836d21641f2489d3c1403fc365e2a03414b89ea51206abc0d14dc4322bb7db875855e1cc52e6aa8eaea21ae4735450e2892ae85c77c7b379a411a73 WHIRLPOOL cf32d103df87da41ff97706ffd27e91bf9f819c761d9f261db49292cd224761879c2d287a8dd6864955280e787439b08a47836951de645cd1c415b3257428686
+EBUILD ayttm-0.6.3.ebuild 1639 SHA256 2ca8c73209ee97786d97d73e5039835703e3f4dee8dd8abd21ae3d2815aa6323 SHA512 e182e9fd4500f60cfdd01ecd83964e766e7739ff34caf5b2f09cd32916cba16b888a95a2d31e299d87a685c913cbc541b575d1a446722154bc4c209ec87ffdfd WHIRLPOOL 87a24c13358dea19ed78815d923d644a519022f81567c4a194c37e6ebf759adac646c30e0bf96be2b89ad5dd7f24650abbbcc58fbd9b4f3b340084b4f6df6225
+MISC ChangeLog 923 SHA256 4cb5b9bb82d94d40d7f1a7d43edd2551acd568b8f808c2fb9550c8120b8d126f SHA512 a05af7ba08cb3303d97457324d8d97c6a867ec6b6398fc752eb53d548d32faf7163474d259ae1f1b07fdabdb7f446eb2bdae37f8c3e2decae4e5e981cc4ed872 WHIRLPOOL 16520c45e331d4b4afa1ab0115ab018b5af1659e8378d52cf34a8334d1e676b55f03a3e3a02e826ef9baab486e8d577f27937735ec4590d7a9ec52c22d13bace
 MISC metadata.xml 678 SHA256 fe8726fc8a8e826448fd23a5aec566c0b9809356191150f2882a2b88374d4ef9 SHA512 fd2e2cad3a365c9e1efc4c65f2bf8638016796ba07ae984ae91f2df8e4d6c40746f42ff379834176203e901e37a7a1163426aa00e084fdc4e770f790d8ddaba7 WHIRLPOOL 39e79d01be423a13851210b8d2abcc614da10fd4af45d0aeba607fb9fd58eacdd88426776dc6663805de6fa753c2cb82c2a84cfea4e8cae3183769464e05d386
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlVXHhEACgkQCaWpQKGI+9SP9wCfZ2hgnP5kuMvh+t0g5YCoyM5C
+oPkAnj11ZOU2aX2dqA+3nk1VhX5bJ2C8
+=VERU
+-----END PGP SIGNATURE-----
diff --git a/net-im/ayttm/ayttm-0.6.3.ebuild b/net-im/ayttm/ayttm-0.6.3.ebuild
index 67e66e0227f0..6540f797c30b 100644
--- a/net-im/ayttm/ayttm-0.6.3.ebuild
+++ b/net-im/ayttm/ayttm-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ayttm/ayttm-0.6.3.ebuild,v 1.4 2014/08/05 18:34:20 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ayttm/ayttm-0.6.3.ebuild,v 1.5 2015/05/16 10:38:08 pacho Exp $
 
 EAPI=4
 inherit autotools eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ayttm/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crypt icq irc jabber lj msn nls oscar smtp webcam xscreensaver yahoo"
+IUSE="crypt icq irc xmpp lj msn nls oscar smtp webcam xscreensaver yahoo"
 
 CDEPEND="app-text/enchant
 	dev-libs/glib:2
@@ -46,7 +46,7 @@ src_configure() {
 		--disable-esd \
 		$(use_enable icq) \
 		$(use_enable irc) \
-		$(use_enable jabber) \
+		$(use_enable xmpp jabber) \
 		$(use_enable lj) \
 		$(use_enable msn) \
 		$(use_enable nls) \
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 66590926a072..1f0ea798b42e 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/centerim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.58 2014/08/05 18:34:06 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.59 2015/05/16 10:43:07 pacho Exp $
+
+  16 May 2015; Pacho Ramos <pacho@gentoo.org> centerim-4.22.10.ebuild:
+  Rename jabber to xmpp USE (#216300)
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> centerim-4.22.10.ebuild,
   centerim-5.0.0_beta1.ebuild, centerim-5.0.0_beta2.ebuild:
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index 88f8b3c64de8..5280fa727b39 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX centerim-4.22.10-gcc46.patch 241 SHA256 9b26af1b97513c998cfe3b08c93aecf9a75357e6c2973dbe0ea99c38d5191896 SHA512 bda4a2f1f502972546af28d37ad426d8e1ef2cb1daf9c2434473991dcbebf889d6a4637dfb58fc133dd96c7146348531e9f095d8b15c61ed7bcf037d3e35c356 WHIRLPOOL 183766dcab71bf0b5473f1d994e58229b26064e3db2ec9167dd8ab415dbc6392c835910631df6577581034edbef1061a85e36d8d27769c89baafc04553a2ac90
 DIST centerim-4.22.10.tar.gz 2287832 SHA256 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116 WHIRLPOOL 58a615cb171221b916c1cea61388659fe2dd6b09ebfe4bf8442109289e1ed89c47ee5e9cd093a05a276d08f33e6f4e7cb951153a6cdf6eed439a9c20b8d3ff78
 DIST centerim5-5.0.0beta1.tar.gz 640277 SHA256 d8dd989a0e6a29247dd56b11ad444ebcc4f0b07fa95879f0f86f8a7ab69ead7c SHA512 581acff42ba768ee564b5c1e817e1287e9889c3e837474de9a3342b10b6035ffa3430de62299c334376c5a61136dbf3eb776a35d7f5f7bb4dd2571296b3441ac WHIRLPOOL 178ff8814aaf204c557e6274a65eeea98e72956969a408eb02e02cebcc89f9c36462298e7fc5235f910299e1be51358eaac6c3bec24b23e6ba144727ba4e305f
 DIST centerim5-5.0.0beta2.tar.gz 689578 SHA256 5f4ad8d4ad8ec785f928ad06b42a184a9785a2cce31da5d908963643b0c522c7 SHA512 5057186ddb354c76740ea38d10678a18a716085566630e3338911f2d3931d60925406fe78c25de8ffe9bdbb7a307e7a230d0da6863c2d81ebb63ba2f6b962d0c WHIRLPOOL 089b5cf1e773712379154df9f74a006763d93472103f6a1f18f767701fa8248e76e0b309d7731dfb3d8e072905ddfe05212bfb69cd4a10215ced3553281c59f9
-EBUILD centerim-4.22.10.ebuild 2555 SHA256 543db00bc7a0332b37a118802c41d7cc71dd337c1cfa748c159ad81b4dedb04d SHA512 561cc37e038cba703701dc34cbe9772650452cc80074cf02d5420112c3911d5d7d2b8d58b2e8b21d7fd1e3cc49ca9487b8c73974ccda282a8fd61b97c22b720b WHIRLPOOL 1bc41278d3e882d0a363b7e10cbfa2f4918145fdc37c827157e1cb41a8ac1e0725f9e3264ac7ffb73a703f1a46df877d25dc9e37c0a405e9352ff58e33dbb747
+EBUILD centerim-4.22.10.ebuild 2554 SHA256 2177b0b3f30005bc383b29b240fb88921249d99256ee5937f84a290958aaf56d SHA512 1751b255ee0ff39c83dd6344d23b8c03156027d49a94b6b459d33aeb1b8cacad37878ed4fe10bd2a89bc747bb96774f0add0d0139d06a87828424745f251d651 WHIRLPOOL 04a40646234807a540d36377c11ac637cf3e624ad7bd9ccd278c0994775dda8682a9ecf33b6dc162e6b03774e70f901a56800c79c875df442b1806b12807339e
 EBUILD centerim-5.0.0_beta1.ebuild 955 SHA256 7f99669a8ad7ca9f10edd7dcfdd0837f4b831cbf9eaec4a2cff86541317a4ac9 SHA512 1875063b37e7d73a011d20d201e48c46972122e7b4a7c38d0dc9d95249849a23541b77fd2d78ad200fec076896519342ef2a46882e7481d76d6e8d0387c51633 WHIRLPOOL 0c7896314353bd36a1c48a00bd08c680b8dc4182024d4fc9fe3c0b7f994d428bb5b286aee66c3d9caf35f73e08a94d70f507db170f4d2442f5e9370e9935efe1
 EBUILD centerim-5.0.0_beta2.ebuild 958 SHA256 7b1bd63a0e9cc8394ab03d13f9853d356893a372d822cda60d2017f99f30b95b SHA512 160d2775dae7ed77c9fd36e40ed92d4133778fccc68abe4271079897b4dacf6e7664c3ae6b9d1a09ccce406940f06c6ba81fb110897f9df04e5db822261f0f1f WHIRLPOOL 9d0aca69d29aaecaec40168dd67a87b0d072a1febda7f5e9bf8b4a5bf0b3b2a09979c5f377c3dd366dbbd94ca58a41fe195467b1a8ec955580fc251cf377671e
-MISC ChangeLog 9496 SHA256 5f1e57b0e89d2ba31a7a7d9343c57a1da986a2bbeb79f6ce139dc6535a00e6ef SHA512 9c5bb1d20eb87694986fb3d9a38fb0c72d8109bf8dad3a15ef31b753a7dc0f4071065f00f7dec94456200d5b0fedb4170150907840c312eb07a62ccc4db095ca WHIRLPOOL 06baef3ed9c8eadbc425600ea21efebe37e6357fbc194f6d362e2ed67e1b5a1f24bf0bd2c4cf6f55e6ccdad6c7bb7e548ea20b274f169850d0bd9d439438916b
+MISC ChangeLog 9606 SHA256 98e571d303c7e6f1eba786e54db5ccd920f385dad9362f55b2ceb40655fbc149 SHA512 50a81b2860df30db9eb638c333faa39db6835749de4ba5376d68f08ecb2483fadd2d926532673c7cdf71c742b85a64c813a2c0f312673e2331f9450210c6698e WHIRLPOOL 69cf0a706f87eb6d380ab069f6e99d1b2c282011d645796943a0fadc92c154d12faa162cf1f4c0a155e1f0ffffbf88d4658085f01f749bcda512bec65b3afa75
 MISC metadata.xml 520 SHA256 4bc939faeb60271e87b123f5157fc1aed74f3f75821ca7f1ee209a4e4aef50f2 SHA512 dae4cc18030f60b22064c4acf99b1b235e7f15bcd47971e7affec4299ada7f9f8864f09a8834a57846a9fd9dadfbdf7290ebd034e2153b572cd35f7023a47f2b WHIRLPOOL ec16338c77831ba21c15f36ee2ec7bde25386473a6b8e6957d989de12fef31097b63900afea044fca0396f68f5a6137f91eb59afda16d11a90161a5a24baea02
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlVXHzwACgkQCaWpQKGI+9Rm4QCfVzP1N5S4NS3ILV/s2NTh5VaE
+Wa8An0Ydu3kmFYJZILvmkaxJo6ojbn5R
+=JiiP
+-----END PGP SIGNATURE-----
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
index 0f24d4486907..8827cbd9dab5 100644
--- a/net-im/centerim/centerim-4.22.10.ebuild
+++ b/net-im/centerim/centerim-4.22.10.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.10.ebuild,v 1.10 2014/08/05 18:34:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.10.ebuild,v 1.11 2015/05/16 10:43:07 pacho Exp $
 
 EAPI="2"
 
 inherit eutils
 
-PROTOCOL_IUSE="+aim gadu +icq +irc +jabber lj +msn rss +yahoo"
+PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
 IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
 
 DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
@@ -28,7 +28,7 @@ DEPEND=">=sys-libs/ncurses-5.2
 	bidi? ( dev-libs/fribidi )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	jpeg? ( virtual/jpeg )
-	jabber? (
+	xmpp? (
 		otr? ( <net-libs/libotr-4 )
 		crypt? ( >=app-crypt/gpgme-1.0.2 )
 	)
@@ -61,7 +61,7 @@ pkg_setup() {
 		die "Please activate at least one protocol USE flag!"
 	fi
 
-	if use otr && ! use jabber
+	if use otr && ! use xmpp
 	then
 		ewarn
 		ewarn "Support for OTR is only supported with Jabber!"
@@ -96,7 +96,7 @@ src_configure() {
 		$(use_enable gadu gg) \
 		$(use_enable icq) \
 		$(use_enable irc) \
-		$(use_enable jabber) \
+		$(use_enable xmpp jabber) \
 		$(use_enable lj) \
 		$(use_enable msn) \
 		$(use_enable nls locales-fix) \
diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog
index c45290f5d8b1..5bccfe931d24 100644
--- a/net-im/climm/ChangeLog
+++ b/net-im/climm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/climm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.24 2015/03/25 16:14:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.25 2015/05/16 10:44:14 pacho Exp $
+
+  16 May 2015; Pacho Ramos <pacho@gentoo.org> climm-0.7.1.ebuild:
+  Rename jabber to xmpp USE (#216300)
 
   25 Mar 2015; Justin Lecher <jlec@gentoo.org> climm-0.7.1.ebuild:
   Fix tcl/tk slotting
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
index 0a33c16e5f2a..ba1e625d54a0 100644
--- a/net-im/climm/Manifest
+++ b/net-im/climm/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST climm-0.7.1.tgz 1296303 SHA256 6212ada46947f0572fb6734b920a2cfd91b6a632cbd044d87476791a318af052 SHA512 8ee8b716229b4181a3b2f7ff3323b4587e80200ca753347f670616da9f25e8fd7cae4da597435d6f71b3a104ad89f3cfe4fd3f9524e259feef220255b6f7d138 WHIRLPOOL 4ca9f3af34512ac5af3f22413b170017a1cba11a42762211fcfd64c948a1c20263f2b9db339e63b829805f45212b5a0feb07c8e04044def07c0001c65dd7e27a
-EBUILD climm-0.7.1.ebuild 1440 SHA256 61c795374f8f14e73ae1bd005a723856e234d847430bb8d0edad909e08783780 SHA512 f5b141b5f8bc1f08b5d01dc54bf178ae9d199918de77b0676565ce5a74b8e5dbc0ee2271fc7b22629c1636d8742472ddeaee12c0a2886f0ecfdbd2e421123301 WHIRLPOOL ad6b29360539f4448f48e04fd2eeaa181ea72100f705078575788e0c9aed715d429b93384ec56d0b94d31e9400d627b40cf7032f48fb41b2e65eb2c98efabba7
-MISC ChangeLog 3698 SHA256 6dd4d51056b0a5f10b321df44f9be36e9435921718b8e709b148ae68fdb07bd5 SHA512 b3f2e1087cb22da14b46e714181a9f5b46837f4ea8dc3cecf9576444fd0a9a31a78a458140344538d3849e321a814f96ad0e2ba15270f5fc35d45b64ad8bedf7 WHIRLPOOL 45abc986f04d8d2664ce59c168fed9e9de2b2aa7c45144e35d0c5eb4f68bf5143e364e4a39ee8b99ef23d7ca4c1f304c587549e965651fabf421f8874a2888cc
+EBUILD climm-0.7.1.ebuild 1424 SHA256 60c937672a711ee91d9e037b7a84cec0d96acd8507b48b45126b2a938c8d6782 SHA512 fe7f11492fcde0ece5ee7b9899a7a127d1dfbecbe33946632882dd93d64004a853d3d941f6d668b3b8f49fb64449961d83e91e959c7c1f183a92bde425d4bcb8 WHIRLPOOL f0dbbaf0042e498a403f3b22b68862a9196f9aa4237f0e27a2c6a3e54f9bf5d0ee3ef779a72bc6e9c6b26430ff397cdf27ebaef6e928e5e99bcaa0f279092c7a
+MISC ChangeLog 3804 SHA256 c4c2a6b1667971ee698e59dac4c564623b3c492430466999f4288f84cba8f8fd SHA512 dcd3347548d1c0d3508ee2ad6bd62133293425e56b394739ad7d3169c33eb1d32acbb7aad8c7a68a9eac98d95d2239747967a0fcf16271f9f06b95c8d19b4c49 WHIRLPOOL c0f6e560c97c16c411b4fbdcc9d603609d5daf005017333bf8f2d59a968eae33644d9cbc7726772e0c332943fcbb120e8f92ee928948393d80ce30db66bfa34d
 MISC metadata.xml 228 SHA256 9a2ec50bd7430ae4952f8ff7cb9c524f2b3ca755c021ffda9286f63ac42bf9fa SHA512 a9e80ed0f9efdf6362e2cb1256e072df465e64d0ecf81ca98773b7cb61bbc4ac97553c1c1495ff608302c5237cb48916c119bfae2ad7c34efff80678aa7242f9 WHIRLPOOL 1ef832d308f6742cc4d5932d4c7ba1dc54c6b56954f892842123e4d2c46cb76d79e09d1fa1beae15ebbad39933911709cde6c7f78d29209efc0c62cb3a47bb4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVEt7QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5I0P/idE4Az42OwV0YC5izlxPH6K
-H+Sn7H1elrok5kBlwMqzLwHVKvrH+ScGk91wSVEgkz8ZYRj0pRFcKi3ve3VQ6z3x
-hJFjr3jn0DJY1E2WGNWeIda9v3sSYwYo3qZ4BnPlGb6d7Up7g75YjwX71+lgzlFM
-9EWqFTMxVd6Xm+KBi2h8HOXILl2N4/BOlW6gLf2o7nxAyDFlK2ffiwZhiAgHLN77
-tqRrn4SAZc26MHGo4weXPRca0qO71voe0teh8NXqoT2ZF/W+bJUtSv4lYlDJfI0x
-51MN1z4ityzKrYEXXNB02zeVtsLDuYxCJDakQ3azx4LQFbtuwvNmbsm4Zp9Uir0r
-48HiqyVzL+ZTG5c6ZU6txH18S24A3GFoIuB4GvDDcxcjBXowMMBLg2SVG5ctAHrD
-Ijk3a+xrub2NjwxpVIm/NfQOfYJXKoh8Zy0yqwRtOGw+/YKie+5FbjVp7Q2skqi3
-pCSMGIj8gz+uUQdQ88KSGrF5yO6xltxODKg7XdQzliYom2CoToftWVJZ2u+lygBi
-+zrYbk0OrgsmMAX7OLWubX9qBEzRDALyBp/y/TjQUeUjaRbp/XJG6VQTvUx2CD3W
-FKjtmnRhNOtTzyRSX3U2hpDdlkJdSFao1xwGJ3VBmtfP7kPn8A5bbcE3IjXp3GNn
-LlMj8iXrBNLj9kAiLqbS
-=WQIt
+iEYEAREIAAYFAlVXH38ACgkQCaWpQKGI+9QoKwCfUg7Z4wevDnSulpxegghd3Hku
+a50An2Z569uw0cEsmOgBc6UZnOEctky+
+=i8ia
 -----END PGP SIGNATURE-----
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
index 6621fb64f4de..284f19e89cb3 100644
--- a/net-im/climm/climm-0.7.1.ebuild
+++ b/net-im/climm/climm-0.7.1.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/climm/climm-0.7.1.ebuild,v 1.7 2015/03/25 16:14:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.7.1.ebuild,v 1.8 2015/05/16 10:44:14 pacho Exp $
 
 EAPI="4"
 
@@ -11,15 +11,15 @@ SRC_URI="http://www.climm.org/source/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="jabber gnutls otr tcl ssl"
+IUSE="xmpp gnutls otr tcl ssl"
 
-# In case user don't need jabber there is a choice gnutls/openssl. Since jabber
+# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp
 # requires gnutls then without explicit request to use gnutls (USE=gnutls)
 # for ssl we fall back on gnutls instead of openssl.
-REQUIRED_USE="jabber? ( ssl gnutls )"
+REQUIRED_USE="xmpp? ( ssl gnutls )"
 
 RDEPEND="
-	jabber? (
+	xmpp? (
 		|| (
 			>=dev-libs/iksemel-1.4[ssl]
 			>=dev-libs/iksemel-1.3[gnutls]
@@ -52,7 +52,7 @@ src_configure() {
 	fi
 
 	econf \
-		$(use_enable jabber xmpp) \
+		$(use_enable xmpp) \
 		$(use_enable otr) \
 		$(use_enable tcl) \
 		${myconf}
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index cf3733db3681..d6f70ea1e7d9 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/licq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.141 2015/05/15 10:52:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.142 2015/05/16 10:45:04 pacho Exp $
+
+  16 May 2015; Pacho Ramos <pacho@gentoo.org> licq-1.8.2.ebuild:
+  Rename jabber to xmpp USE (#216300)
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> licq-1.8.2.ebuild:
   ppc stable wrt bug #535568
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 36309d0be13f..87f97b7960ee 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -8,13 +8,13 @@ DIST licq-1.3.9.tar.bz2 4507409 SHA256 67c300a3b7045a1d6f182f4824a9c6815f9b71db1
 DIST licq-1.8.2.tar.bz2 2260717 SHA256 16aa514888379a12f538becbaeb81f77017d05c94c15f3b2a5e0ffb60315180f SHA512 2535d1ec3abf91825041ce17ccbe525291b10d9df9af16f5c4bbfab27b5dcef2fc39444f6de839d126cb36014330fc75a3143cbc50b7926123782988105bdf1f WHIRLPOOL 25f4881b8e8abe1187f1bda374d3513dfb52b77742611c41c080d151e4c3d1e369dce11c9f7dc43b6e199c5117ca65e2273fab6355548ed57ceefc4bf74d53ed
 EBUILD licq-1.3.8-r1.ebuild 2109 SHA256 fe5084f1b0a373a8be15a9bfbb266f2379d43ac56f792071232edaafcc1f0303 SHA512 a03a27ced735e38df0083d03adcefd4c39d94fe42ca68ef9a139fa525e6792be33af1faac3f0ef61825f6b7018d935b6b8288ce355ebe1d1715f99e2337e7bb6 WHIRLPOOL b3967883129d640848f7736e587ec7c4f9bcf4b644391c6adeca2481961a4cb52f270edb13df851f522318918d4e97634c33419f6b40172d8255d06123a26270
 EBUILD licq-1.3.9.ebuild 2010 SHA256 f184d232326f09bef02dc2322ffdd5b8dc135a62dffc25a3288284d8f1d25951 SHA512 b5509193eeeeab464d0d2b0168c12d5d7d76a0cc5a7b7f503a9f79eb3ffe39a67474638ef7c52dda50c9b4b37c0883587872dde8fe8daab5ba1ff5ec9af43622 WHIRLPOOL db45429776395508560c2b222975af6e948ad99afafcc6ac70ebaed57b349df8960b139ea31dd0c6e1fad446e6f83b4fe5729eeec9b17a0d9962e177a3d55352
-EBUILD licq-1.8.2.ebuild 1852 SHA256 ad267e7d6307f01797752cfc0fa31614d00302f3d15658ef9fa000fde4ec9da7 SHA512 8fed8612b7d50de32a010881cb94f24c54f7648c6f50a08e024e565e0fa17c185c8619caaae1500fd0a4bb61d40b2fa8aa3920462bca1b76770c8ed442f3eb27 WHIRLPOOL 12ab59f1e14ee5053230f7e9156fa194683ce22a61d5cd07412056f8d0ddb1fc3f1cd74a33c6de5e56bba3e38406be7a75acbf2b24c425883a2d33c423a1bb6c
-MISC ChangeLog 21546 SHA256 c4f1ef0a8b2075c7d6e2b4bc2eeeda2527770d5271889edf8b3b3255cb768469 SHA512 dfb937b19849ad4d70b40d21d9255f0d1d83e7b45190704e9cb785876a505d2381d60dcc9423193a1878e762a3224afeb8ff0cdd311d78ce212987687e1b051b WHIRLPOOL da17be90f8619f076f74901218904ef9579b7cb18edff3bd079489843e7e85ed337749b42d5794463fc88b5d03e2c23bd54d6fc87de65d0ab0f09ec24da20aef
+EBUILD licq-1.8.2.ebuild 1846 SHA256 8b176a14d47150cd58ba8f67c7a6056f93be73cf4a60e81c02404fe2ec1d452d SHA512 f28dfa3ed4108f33618791eb29be68d0c85cda57f31001b767f7fead391fb2c42d2db8d7e2e0852b34650f99315a1b092267782d29a523cbc4778faaf250c3cd WHIRLPOOL f844373484fd662f9e86b57580a2ad13a2900a8512f1b555a6e9c05e694d201ade7f8970dc31f3cdc145e8159fd50a063cfeb09a4b5a814fafd7299bb0d7aefe
+MISC ChangeLog 21650 SHA256 904b10fbc481d6ab0176e9a44bfb7a7b6dca22e3e498ff6be137b9b38871a09d SHA512 af063815dec7d39d4a9dbdd18821b7c412ad802903e66b08ba29815fae6ccdead6fbd7ea1d1bfdbe8cab784411d9ce20feb9238aa974e1aa8e81cf679dba04b8 WHIRLPOOL 84ce35d6525842aa84f07ad511c154d3a47ceb669f8f2bf193d428a3dbe6ba54c3dd7d456ea25b69152c19eb2bfd4201f0330b06a150318a55dc9d928dedf473
 MISC metadata.xml 437 SHA256 dabaa61872d7fb7a4b93762eb00251024c7b941f2faf3cbc354722393f8beccd SHA512 07d2740800c20a73285fccee9eba58e7e6d052013d1f6c2adbc7fe369889ed25adb9e339013f347f8adcd3f4a8d798feef2d41854abc6a7a84d441bb57f22dff WHIRLPOOL 98abae1612f5d02a83b605fa8b536541024c58431b4fe243a40a405f9d9cdfa100ea490a88efd91be267de507dd93106a8e8b06798ef1d0c454f753e5f1e6567
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVVz+8ACgkQCaWpQKGI+9TrbACeM5J/iQnMDjpAXOeyExyUEVqy
-y6UAn0Xlo1lfdNX6GWseHwRPh8Pn4hkr
-=kgEH
+iEYEAREIAAYFAlVXH7EACgkQCaWpQKGI+9TTUQCfYmcw8S6ZaTOATynwKDJTxTp4
+IRkAn0GwugUTdeOtw9qA60y7Q2oos8oZ
+=vhpl
 -----END PGP SIGNATURE-----
diff --git a/net-im/licq/licq-1.8.2.ebuild b/net-im/licq/licq-1.8.2.ebuild
index 024a6583ffd5..9015b5eb69c8 100644
--- a/net-im/licq/licq-1.8.2.ebuild
+++ b/net-im/licq/licq-1.8.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/licq/licq-1.8.2.ebuild,v 1.8 2015/05/15 10:52:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.2.ebuild,v 1.9 2015/05/16 10:45:04 pacho Exp $
 
 EAPI=5
 
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 ia64 ppc ~sparc x86"
-IUSE="debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn"
+IUSE="debug doc linguas_he nls socks5 ssl xosd aosd xmpp qt4 msn"
 
 RDEPEND=">=app-crypt/gpgme-1
-	jabber? ( net-libs/gloox )
+	xmpp? ( net-libs/gloox )
 	qt4? ( dev-qt/qtgui:4 )
 	socks5? ( net-proxy/dante )
 	ssl? ( >=dev-libs/openssl-0.9.5a )
@@ -32,7 +32,7 @@ src_prepare() {
 	use msn && licq_plugins+=" msn"
 	use xosd && licq_plugins+=" osd"
 	use aosd && licq_plugins+=" aosd"
-	use jabber && licq_plugins+=" jabber"
+	use xmpp && licq_plugins+=" jabber"
 	use qt4 && licq_plugins+=" qt4-gui"
 
 	local plugins="" x