From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0C80E13877A for ; Wed, 3 Sep 2014 09:08:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BC27E091B; Wed, 3 Sep 2014 09:08:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD596E091B for ; Wed, 3 Sep 2014 09:08:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79A1833FEA4 for ; Wed, 3 Sep 2014 09:08:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0F644971 for ; Wed, 3 Sep 2014 09:08:10 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1409735262.3d7ec936dff0c072b75acec951a9ecfa464620cf.kensington@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.14.49.9999.ebuild kde-base/kopete/metadata.xml X-VCS-Directories: kde-base/kopete/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 3d7ec936dff0c072b75acec951a9ecfa464620cf X-VCS-Branch: master Date: Wed, 3 Sep 2014 09:08:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 718e2fbd-85ff-4f1f-82bb-b26b8fb1e0a9 X-Archives-Hash: 9fb0e18fe37cf96ba67108965eb409c2 commit: 3d7ec936dff0c072b75acec951a9ecfa464620cf Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 3 09:07:42 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 3 09:07:42 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3d7ec936 [kde-base/kopete] Remove MSN support due to that service shutting down. Package-Manager: portage-2.2.10 --- kde-base/kopete/kopete-4.14.49.9999.ebuild | 12 +++++------- kde-base/kopete/metadata.xml | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kde-base/kopete/kopete-4.14.49.9999.ebuild b/kde-base/kopete/kopete-4.14.49.9999.ebuild index 7cc4815..5db281a 100644 --- a/kde-base/kopete/kopete-4.14.49.9999.ebuild +++ b/kde-base/kopete/kopete-4.14.49.9999.ebuild @@ -46,19 +46,19 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex # 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 # oscar: NO DEPS # telepathy: net-libs/decibel # testbed: NO DEPS # winpopup: NO DEPS (we're adding samba as RDEPEND so it works) # yahoo: media-libs/jasper # zeroconf (bonjour): NO DEPS -PROTOCOLS="gadu groupwise jingle meanwhile msn oscar skype +PROTOCOLS="gadu groupwise jingle meanwhile oscar skype sms testbed winpopup +xmpp yahoo zeroconf" # disabled protocols # telepathy: net-libs/decibel # irc: NO DEPS +# msn: net-libs/libmsn # qq: NO DEPS IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" @@ -78,7 +78,6 @@ COMMONDEPEND=" net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) - msn? ( >=net-libs/libmsn-4.1 ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) @@ -122,7 +121,6 @@ src_configure() { # enable protocols for x in ${PROTOCOLS}; do case ${x/+/} in - msn) x2=Libmsn ;; zeroconf) x2=bonjour ;; xmpp) x2=jabber ;; *) x2='' ;; @@ -130,7 +128,7 @@ src_configure() { mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) done - mycmakeargs+=( -DWITH_qq=OFF ) + mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF ) # enable plugins for x in ${PLUGINS}; do @@ -150,9 +148,9 @@ pkg_postinst() { #fi if ! use ssl; then - if use xmpp || use msn; then # || use irc; then + if use xmpp ; then # || use irc; then if ! has_version app-crypt/qca-ossl ; then - elog "In order to use ssl in xmpp and msn you'll need to" + elog "In order to use ssl in xmpp you'll need to" elog "install app-crypt/qca-ossl package." fi fi diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml index 0821cde..8523a4e 100644 --- a/kde-base/kopete/metadata.xml +++ b/kde-base/kopete/metadata.xml @@ -25,7 +25,6 @@ Enable the IRC protocol handler. --> Enable the Sametime protocol handler. - Enable "Windows live messenger" protocol support. Enable Skype protocol handler (not fully functional yet).