Rename jabber to xmpp USE (#216300)

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

3 files changed, 17 insertions, 26 deletions

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}