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

[Andreas Sturmlechner]

commit:     9f2026c5cdbd47b21550d0ea3c7027501dfad502
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 20:50:28 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
 		<flag name="history">Enables saving chat history.</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>
 		<flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
-		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
 		<flag name="otr">Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]).</flag>
 		<flag name="pipes">Send messages to external pipe.</flag>
 		<flag name="privacy">Filter for incoming messages</flag>