From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E182B158010 for ; Mon, 30 Jan 2023 21:01:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 325A0E0B61; Mon, 30 Jan 2023 21:01:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B560E0B61 for ; Mon, 30 Jan 2023 21:01:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4346733BE34 for ; Mon, 30 Jan 2023 21:01:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BBD6893 for ; Mon, 30 Jan 2023 21:01:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1675111828.9f2026c5cdbd47b21550d0ea3c7027501dfad502.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kopete/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kopete/kopete-22.12.49.9999.ebuild kde-apps/kopete/kopete-9999.ebuild kde-apps/kopete/metadata.xml X-VCS-Directories: kde-apps/kopete/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9f2026c5cdbd47b21550d0ea3c7027501dfad502 X-VCS-Branch: master Date: Mon, 30 Jan 2023 21:01:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34028c0f-64da-47a3-9dc1-966edb3a8a72 X-Archives-Hash: 9b5d06af3592ca2b62a0ee657bec6a05 commit: 9f2026c5cdbd47b21550d0ea3c7027501dfad502 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 30 20:50:28 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 30 20:50:28 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f2026c5 kde-apps/kopete: Drop oscar and xmpp PROTOCOLS There is no sign of that stuff actually working anymore. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kopete/kopete-22.12.49.9999.ebuild | 26 +++++++++++++------------- kde-apps/kopete/kopete-9999.ebuild | 26 +++++++++++++------------- kde-apps/kopete/metadata.xml | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/kde-apps/kopete/kopete-22.12.49.9999.ebuild b/kde-apps/kopete/kopete-22.12.49.9999.ebuild index e591c9c4de..7cb07bb451 100644 --- a/kde-apps/kopete/kopete-22.12.49.9999.ebuild +++ b/kde-apps/kopete/kopete-22.12.49.9999.ebuild @@ -44,14 +44,12 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence # gadu: net-libs/libgadu @since 4.3 # groupwise: app-crypt/qca:2 # irc: NO DEPS, probably will fail so inform user about it -# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK # meanwhile: net-libs/meanwhile -# oscar: NO DEPS # telepathy: net-libs/decibel # testbed: NO DEPS # winpopup: NO DEPS (we're adding samba as RDEPEND so it works) # zeroconf (bonjour): NO DEPS -PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf" +PROTOCOLS="gadu groupwise meanwhile testbed winpopup zeroconf" # disabled protocols # irc: NO DEPS @@ -59,9 +57,14 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf" # qq: NO DEPS # telepathy: net-libs/decibel # skype, sms (until fixed) +# oscar (until fixed: KDE-bug #402647 +# xmpp: continuously broken, KDE-bugs #304722, 412228, 457330, 410938, ... IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" +# tests hang, last checked for 4.2.96 +RESTRICT="test" + COMMON_DEPEND=" app-crypt/gpgme:=[cxx,qt5] >=dev-qt/qtgui-${QTMIN}:5 @@ -96,11 +99,6 @@ COMMON_DEPEND=" dev-libs/libxml2 dev-libs/libxslt ) - xmpp? ( - >=app-crypt/qca-2.3.0:2[qt5(+)] - net-dns/libidn:0= - sys-libs/zlib - ) zeroconf? ( >=kde-apps/kidentitymanagement-${PVCUT}:5 >=kde-frameworks/kdnssd-${KFMIN}:5 @@ -114,6 +112,11 @@ COMMON_DEPEND=" # net-libs/libsrtp:0= # net-libs/ortp:= # ) +# xmpp? ( +# >=app-crypt/qca-2.3.0:2[qt5(+)] +# net-dns/libidn:0= +# sys-libs/zlib +# ) RDEPEND="${COMMON_DEPEND} latex? ( || ( @@ -123,18 +126,15 @@ RDEPEND="${COMMON_DEPEND} virtual/latex-base ) ssl? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl] ) - xmpp? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl?] ) " # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) +# xmpp? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl?] ) DEPEND="${COMMON_DEPEND} x11-base/xorg-proto " # jingle? ( dev-libs/jsoncpp ) -# tests hang, last checked for 4.2.96 -RESTRICT="test" - src_configure() { local x x2 # Handle common stuff @@ -158,7 +158,7 @@ src_configure() { done # disable until fixed: - mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF ) + mycmakeargs+=( -DWITH_{cryptography,jabber,libjingle,oscar,skype,sms}=OFF ) # enable plugins for x in ${PLUGINS}; do diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index 9fd41cc6b3..fd83313e3a 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -44,14 +44,12 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence # gadu: net-libs/libgadu @since 4.3 # groupwise: app-crypt/qca:2 # irc: NO DEPS, probably will fail so inform user about it -# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK # meanwhile: net-libs/meanwhile -# oscar: NO DEPS # telepathy: net-libs/decibel # testbed: NO DEPS # winpopup: NO DEPS (we're adding samba as RDEPEND so it works) # zeroconf (bonjour): NO DEPS -PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf" +PROTOCOLS="gadu groupwise meanwhile testbed winpopup zeroconf" # disabled protocols # irc: NO DEPS @@ -59,9 +57,14 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf" # qq: NO DEPS # telepathy: net-libs/decibel # sms (until fixed) +# oscar (until fixed: KDE-bug #402647 +# xmpp: continuously broken, KDE-bugs #304722, 412228, 457330, 410938, ... IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" +# tests hang, last checked for 4.2.96 +RESTRICT="test" + COMMON_DEPEND=" app-crypt/gpgme:=[cxx,qt5] >=dev-qt/qtgui-${QTMIN}:5 @@ -96,11 +99,6 @@ COMMON_DEPEND=" dev-libs/libxml2 dev-libs/libxslt ) - xmpp? ( - >=app-crypt/qca-2.3.0:2[qt5(+)] - net-dns/libidn:0= - sys-libs/zlib - ) zeroconf? ( >=kde-apps/kidentitymanagement-${PVCUT}:5 >=kde-frameworks/kdnssd-${KFMIN}:5 @@ -114,6 +112,11 @@ COMMON_DEPEND=" # net-libs/libsrtp:0= # net-libs/ortp:= # ) +# xmpp? ( +# >=app-crypt/qca-2.3.0:2[qt5(+)] +# net-dns/libidn:0= +# sys-libs/zlib +# ) RDEPEND="${COMMON_DEPEND} latex? ( || ( @@ -123,18 +126,15 @@ RDEPEND="${COMMON_DEPEND} virtual/latex-base ) ssl? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl] ) - xmpp? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl?] ) " # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) +# xmpp? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl?] ) DEPEND="${COMMON_DEPEND} x11-base/xorg-proto " # jingle? ( dev-libs/jsoncpp ) -# tests hang, last checked for 4.2.96 -RESTRICT="test" - src_configure() { local x x2 # Handle common stuff @@ -158,7 +158,7 @@ src_configure() { done # disable until fixed: - mycmakeargs+=( -DWITH_{cryptography,libjingle,sms}=OFF ) + mycmakeargs+=( -DWITH_{cryptography,jabber,libjingle,oscar,sms}=OFF ) # enable plugins for x in ${PLUGINS}; do diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml index 0facf6ad41..9a13135631 100644 --- a/kde-apps/kopete/metadata.xml +++ b/kde-apps/kopete/metadata.xml @@ -18,7 +18,6 @@ Enables saving chat history. Embed latex formatted text into messages. Shows song you currently listen to in your status/etc. Bindings for many players. - Enable Oscar (AIM/ICQ) IM protocol support Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]). Send messages to external pipe. Filter for incoming messages