[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

["Tomas Chvatal" <scarabeus@gentoo.org>]

commit:     39b0c2a48704c022ccd56e0972f61e3340d20894
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 08:59:05 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 08:59:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=39b0c2a4

[kopete] Rename jabber useflag to xmpp.

---
 kde-base/kopete/kopete-4.6.9999.ebuild |   22 +++++++++++-----------
 kde-base/kopete/kopete-9999.ebuild     |   22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/kde-base/kopete/kopete-4.6.9999.ebuild b/kde-base/kopete/kopete-4.6.9999.ebuild
index 139b073..ca6e345 100644
--- a/kde-base/kopete/kopete-4.6.9999.ebuild
+++ b/kde-base/kopete/kopete-4.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.2.ebuild,v 1.1 2011/04/06 14:19:17 scarabeus Exp $
 
 EAPI=3
 
@@ -43,7 +43,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
@@ -54,8 +54,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
-sms testbed winpopup yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -71,10 +71,6 @@ COMMONDEPEND="
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -89,6 +85,10 @@ COMMONDEPEND="
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
@@ -130,6 +130,7 @@ src_configure() {
 		case ${x/+/} in
 			msn) x2=Libmsn ;;
 			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
 			*) x2='' ;;
 		esac
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
@@ -153,10 +154,9 @@ pkg_postinst() {
 	#fi
 
 	if ! use ssl; then
-		if use jabber || use msn; then # || use irc; then
+		if use xmpp || use msn; then # || use irc; then
 			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "In order to use ssl in xmpp and msn you'll need to"
 			elog "install app-crypt/qca-ossl package."
 			echo
 		fi

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 139b073..ca6e345 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.2.ebuild,v 1.1 2011/04/06 14:19:17 scarabeus Exp $
 
 EAPI=3
 
@@ -43,7 +43,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
@@ -54,8 +54,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
-sms testbed winpopup yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -71,10 +71,6 @@ COMMONDEPEND="
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -89,6 +85,10 @@ COMMONDEPEND="
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
@@ -130,6 +130,7 @@ src_configure() {
 		case ${x/+/} in
 			msn) x2=Libmsn ;;
 			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
 			*) x2='' ;;
 		esac
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
@@ -153,10 +154,9 @@ pkg_postinst() {
 	#fi
 
 	if ! use ssl; then
-		if use jabber || use msn; then # || use irc; then
+		if use xmpp || use msn; then # || use irc; then
 			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "In order to use ssl in xmpp and msn you'll need to"
 			elog "install app-crypt/qca-ossl package."
 			echo
 		fi