From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q7l3l-00052j-0z for garchives@archives.gentoo.org; Thu, 07 Apr 2011 08:59:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8590E0552; Thu, 7 Apr 2011 08:59:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 64BA5E0552 for ; Thu, 7 Apr 2011 08:59:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5FF71B411D for ; Thu, 7 Apr 2011 08:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E40EE80065 for ; Thu, 7 Apr 2011 08:59:15 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <39b0c2a48704c022ccd56e0972f61e3340d20894.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kopete/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kopete/kopete-4.6.9999.ebuild kde-base/kopete/kopete-9999.ebuild X-VCS-Directories: kde-base/kopete/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 39b0c2a48704c022ccd56e0972f61e3340d20894 Date: Thu, 7 Apr 2011 08:59:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 24f873408f78466d935bd2098afbd138 commit: 39b0c2a48704c022ccd56e0972f61e3340d20894 Author: Tomas Chvatal gentoo org> AuthorDate: Thu Apr 7 08:59:05 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Thu Apr 7 08:59:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D39b0c2a4 [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/kop= ete-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 $ =20 EAPI=3D3 =20 @@ -43,7 +43,7 @@ PLUGINS=3D"+addbookmarks +autoreplace +contactnotes +hi= ghlight +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 =3D=3D this is wlm plugin, we disable msn one @@ -54,8 +54,8 @@ PLUGINS=3D"+addbookmarks +autoreplace +contactnotes +hi= ghlight +history latex # winpopup: NO DEPS (we're adding samba as RDEPEND so it works) # yahoo: media-libs/jasper # zeroconf (bonjour): NO DEPS -PROTOCOLS=3D"gadu groupwise +jabber jingle meanwhile msn oscar qq skype -sms testbed winpopup yahoo zeroconf" +PROTOCOLS=3D"gadu groupwise jingle meanwhile msn oscar qq skype +sms testbed winpopup +xmpp yahoo zeroconf" =20 # disabled protocols # telepathy: net-libs/decibel @@ -71,10 +71,6 @@ COMMONDEPEND=3D" !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=3Dnet-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) - jabber? ( - app-crypt/qca:2 - net-dns/libidn - ) jingle? ( >=3Dmedia-libs/mediastreamer-2.3.0 media-libs/speex @@ -89,6 +85,10 @@ COMMONDEPEND=3D" dev-libs/libxml2 dev-libs/libxslt ) + xmpp? ( + app-crypt/qca:2 + net-dns/libidn + ) yahoo? ( media-libs/jasper ) " RDEPEND=3D"${COMMONDEPEND} @@ -130,6 +130,7 @@ src_configure() { case ${x/+/} in msn) x2=3DLibmsn ;; zeroconf) x2=3Dbonjour ;; + xmpp) x2=3Djabber ;; *) x2=3D'' ;; esac mycmakeargs+=3D($(cmake-utils_use_with ${x/+/} ${x2})) @@ -153,10 +154,9 @@ pkg_postinst() { #fi =20 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 $ =20 EAPI=3D3 =20 @@ -43,7 +43,7 @@ PLUGINS=3D"+addbookmarks +autoreplace +contactnotes +hi= ghlight +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 =3D=3D this is wlm plugin, we disable msn one @@ -54,8 +54,8 @@ PLUGINS=3D"+addbookmarks +autoreplace +contactnotes +hi= ghlight +history latex # winpopup: NO DEPS (we're adding samba as RDEPEND so it works) # yahoo: media-libs/jasper # zeroconf (bonjour): NO DEPS -PROTOCOLS=3D"gadu groupwise +jabber jingle meanwhile msn oscar qq skype -sms testbed winpopup yahoo zeroconf" +PROTOCOLS=3D"gadu groupwise jingle meanwhile msn oscar qq skype +sms testbed winpopup +xmpp yahoo zeroconf" =20 # disabled protocols # telepathy: net-libs/decibel @@ -71,10 +71,6 @@ COMMONDEPEND=3D" !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=3Dnet-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) - jabber? ( - app-crypt/qca:2 - net-dns/libidn - ) jingle? ( >=3Dmedia-libs/mediastreamer-2.3.0 media-libs/speex @@ -89,6 +85,10 @@ COMMONDEPEND=3D" dev-libs/libxml2 dev-libs/libxslt ) + xmpp? ( + app-crypt/qca:2 + net-dns/libidn + ) yahoo? ( media-libs/jasper ) " RDEPEND=3D"${COMMONDEPEND} @@ -130,6 +130,7 @@ src_configure() { case ${x/+/} in msn) x2=3DLibmsn ;; zeroconf) x2=3Dbonjour ;; + xmpp) x2=3Djabber ;; *) x2=3D'' ;; esac mycmakeargs+=3D($(cmake-utils_use_with ${x/+/} ${x2})) @@ -153,10 +154,9 @@ pkg_postinst() { #fi =20 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