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

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

[Andreas Sturmlechner]

commit:     29ebd78f92b2c0d5a35842824403a1a793fe0c3f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 14:42:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 00:07:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=29ebd78f

kde-apps/kopete: Make USE=jingle local

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 kde-apps/kopete/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 414ef28fff..ff8a38c8d6 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
+		<flag name="jingle">Enable voice calls for jabber</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>

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

[Andreas Sturmlechner]

commit:     0531579f202ce7d50ac02fd56ce27b14ced53836
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 19:28:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 19:35:50 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0531579f

kde-apps/kopete: treeclean, no more development

Bug: https://bugs.gentoo.org/760555
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-9999.ebuild | 173 -------------------------------------
 kde-apps/kopete/metadata.xml       |  37 --------
 2 files changed, 210 deletions(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
deleted file mode 100644
index 94939134c8..0000000000
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kopete/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS=""
-IUSE="ssl v4l"
-
-# Available plugins
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	meanwhile: net-libs/meanwhile
-#	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 testbed winpopup zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	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
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-23.08.3:5
-	>=kde-apps/libkleo-23.08.3:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-#	jingle? (
-#		dev-libs/expat
-#		dev-libs/openssl:0=
-#		>=media-libs/mediastreamer-2.3.0
-#		media-libs/speex
-#		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? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( >=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 )
-
-src_prepare() {
-	ecm_src_prepare
-
-	# breaks with oscar disabled, bug 901487
-	cmake_run_in tests/protocols cmake_comment_add_subdirectory oscar
-}
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-#		$(cmake_use_find_package jingle LiboRTP)
-#		$(cmake_use_find_package jingle Mediastreamer)
-#		$(cmake_use_find_package jingle Speex)
-
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,jabber,libjingle,oscar,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	ecm_src_configure
-}

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
deleted file mode 100644
index 9a13135631..0000000000
--- a/kde-apps/kopete/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-		<remote-id type="cpe">cpe:/a:kde:kopete</remote-id>
-	</upstream>
-	<use>
-		<!-- PLUGINS -->
-		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
-		<flag name="autoreplace">Automatically replace selected text</flag>
-		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
-		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
-		<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="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>
-		<flag name="statistics">Everybody loves statistic graphs, especially cake ones. ;]</flag>
-		<flag name="texteffect">Various fancy text effects for your messages (don't ever consider writing us with this enabled ;]).</flag>
-		<flag name="translator">Translate incoming and outgoing messages.</flag>
-		<flag name="urlpicpreview">Enables in conversation pictures preview.</flag>
-		<flag name="webpresence">Show your status and some more information on web.</flag>
-		<!-- PROTOCOLS -->
-		<flag name="gadu">Enable the Gadu protocol handler.</flag>
-		<flag name="groupwise">Enable the Groupwise protocol handler.</flag>
-		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<flag name="testbed">Enable the testbed protocol.</flag>
-		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
-		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
-	</use>
-</pkgmetadata>

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

[Andreas Sturmlechner]

commit:     0d1b8417d9bebb58d0a5a678a00ea0e5dcb2aed5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 11:41:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 11:41:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d1b8417

kde-apps/kopete: Don't build tests of broken stuff

Bug: https://bugs.gentoo.org/901487
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-9999.ebuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 014c5c5dc1..d59e233458 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -135,6 +135,13 @@ DEPEND="${COMMON_DEPEND}
 "
 #	jingle? ( dev-libs/jsoncpp )
 
+src_prepare() {
+	ecm_src_prepare
+
+	# breaks with oscar disabled, bug 901487
+	cmake_run_in tests/protocols cmake_comment_add_subdirectory oscar
+}
+
 src_configure() {
 	local x x2
 	# Handle common stuff

[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>

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

[Andreas Sturmlechner]

commit:     5857f4a5a325d3af0ba34a19b9965ab7eca54a3a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 20:28:50 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 20:28:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5857f4a5

kde-apps/kopete: Remove skype from PROTOCOLS

Upstream commits:
56460825f8c6145fe3c1873f6cc394359356e456
ac2ab0a35b4c219808bd4bd765dd41b058a84193

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index e591c9c4de..9fd41cc6b3 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -58,7 +58,7 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
+#	sms (until fixed)
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
@@ -158,7 +158,7 @@ src_configure() {
 	done
 
 	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,sms}=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

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

[Andreas Sturmlechner]

commit:     e6223c8b5299ef65396746fecea0626fd0d6e2db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 08:16:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 09:01:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6223c8b

kde-apps/kopete: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 116c804768..0facf6ad41 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:kopete</remote-id>
 	</upstream>
 	<use>
 		<!-- PLUGINS -->

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

[Andreas Sturmlechner]

commit:     c6f8825216c6ea7c6a82758141d9f0c131095cbe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 19:33:35 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:33:35 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6f88252

kde-apps/kopete: Drop obsolete dev-libs/libpcre DEPEND

Thanks-to: Sam James <sam <AT> gentoo.org>
Bug: https://bugs.gentoo.org/837728
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-22.03.90.ebuild      | 1 -
 kde-apps/kopete/kopete-22.04.49.9999.ebuild | 1 -
 kde-apps/kopete/kopete-9999.ebuild          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/kde-apps/kopete/kopete-22.03.90.ebuild b/kde-apps/kopete/kopete-22.03.90.ebuild
index cad0b80280..2524d6a63d 100644
--- a/kde-apps/kopete/kopete-22.03.90.ebuild
+++ b/kde-apps/kopete/kopete-22.03.90.ebuild
@@ -64,7 +64,6 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=[cxx,qt5]
-	dev-libs/libpcre
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5

diff --git a/kde-apps/kopete/kopete-22.04.49.9999.ebuild b/kde-apps/kopete/kopete-22.04.49.9999.ebuild
index 1fdb0b69f3..6573cfe61a 100644
--- a/kde-apps/kopete/kopete-22.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-22.04.49.9999.ebuild
@@ -64,7 +64,6 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=[cxx,qt5]
-	dev-libs/libpcre
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 1fdb0b69f3..6573cfe61a 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -64,7 +64,6 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=[cxx,qt5]
-	dev-libs/libpcre
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5

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

[Sam James]

commit:     c8f5da8f77a47c9e196c1df559b9f9bda3ec757e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 18:54:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 18:54:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8f5da8f

kde-apps/kopete: add subslot dependency on gpgme

gpgme broke ABI

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/kopete/kopete-21.12.49.9999.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-21.12.49.9999.ebuild b/kde-apps/kopete/kopete-21.12.49.9999.ebuild
index 42405e9785..cc32abbea6 100644
--- a/kde-apps/kopete/kopete-21.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-21.12.49.9999.ebuild
@@ -63,7 +63,7 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
-	app-crypt/gpgme[cxx,qt5]
+	app-crypt/gpgme:=[cxx,qt5]
 	dev-libs/libpcre
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 42405e9785..cc32abbea6 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -63,7 +63,7 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
-	app-crypt/gpgme[cxx,qt5]
+	app-crypt/gpgme:=[cxx,qt5]
 	dev-libs/libpcre
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5

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

[Andreas Sturmlechner]

commit:     02a85370e2274e6718be713d33b42a1f2541a23a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May  7 13:24:46 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May  7 15:23:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=02a85370

kde-apps/kopete: Cleanup weird IUSE=xmpp postinst elog

Just formalise the RDEPEND usedep on app-crypt/qca[ssl?] instead.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-21.04.49.9999.ebuild | 14 +-------------
 kde-apps/kopete/kopete-9999.ebuild          | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/kde-apps/kopete/kopete-21.04.49.9999.ebuild b/kde-apps/kopete/kopete-21.04.49.9999.ebuild
index b4055ce683..45c1319e81 100644
--- a/kde-apps/kopete/kopete-21.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-21.04.49.9999.ebuild
@@ -124,6 +124,7 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/latex-base
 	)
 	ssl? ( >=app-crypt/qca-2.3.0:2[ssl] )
+	xmpp? ( >=app-crypt/qca-2.3.0:2[ssl?] )
 "
 #	sms? ( app-mobilephone/smssend )
 #	winpopup? ( net-fs/samba )
@@ -167,16 +168,3 @@ src_configure() {
 
 	ecm_src_configure
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 85851b67a8..c76ad96b99 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -124,6 +124,7 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/latex-base
 	)
 	ssl? ( >=app-crypt/qca-2.3.0:2[ssl] )
+	xmpp? ( >=app-crypt/qca-2.3.0:2[ssl?] )
 "
 #	sms? ( app-mobilephone/smssend )
 #	winpopup? ( net-fs/samba )
@@ -167,16 +168,3 @@ src_configure() {
 
 	ecm_src_configure
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}

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

[Andreas Sturmlechner]

commit:     994b1c2a88a601d92dae2e506a83953ada0f6b5a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 19:37:13 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 19:37:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=994b1c2a

kde-apps/kopete: Drop duplicate DEPENDs

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-20.08.49.9999.ebuild | 4 +---
 kde-apps/kopete/kopete-9999.ebuild          | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-20.08.49.9999.ebuild b/kde-apps/kopete/kopete-20.08.49.9999.ebuild
index fb4b59cadd..466f2819b7 100644
--- a/kde-apps/kopete/kopete-20.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-20.08.49.9999.ebuild
@@ -74,10 +74,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/kemoticons-${KFMIN}:5

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index befe9f065f..e9832574f2 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -74,10 +74,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/kemoticons-${KFMIN}:5

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

[Andreas Sturmlechner]

commit:     2734c16fdc9cd8d76735a8782064ddf3c0cf9220
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 17:42:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 17:42:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2734c16f

kde-apps/kopete: Update net-libs/libsrtp slot dep even as comment

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild      | 2 +-
 kde-apps/kopete/kopete-19.12.49.9999.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kopete/kopete-19.11.80.ebuild b/kde-apps/kopete/kopete-19.11.80.ebuild
index 745a09d668..6c7ba9683a 100644
--- a/kde-apps/kopete/kopete-19.11.80.ebuild
+++ b/kde-apps/kopete/kopete-19.11.80.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
 #		dev-libs/openssl:0=
 #		>=media-libs/mediastreamer-2.3.0
 #		media-libs/speex
-#		net-libs/libsrtp:=
+#		net-libs/libsrtp:0=
 #		net-libs/ortp:=
 #	)
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/kopete/kopete-19.12.49.9999.ebuild b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
index 844bb750e8..b692ca8b86 100644
--- a/kde-apps/kopete/kopete-19.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
 #		dev-libs/openssl:0=
 #		>=media-libs/mediastreamer-2.3.0
 #		media-libs/speex
-#		net-libs/libsrtp:=
+#		net-libs/libsrtp:0=
 #		net-libs/ortp:=
 #	)
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 83192a11cf..07fb2f95bd 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
 #		dev-libs/openssl:0=
 #		>=media-libs/mediastreamer-2.3.0
 #		media-libs/speex
-#		net-libs/libsrtp:=
+#		net-libs/libsrtp:0=
 #		net-libs/ortp:=
 #	)
 RDEPEND="${COMMON_DEPEND}

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

[Andreas Sturmlechner]

commit:     32cc38bd4967afff847b1d141d7a754ddd73744d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 10:59:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 10:59:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32cc38bd

kde-apps/kopete: Drop USE jingle

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild      | 30 ++++++++++++++---------------
 kde-apps/kopete/kopete-19.12.49.9999.ebuild | 30 ++++++++++++++---------------
 kde-apps/kopete/kopete-9999.ebuild          | 30 ++++++++++++++---------------
 kde-apps/kopete/metadata.xml                |  1 -
 4 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/kde-apps/kopete/kopete-19.11.80.ebuild b/kde-apps/kopete/kopete-19.11.80.ebuild
index 47cfeec26e..1d75dd2334 100644
--- a/kde-apps/kopete/kopete-19.11.80.ebuild
+++ b/kde-apps/kopete/kopete-19.11.80.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="ssl v4l"
 
 # Available plugins
-#
 #	addbookmarks: NO DEPS
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
@@ -47,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 
 # disabled protocols
 #	irc: NO DEPS
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
 #	skype, sms (until fixed)
@@ -93,14 +92,6 @@ COMMON_DEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -119,6 +110,14 @@ COMMON_DEPEND="
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
 	)
 "
+#	jingle? (
+#		dev-libs/expat
+#		dev-libs/openssl:0=
+#		>=media-libs/mediastreamer-2.3.0
+#		media-libs/speex
+#		net-libs/libsrtp:=
+#		net-libs/ortp:=
+#	)
 RDEPEND="${COMMON_DEPEND}
 	latex? (
 		|| (
@@ -133,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -144,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake_use_find_package jingle LiboRTP)
-		$(cmake_use_find_package jingle Mediastreamer)
-		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
+#		$(cmake_use_find_package jingle LiboRTP)
+#		$(cmake_use_find_package jingle Mediastreamer)
+#		$(cmake_use_find_package jingle Speex)
+
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in

diff --git a/kde-apps/kopete/kopete-19.12.49.9999.ebuild b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
index 4efd83c910..53d064e5db 100644
--- a/kde-apps/kopete/kopete-19.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
@@ -20,7 +20,6 @@ KEYWORDS=""
 IUSE="ssl v4l"
 
 # Available plugins
-#
 #	addbookmarks: NO DEPS
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
@@ -47,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 
 # disabled protocols
 #	irc: NO DEPS
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
 #	skype, sms (until fixed)
@@ -93,14 +92,6 @@ COMMON_DEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -119,6 +110,14 @@ COMMON_DEPEND="
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
 	)
 "
+#	jingle? (
+#		dev-libs/expat
+#		dev-libs/openssl:0=
+#		>=media-libs/mediastreamer-2.3.0
+#		media-libs/speex
+#		net-libs/libsrtp:=
+#		net-libs/ortp:=
+#	)
 RDEPEND="${COMMON_DEPEND}
 	latex? (
 		|| (
@@ -133,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -144,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake_use_find_package jingle LiboRTP)
-		$(cmake_use_find_package jingle Mediastreamer)
-		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
+#		$(cmake_use_find_package jingle LiboRTP)
+#		$(cmake_use_find_package jingle Mediastreamer)
+#		$(cmake_use_find_package jingle Speex)
+
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 93b6f5c2d5..81297d8e17 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -20,7 +20,6 @@ KEYWORDS=""
 IUSE="ssl v4l"
 
 # Available plugins
-#
 #	addbookmarks: NO DEPS
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
@@ -47,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 
 # disabled protocols
 #	irc: NO DEPS
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
 #	skype, sms (until fixed)
@@ -93,14 +92,6 @@ COMMON_DEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -119,6 +110,14 @@ COMMON_DEPEND="
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
 	)
 "
+#	jingle? (
+#		dev-libs/expat
+#		dev-libs/openssl:0=
+#		>=media-libs/mediastreamer-2.3.0
+#		media-libs/speex
+#		net-libs/libsrtp:=
+#		net-libs/ortp:=
+#	)
 RDEPEND="${COMMON_DEPEND}
 	latex? (
 		|| (
@@ -133,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -144,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake_use_find_package jingle LiboRTP)
-		$(cmake_use_find_package jingle Mediastreamer)
-		$(cmake_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
+#		$(cmake_use_find_package jingle LiboRTP)
+#		$(cmake_use_find_package jingle Mediastreamer)
+#		$(cmake_use_find_package jingle Speex)
+
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index ff8a38c8d6..414ef28fff 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
-		<flag name="jingle">Enable voice calls for jabber</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>

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

[Andreas Sturmlechner]

commit:     3a7f3cfc5f259d36e261a6fcfdb86ccc41de1ef5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 11:02:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 11:05:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a7f3cfc

kde-apps/kopete: Sort DEPENDs

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild      | 20 ++++++++++----------
 kde-apps/kopete/kopete-19.12.49.9999.ebuild | 20 ++++++++++----------
 kde-apps/kopete/kopete-9999.ebuild          | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/kde-apps/kopete/kopete-19.11.80.ebuild b/kde-apps/kopete/kopete-19.11.80.ebuild
index 1d75dd2334..745a09d668 100644
--- a/kde-apps/kopete/kopete-19.11.80.ebuild
+++ b/kde-apps/kopete/kopete-19.11.80.ebuild
@@ -64,6 +64,14 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -79,14 +87,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
@@ -103,11 +103,11 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-frameworks/kdnssd-${KFMIN}:5
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
+		>=kde-frameworks/kdnssd-${KFMIN}:5
 	)
 "
 #	jingle? (

diff --git a/kde-apps/kopete/kopete-19.12.49.9999.ebuild b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
index 53d064e5db..844bb750e8 100644
--- a/kde-apps/kopete/kopete-19.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-19.12.49.9999.ebuild
@@ -64,6 +64,14 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -79,14 +87,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
@@ -103,11 +103,11 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-frameworks/kdnssd-${KFMIN}:5
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
+		>=kde-frameworks/kdnssd-${KFMIN}:5
 	)
 "
 #	jingle? (

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 81297d8e17..83192a11cf 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -64,6 +64,14 @@ PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -79,14 +87,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
@@ -103,11 +103,11 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-frameworks/kdnssd-${KFMIN}:5
 		>=kde-apps/kidentitymanagement-${PVCUT}:5
+		>=kde-frameworks/kdnssd-${KFMIN}:5
 	)
 "
 #	jingle? (

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

[Andreas Sturmlechner]

commit:     7d64886dd794bb4b4068d84ccfa74de85b79926d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 14:41:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 00:05:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d64886d

kde-apps/kopete: Make USE=oscar local

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 kde-apps/kopete/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 88762100f0..414ef28fff 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -14,6 +14,7 @@
 		<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>

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

[Andreas Sturmlechner]

commit:     144c2568af1c381894aa76381d779712cd4e343b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 18:56:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 19:03:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=144c2568

kde-apps/kopete: Block kde-apps/kde4-l10n

Closes: https://bugs.gentoo.org/663778
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 kde-apps/kopete/kopete-18.08.0.ebuild       | 1 +
 kde-apps/kopete/kopete-18.08.49.9999.ebuild | 1 +
 kde-apps/kopete/kopete-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/kopete/kopete-18.08.0.ebuild b/kde-apps/kopete/kopete-18.08.0.ebuild
index 6f16b170b0..ad209c213a 100644
--- a/kde-apps/kopete/kopete-18.08.0.ebuild
+++ b/kde-apps/kopete/kopete-18.08.0.ebuild
@@ -116,6 +116,7 @@ COMMONDEPEND="
 	)
 "
 RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
 	latex? (
 		|| (
 			media-gfx/imagemagick

diff --git a/kde-apps/kopete/kopete-18.08.49.9999.ebuild b/kde-apps/kopete/kopete-18.08.49.9999.ebuild
index 9c0c95d69e..b2961f2bd4 100644
--- a/kde-apps/kopete/kopete-18.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-18.08.49.9999.ebuild
@@ -116,6 +116,7 @@ COMMONDEPEND="
 	)
 "
 RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
 	latex? (
 		|| (
 			media-gfx/imagemagick

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 9c0c95d69e..b2961f2bd4 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -116,6 +116,7 @@ COMMONDEPEND="
 	)
 "
 RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
 	latex? (
 		|| (
 			media-gfx/imagemagick

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

[Andreas Sturmlechner]

commit:     7661f3103e903cca69ef2aca582b1868e686c995
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 21:40:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 21:40:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7661f310

kde-apps/kopete: Drop obsolete comment

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 kde-apps/kopete/kopete-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index e85445d587..9c0c95d69e 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -56,7 +56,6 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 #	irc: NO DEPS
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
-#	yahoo: media-libs/jasper (service shutdown)
 #	skype, sms (until fixed)
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"

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

[Andreas Sturmlechner]

commit:     c80dab032b6f76b7ab2b0c30ab55f1b59e241457
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 10:27:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 10:27:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c80dab03

kde-apps/kopete: Add missing slot ops

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 kde-apps/kopete/kopete-18.04.49.9999.ebuild | 6 +++---
 kde-apps/kopete/kopete-9999.ebuild          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-18.04.49.9999.ebuild b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
index fc67469193..e85445d587 100644
--- a/kde-apps/kopete/kopete-18.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
@@ -92,7 +92,7 @@ COMMONDEPEND="
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
 	jingle? (
 		dev-libs/expat
-		dev-libs/openssl:0
+		dev-libs/openssl:0=
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
 		net-libs/libsrtp:=
@@ -108,8 +108,8 @@ COMMONDEPEND="
 	)
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn
-		sys-libs/zlib
+		net-dns/libidn:0=
+		sys-libs/zlib:=
 	)
 	zeroconf? (
 		$(add_frameworks_dep kdnssd)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index fc67469193..e85445d587 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -92,7 +92,7 @@ COMMONDEPEND="
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
 	jingle? (
 		dev-libs/expat
-		dev-libs/openssl:0
+		dev-libs/openssl:0=
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
 		net-libs/libsrtp:=
@@ -108,8 +108,8 @@ COMMONDEPEND="
 	)
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn
-		sys-libs/zlib
+		net-dns/libidn:0=
+		sys-libs/zlib:=
 	)
 	zeroconf? (
 		$(add_frameworks_dep kdnssd)

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

[Andreas Sturmlechner]

commit:     1b90e57fdb2f4478f3f9543c9239aa814ffabc5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 17:37:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 18:55:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b90e57f

kde-apps/kopete: Drop USE=yahoo, service will shut down

See also:
https://help.yahoo.com/kb/messenger/SLN28776.html?impressions=true&guccounter=1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 kde-apps/kopete/kopete-18.04.49.9999.ebuild | 11 ++++-------
 kde-apps/kopete/kopete-9999.ebuild          | 11 ++++-------
 kde-apps/kopete/metadata.xml                |  1 -
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kopete/kopete-18.04.49.9999.ebuild b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
index 3509019389..fc67469193 100644
--- a/kde-apps/kopete/kopete-18.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
@@ -39,7 +39,6 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowli
 otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
 
 # Available protocols
-#
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
@@ -50,16 +49,15 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
 
 # disabled protocols
-#	telepathy: net-libs/decibel
 #	irc: NO DEPS
 #	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	yahoo: media-libs/jasper (service shutdown)
+#	skype, sms (until fixed)
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
@@ -113,7 +111,6 @@ COMMONDEPEND="
 		net-dns/libidn
 		sys-libs/zlib
 	)
-	yahoo? ( media-libs/jasper )
 	zeroconf? (
 		$(add_frameworks_dep kdnssd)
 		$(add_kdeapps_dep kidentitymanagement)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 3509019389..fc67469193 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -39,7 +39,6 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowli
 otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
 
 # Available protocols
-#
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
@@ -50,16 +49,15 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
 
 # disabled protocols
-#	telepathy: net-libs/decibel
 #	irc: NO DEPS
 #	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	yahoo: media-libs/jasper (service shutdown)
+#	skype, sms (until fixed)
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
@@ -113,7 +111,6 @@ COMMONDEPEND="
 		net-dns/libidn
 		sys-libs/zlib
 	)
-	yahoo? ( media-libs/jasper )
 	zeroconf? (
 		$(add_frameworks_dep kdnssd)
 		$(add_kdeapps_dep kidentitymanagement)

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 0cefd8509a..88762100f0 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -28,7 +28,6 @@
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
 		<flag name="testbed">Enable the testbed protocol.</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
-		<flag name="yahoo">Enable yahoo protocol support.</flag>
 		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     7765ebd353fbd3b2c4cbb64badc2ca9c285e52b7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 06:51:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 18 07:22:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7765ebd3

kde-apps/kopete: Drop obsolete libmsn build switch

Upstream commit c21991982f42e2b7be44fa6b3670208632efe842

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 kde-apps/kopete/kopete-18.04.49.9999.ebuild | 2 --
 kde-apps/kopete/kopete-9999.ebuild          | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-apps/kopete/kopete-18.04.49.9999.ebuild b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
index 09727ab703..3509019389 100644
--- a/kde-apps/kopete/kopete-18.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-18.04.49.9999.ebuild
@@ -59,7 +59,6 @@ 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}"
@@ -141,7 +140,6 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
 		-DWITH_qq=OFF
 		$(cmake-utils_use_find_package jingle LiboRTP)
 		$(cmake-utils_use_find_package jingle Mediastreamer)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 09727ab703..3509019389 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -59,7 +59,6 @@ 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}"
@@ -141,7 +140,6 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
 		-DWITH_qq=OFF
 		$(cmake-utils_use_find_package jingle LiboRTP)
 		$(cmake-utils_use_find_package jingle Mediastreamer)

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

[Andreas Sturmlechner]

commit:     145168699f737010d5e9d94e96d590638d35f393
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:04:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:04:17 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14516869

kde-apps/kopete: Relax app-crypt/qca qt5-usedep

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/kopete/kopete-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 689d5269f9..78f452e338 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -92,7 +92,7 @@ COMMONDEPEND="
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
 	jingle? (
 		dev-libs/expat
 		dev-libs/openssl:0
@@ -110,7 +110,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2[qt5]
+		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn
 		sys-libs/zlib
 	)

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

[Andreas Sturmlechner]

commit:     22802ddeb04368b7ac9a349424a2b0aab6413a68
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 21:43:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 21:52:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=22802dde

kde-apps/kopete: Re-add jingle support

Upstream commits:
586a2314856075acc11284309acddb274bf7b546
059df228e4e08da83a528dfcc6ace2f1231b7382

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/kopete/kopete-9999.ebuild | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 96695e0c2c..689d5269f9 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -44,7 +44,7 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: BROKEN (media-libs/speex net-libs/ortp) DISABLED BY UPSTREAM
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	oscar: NO DEPS
 #	telepathy: net-libs/decibel
@@ -53,7 +53,8 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 # DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #	telepathy: net-libs/decibel
@@ -92,6 +93,14 @@ COMMONDEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -111,14 +120,6 @@ COMMONDEPEND="
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 "
-# 	jingle? (
-# 		dev-libs/expat
-# 		dev-libs/openssl:0
-# 		>=media-libs/mediastreamer-2.3.0
-# 		media-libs/speex
-# 		net-libs/libsrtp:=
-# 		net-libs/ortp:=
-# 	)
 RDEPEND="${COMMONDEPEND}
 	latex? (
 		|| (
@@ -133,8 +134,8 @@ RDEPEND="${COMMONDEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMONDEPEND}
 	x11-proto/scrnsaverproto
+	jingle? ( dev-libs/jsoncpp )
 "
-# 	jingle? ( dev-libs/jsoncpp )
 
 src_configure() {
 	local x x2
@@ -142,12 +143,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
 		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
-# 		$(cmake-utils_use_find_package jingle LiboRTP)
-# 		$(cmake-utils_use_find_package jingle Mediastreamer)
-# 		$(cmake-utils_use_find_package jingle Speex)
-
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in

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

[Andreas Sturmlechner]

commit:     d8676342da31612f26b70c7591d2c1d7183c7857
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 13:28:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 13:28:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8676342

kde-apps/kopete: Frameworks branch rebased onto master

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 kde-apps/kopete/kopete-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 0463b149c2..96695e0c2c 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-EGIT_BRANCH="kf5"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5

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

[Andreas Sturmlechner]

commit:     68572f8a77699470a0ebfa68a2545bb05e940410
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 19:07:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 19:07:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=68572f8a

kde-apps/kopete: Drop 17.08.3_p20171029

Moved to Gentoo main ebuild repository.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 171 ------------------------
 kde-apps/kopete/kopete-9999.ebuild              |   6 +-
 2 files changed, 3 insertions(+), 174 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
deleted file mode 100644
index ded0555be7..0000000000
--- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=d7dbacb483124d5d6a8ad30586ec126c8514a715
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	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)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise meanwhile oscar 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}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5] )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF )
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 031314eee2..bc3daabc2d 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -141,6 +141,8 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
+		-DWITH_qq=OFF
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 # 		$(cmake-utils_use_find_package jingle LiboRTP)
@@ -158,10 +160,8 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
-	mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF )
-
 	# disable until fixed:
-	mycmakeargs+=( -DWITH_{skype,sms}=OFF )
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

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

[Andreas Sturmlechner]

commit:     19629de61e4bcf3f2b69f16f679f0e45f2143af4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 18:02:26 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 18:02:26 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=19629de6

kde-apps/kopete: Restore keywords to 17.08.3_p20171029

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
index 2e91d8471d..ded0555be7 100644
--- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
+++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
 HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl v4l"
 
 # tests hang, last checked for 4.2.96

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

[Andreas Sturmlechner]

commit:     d5b996d08fc0b98c8c59cb7853390e0be6efab3d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 18:01:56 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 18:01:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5b996d0

kde-apps/kopete: Disable broken cryptography, jingle

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 24 ++--------------
 kde-apps/kopete/kopete-9999.ebuild              | 38 ++++++++++++-------------
 kde-apps/kopete/metadata.xml                    |  1 -
 3 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
index 2cc8c33ec6..2e91d8471d 100644
--- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
+++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
@@ -24,7 +24,6 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
-#	cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -38,9 +37,8 @@ RESTRICT+=" test"
 #	urlpicpreview: NO DEPS
 #	webpresence: libxml2 libxslt
 # NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight
-history latex nowlistening otr pipes +privacy +statistics +texteffect
-translator +urlpicpreview webpresence"
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
 
 # Available protocols
 #
@@ -48,7 +46,6 @@ translator +urlpicpreview webpresence"
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	oscar: NO DEPS
 #	telepathy: net-libs/decibel
@@ -57,8 +54,7 @@ translator +urlpicpreview webpresence"
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 # DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #	telepathy: net-libs/decibel
@@ -68,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf"
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
-#	media-libs/qimageblitz
 COMMONDEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -98,14 +93,6 @@ COMMONDEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -139,22 +126,17 @@ RDEPEND="${COMMONDEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMONDEPEND}
 	x11-proto/scrnsaverproto
-	jingle? ( dev-libs/jsoncpp )
 "
 
 src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			jingle) x2=libjingle ;;
 			xmpp) x2=jabber ;;
 			zeroconf) x2=bonjour ;;
 			*) x2=${x/+/} ;;

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 5b143ac46c..031314eee2 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
-#	cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -36,9 +36,8 @@ RESTRICT+=" test"
 #	urlpicpreview: NO DEPS
 #	webpresence: libxml2 libxslt
 # NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight
-history latex nowlistening otr pipes +privacy +statistics +texteffect
-translator +urlpicpreview webpresence"
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
 
 # Available protocols
 #
@@ -46,7 +45,7 @@ translator +urlpicpreview webpresence"
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	jingle: BROKEN (media-libs/speex net-libs/ortp) DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	oscar: NO DEPS
 #	telepathy: net-libs/decibel
@@ -55,8 +54,7 @@ translator +urlpicpreview webpresence"
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 # DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #	telepathy: net-libs/decibel
@@ -66,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf"
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
-#	media-libs/qimageblitz
 COMMONDEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -96,14 +93,6 @@ COMMONDEPEND="
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -123,6 +112,14 @@ COMMONDEPEND="
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 "
+# 	jingle? (
+# 		dev-libs/expat
+# 		dev-libs/openssl:0
+# 		>=media-libs/mediastreamer-2.3.0
+# 		media-libs/speex
+# 		net-libs/libsrtp:=
+# 		net-libs/ortp:=
+# 	)
 RDEPEND="${COMMONDEPEND}
 	latex? (
 		|| (
@@ -137,18 +134,19 @@ RDEPEND="${COMMONDEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMONDEPEND}
 	x11-proto/scrnsaverproto
-	jingle? ( dev-libs/jsoncpp )
 "
+# 	jingle? ( dev-libs/jsoncpp )
 
 src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
+# 		$(cmake-utils_use_find_package jingle LiboRTP)
+# 		$(cmake-utils_use_find_package jingle Mediastreamer)
+# 		$(cmake-utils_use_find_package jingle Speex)
+
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 2b6a3b5d29..22e128fe4d 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -6,7 +6,6 @@
 		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
 		<flag name="autoreplace">Automatically replace selected text</flag>
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
-		<flag name="cryptography">Enable cryptography plugin</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>

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

[Andreas Sturmlechner]

commit:     fd7262196a1c29d649013d2dea4fdd21e2ff11da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 22:05:04 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 22:05:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd726219

kde-apps/kopete: Add 17.08.3_p20171029 snapshot for testing

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 189 ++++++++++++++++++++++++
 1 file changed, 189 insertions(+)

diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
new file mode 100644
index 0000000000..2cc8c33ec6
--- /dev/null
+++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=d7dbacb483124d5d6a8ad30586ec126c8514a715
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS=""
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight
+history latex nowlistening otr pipes +privacy +statistics +texteffect
+translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+#	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
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	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)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+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}"
+
+#	media-libs/qimageblitz
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-proto/scrnsaverproto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF )
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}

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

[Johannes Huber]

commit:     148f236c1f18d7ab7c9d93b4b5be7979a553da77
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 18:55:54 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 18:55:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=148f236c

kde-apps/kopete: Drop kde-apps/kdepim-common-libs

Package was removed from tree.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-apps/kopete/kopete-17.08.49.9999.ebuild | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.08.49.9999.ebuild b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
index 1251a9c1c4..32458a1fab 100644
--- a/kde-apps/kopete/kopete-17.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
-#	cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
+#	cryptography: kde-apps/libkleo:4
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -73,12 +73,7 @@ COMMONDEPEND="
 	media-libs/qimageblitz[-qt5(-)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
-	cryptography? (
-		|| (
-			$(add_kdeapps_dep kdepim-common-libs)
-			$(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
-		)
-	)
+	cryptography? ( $(add_kdeapps_dep libkleo '' 4.4.2016.01-r1) )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (

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

[Andreas Sturmlechner]

commit:     462379d391804ee6bb9a17cc247b45e44bd69c11
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 11:19:24 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 12:09:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=462379d3

kde-apps/kopete: Add QT3SUPPORT_REQUIRED="true"

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/kopete/kopete-17.08.49.9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/kopete-17.08.49.9999.ebuild b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
index 9786c7e276..df6a667b47 100644
--- a/kde-apps/kopete/kopete-17.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.08.49.9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 KDE_HANDBOOK="optional"
+QT3SUPPORT_REQUIRED="true"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"

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

[Andreas Sturmlechner]

commit:     e87ee18ee571319d7e6d9f60fa4d797bd31ecbbd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 21:32:47 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 21:32:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e87ee18e

kde-apps/kopete: DEPEND on media-libs/qimageblitz[-qt5]

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/kopete/kopete-17.04.49.9999.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
index fde591c1fc..9786c7e276 100644
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
@@ -69,7 +69,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
-	media-libs/qimageblitz
+	media-libs/qimageblitz[-qt5(-)]
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index fde591c1fc..9786c7e276 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -69,7 +69,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
-	media-libs/qimageblitz
+	media-libs/qimageblitz[-qt5(-)]
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver

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

[Andreas Sturmlechner]

commit:     913bf31832851bbfb985f03494eabf0ebe145884
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 20:15:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 20:15:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=913bf318

kde-apps/kopete: Add new DEPENDs

Upstream commits:
42dcaa348a96d10c81149cfdae89a6e61d27fdc7
fd96e92496cf66024b878a9c4a818aa903d1a0fa

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kopete/kopete-5.9999.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-5.9999.ebuild b/kde-apps/kopete/kopete-5.9999.ebuild
index be07a028bc..99c5c23871 100644
--- a/kde-apps/kopete/kopete-5.9999.ebuild
+++ b/kde-apps/kopete/kopete-5.9999.ebuild
@@ -22,6 +22,7 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
+#	cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -35,8 +36,8 @@ RESTRICT+=" test"
 #	urlpicpreview: NO DEPS
 #	webpresence: libxml2 libxslt
 # NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history
-latex nowlistening otr pipes +privacy +statistics +texteffect
+PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight
+history latex nowlistening otr pipes +privacy +statistics +texteffect
 translator +urlpicpreview webpresence"
 
 # Available protocols
@@ -69,6 +70,8 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 COMMONDEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
@@ -81,10 +84,12 @@ COMMONDEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
 	dev-libs/libpcre
 	media-libs/phonon[qt5]
 	x11-libs/libX11

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

[Andreas Sturmlechner]

commit:     c6c9c0bec5ffd2e381cbab26e519913f611a1b95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 12:13:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 12:13:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6c9c0be

kde-apps/kopete: Fix DEPEND, build flags

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kopete/kopete-17.03.80.ebuild      |  7 +++----
 kde-apps/kopete/kopete-17.04.49.9999.ebuild |  7 +++----
 kde-apps/kopete/kopete-5.9999.ebuild        | 12 ++++++------
 kde-apps/kopete/kopete-9999.ebuild          |  7 +++----
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.03.80.ebuild b/kde-apps/kopete/kopete-17.03.80.ebuild
index fb5807f931..be9563fab7 100644
--- a/kde-apps/kopete/kopete-17.03.80.ebuild
+++ b/kde-apps/kopete/kopete-17.03.80.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
 		dev-libs/expat
 		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
 		net-libs/libsrtp:=
 		net-libs/ortp:=
 	)
@@ -107,6 +106,7 @@ COMMONDEPEND="
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+	jingle? ( media-libs/speex )
 	latex? (
 		virtual/imagemagick-tools
 		virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DWITH_GOOGLETALK=$(usex jingle)
 		-DWITH_LiboRTP=$(usex jingle)
 		-DWITH_Mediastreamer=$(usex jingle)
-		-DWITH_Speex=$(usex jingle)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
+			jingle) x2=libjingle ;;
 			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
 			*) x2=${x/+/} ;;
 		esac
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )

diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
index 72c5b2f385..d51b05e789 100644
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
 		dev-libs/expat
 		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
 		net-libs/libsrtp:=
 		net-libs/ortp:=
 	)
@@ -107,6 +106,7 @@ COMMONDEPEND="
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+	jingle? ( media-libs/speex )
 	latex? (
 		virtual/imagemagick-tools
 		virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DWITH_GOOGLETALK=$(usex jingle)
 		-DWITH_LiboRTP=$(usex jingle)
 		-DWITH_Mediastreamer=$(usex jingle)
-		-DWITH_Speex=$(usex jingle)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
+			jingle) x2=libjingle ;;
 			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
 			*) x2=${x/+/} ;;
 		esac
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )

diff --git a/kde-apps/kopete/kopete-5.9999.ebuild b/kde-apps/kopete/kopete-5.9999.ebuild
index b6441411dc..be07a028bc 100644
--- a/kde-apps/kopete/kopete-5.9999.ebuild
+++ b/kde-apps/kopete/kopete-5.9999.ebuild
@@ -139,23 +139,23 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DWITH_GOOGLETALK=$(usex jingle)
-		-DWITH_LiboRTP=$(usex jingle)
-		-DWITH_Mediastreamer=$(usex jingle)
-		-DWITH_Speex=$(usex jingle)
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
+			jingle) x2=libjingle ;;
 			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
 			*) x2=${x/+/} ;;
 		esac
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+	mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF )
 
 	# disable until fixed:
 	mycmakeargs+=( -DWITH_{skype,sms}=OFF )

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 72c5b2f385..d51b05e789 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
 		dev-libs/expat
 		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
 		net-libs/libsrtp:=
 		net-libs/ortp:=
 	)
@@ -107,6 +106,7 @@ COMMONDEPEND="
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+	jingle? ( media-libs/speex )
 	latex? (
 		virtual/imagemagick-tools
 		virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		-DWITH_GOOGLETALK=$(usex jingle)
 		-DWITH_LiboRTP=$(usex jingle)
 		-DWITH_Mediastreamer=$(usex jingle)
-		-DWITH_Speex=$(usex jingle)
 		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
+			jingle) x2=libjingle ;;
 			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
 			*) x2=${x/+/} ;;
 		esac
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )

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

[Andreas Sturmlechner]

commit:     258aa3e5b67efedbc08809b95cc6fd31dddea717
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 20:18:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 20:18:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=258aa3e5

kde-apps/kopete: Add missing DEPEND

Reported-by: jospezial <jospezial <AT> gmx.de>
Gentoo-bug: 613932

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kopete/kopete-5.9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/kopete/kopete-5.9999.ebuild b/kde-apps/kopete/kopete-5.9999.ebuild
index 5dff05de5b..b6441411dc 100644
--- a/kde-apps/kopete/kopete-5.9999.ebuild
+++ b/kde-apps/kopete/kopete-5.9999.ebuild
@@ -69,6 +69,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 COMMONDEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
@@ -79,6 +80,7 @@ COMMONDEPEND="
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep ktexteditor)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)

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

[Andreas Sturmlechner]

commit:     f8222979818521399e0e56a764c2059c0ecaf6f5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 17:27:13 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 17:55:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8222979

kde-apps/kopete: Add kf5 version

Package-Manager: portage-2.2.27

 kde-apps/kopete/kopete-5.9999.ebuild | 180 +++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/kde-apps/kopete/kopete-5.9999.ebuild b/kde-apps/kopete/kopete-5.9999.ebuild
new file mode 100644
index 0000000000..5dff05de5b
--- /dev/null
+++ b/kde-apps/kopete/kopete-5.9999.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS=""
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history
+latex nowlistening otr pipes +privacy +statistics +texteffect
+translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+#	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
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	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)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+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}"
+
+#	media-libs/qimageblitz
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libpcre
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-proto/scrnsaverproto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_GOOGLETALK=$(usex jingle)
+		-DWITH_LiboRTP=$(usex jingle)
+		-DWITH_Mediastreamer=$(usex jingle)
+		-DWITH_Speex=$(usex jingle)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}

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

[Andreas Sturmlechner]

commit:     9173b363554db8a5ff6897c458831f9d6837b03b
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Mar  5 19:18:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 22:22:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9173b363

kde-apps/kopete: Add USE=cryptography

See also:
https://docs.kde.org/trunk4/en/kdenetwork/kopete/plugins.html#plugins-cryptography

Gentoo-bug: 613434

 kde-apps/kopete/kopete-17.04.49.9999.ebuild | 23 +++++++++++++++--------
 kde-apps/kopete/kopete-9999.ebuild          | 23 +++++++++++++++--------
 kde-apps/kopete/metadata.xml                |  1 +
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
index be4a117b89..72c5b2f385 100644
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
@@ -20,6 +20,7 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
+#	cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -33,9 +34,9 @@ RESTRICT+=" test"
 #	urlpicpreview: NO DEPS
 #	webpresence: libxml2 libxslt
 # NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
+PLUGINS="+addbookmarks +autoreplace +contactnotes cryptography +highlight
++history latex +nowlistening otr +pipes +privacy +statistics +texteffect
++translator +urlpicpreview webpresence"
 
 # Available protocols
 #
@@ -46,8 +47,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	oscar: NO DEPS
-#   telepathy: net-libs/decibel
-#   testbed: 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
@@ -55,9 +56,9 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
 testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-#   msn: net-libs/libmsn
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	msn: net-libs/libmsn
 #	qq: NO DEPS
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -73,6 +74,12 @@ COMMONDEPEND="
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
 	)
+	cryptography? (
+		|| (
+			$(add_kdeapps_dep kdepim-common-libs)
+			$(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
+		)
+	)
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index be4a117b89..72c5b2f385 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -20,6 +20,7 @@ RESTRICT+=" test"
 #	alias: NO DEPS (disabled upstream)
 #	autoreplace: NO DEPS
 #	contactnotes: NO DEPS
+#	cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
 #	highlight: NO DEPS
 #	history: NO DEPS
 #	latex: virtual/latex as RDEPEND
@@ -33,9 +34,9 @@ RESTRICT+=" test"
 #	urlpicpreview: NO DEPS
 #	webpresence: libxml2 libxslt
 # NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
+PLUGINS="+addbookmarks +autoreplace +contactnotes cryptography +highlight
++history latex +nowlistening otr +pipes +privacy +statistics +texteffect
++translator +urlpicpreview webpresence"
 
 # Available protocols
 #
@@ -46,8 +47,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	oscar: NO DEPS
-#   telepathy: net-libs/decibel
-#   testbed: 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
@@ -55,9 +56,9 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
 testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
-#   telepathy: net-libs/decibel
-#   irc: NO DEPS
-#   msn: net-libs/libmsn
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	msn: net-libs/libmsn
 #	qq: NO DEPS
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -73,6 +74,12 @@ COMMONDEPEND="
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
 	)
+	cryptography? (
+		|| (
+			$(add_kdeapps_dep kdepim-common-libs)
+			$(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
+		)
+	)
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 2e164b6c6e..8c349e7b46 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -6,6 +6,7 @@
 		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
 		<flag name="autoreplace">Automatically replace selected text</flag>
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
+		<flag name="cryptography">Enable cryptography plugin</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>

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

[Johannes Huber]

commit:     3bac4715011dc59a55f63790e6e5ffb273d3dea4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 20:05:44 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 20:08:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bac4715

kde-apps/kopete: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kopete/kopete-16.12.49.9999.ebuild | 7 ++-----
 kde-apps/kopete/kopete-9999.ebuild          | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.12.49.9999.ebuild b/kde-apps/kopete/kopete-16.12.49.9999.ebuild
index 19bb156eeb..73653f9428 100644
--- a/kde-apps/kopete/kopete-16.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-16.12.49.9999.ebuild
@@ -81,7 +81,7 @@ COMMONDEPEND="
 		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
-		net-libs/libsrtp
+		net-libs/libsrtp:=
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
@@ -102,10 +102,7 @@ COMMONDEPEND="
 "
 RDEPEND="${COMMONDEPEND}
 	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
+		virtual/imagemagick-tools
 		virtual/latex-base
 	)
 	ssl? ( app-crypt/qca:2[ssl] )

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 19bb156eeb..73653f9428 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -81,7 +81,7 @@ COMMONDEPEND="
 		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
-		net-libs/libsrtp
+		net-libs/libsrtp:=
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
@@ -102,10 +102,7 @@ COMMONDEPEND="
 "
 RDEPEND="${COMMONDEPEND}
 	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
+		virtual/imagemagick-tools
 		virtual/latex-base
 	)
 	ssl? ( app-crypt/qca:2[ssl] )

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

[Michael Palimaka]

commit:     016031fcdfaec6bd9739d0d55889c67d76a5823e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Nov 11 21:38:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 10:55:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=016031fc

kde-apps/kopete: Add new DEPEND

Upstream commit 3bff188483fd2ee01bb8310a511e8cc9a4808d22

Package-Manager: portage-2.3.0

 kde-apps/kopete/kopete-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 176986c..75fcb82 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -94,6 +94,7 @@ COMMONDEPEND="
 	)
 	xmpp? (
 		app-crypt/qca:2[qt4(+)]
+		dev-libs/qjson
 		net-dns/libidn
 		sys-libs/zlib
 	)

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

[Michael Palimaka]

commit:     52a73c5524eba1c5eceb433c86aabdd987180d4f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 19:35:18 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 19:35:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=52a73c55

kde-apps/kopete: remove sms USE flag

app-mobilephone/smssend is going away.

Gentoo-bug: 590732

Package-Manager: portage-2.3.0

 kde-apps/kopete/kopete-16.07.90.ebuild      | 5 ++---
 kde-apps/kopete/kopete-16.08.49.9999.ebuild | 5 ++---
 kde-apps/kopete/kopete-9999.ebuild          | 5 ++---
 kde-apps/kopete/metadata.xml                | 1 -
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.07.90.ebuild b/kde-apps/kopete/kopete-16.07.90.ebuild
index 951fcca..cd117ce 100644
--- a/kde-apps/kopete/kopete-16.07.90.ebuild
+++ b/kde-apps/kopete/kopete-16.07.90.ebuild
@@ -53,7 +53,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
-sms testbed winpopup +xmpp yahoo zeroconf"
+testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -107,7 +107,6 @@ RDEPEND="${COMMONDEPEND}
 		)
 		virtual/latex-base
 	)
-	sms? ( app-mobilephone/smssend )
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
@@ -136,7 +135,7 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

diff --git a/kde-apps/kopete/kopete-16.08.49.9999.ebuild b/kde-apps/kopete/kopete-16.08.49.9999.ebuild
index 2430c97..e136108 100644
--- a/kde-apps/kopete/kopete-16.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-16.08.49.9999.ebuild
@@ -53,7 +53,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
-sms testbed winpopup +xmpp yahoo zeroconf"
+testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -107,7 +107,6 @@ RDEPEND="${COMMONDEPEND}
 		)
 		virtual/latex-base
 	)
-	sms? ( app-mobilephone/smssend )
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
@@ -136,7 +135,7 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_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 2430c97..e136108 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -53,7 +53,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
-sms testbed winpopup +xmpp yahoo zeroconf"
+testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -107,7 +107,6 @@ RDEPEND="${COMMONDEPEND}
 		)
 		virtual/latex-base
 	)
-	sms? ( app-mobilephone/smssend )
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
@@ -136,7 +135,7 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index aa522db..2e164b6 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -29,7 +29,6 @@
 		<!-- uncomment this when enabled in ebuild
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>
 		-->
-		<flag name="sms">Enable SMS sendinge functionality.</flag>
 		<flag name="testbed">Enable the testbed protocol.</flag>
 		<flag name="xmpp">Enable XMPP protocol handler (this is also gmail).</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>

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

[Johannes Huber]

commit:     d353f20a60653029b84c4e91834688c39da3a4b4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 18:58:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:23:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d353f20a

kde-apps/kopete: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/kopete/kopete-16.03.90.ebuild      | 25 +++++++++----------------
 kde-apps/kopete/kopete-16.04.49.9999.ebuild | 25 +++++++++----------------
 kde-apps/kopete/kopete-9999.ebuild          | 25 +++++++++----------------
 3 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.03.90.ebuild b/kde-apps/kopete/kopete-16.03.90.ebuild
index 0685e5a..4113413 100644
--- a/kde-apps/kopete/kopete-16.03.90.ebuild
+++ b/kde-apps/kopete/kopete-16.03.90.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
-#	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
 	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
+		-DWITH_GOOGLETALK=$(usex jingle)
+		-DWITH_LiboRTP=$(usex jingle)
+		-DWITH_Mediastreamer=$(usex jingle)
+		-DWITH_Speex=$(usex jingle)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
 			zeroconf) x2=bonjour ;;
 			xmpp) x2=jabber ;;
-			*) x2='' ;;
+			*) x2=${x/+/} ;;
 		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
 	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
 	done
 
 	kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
 			if ! has_version "app-crypt/qca:2[openssl]" ; then

diff --git a/kde-apps/kopete/kopete-16.04.49.9999.ebuild b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
index ea8ef2f..2430c97 100644
--- a/kde-apps/kopete/kopete-16.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
-#	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
 	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
+		-DWITH_GOOGLETALK=$(usex jingle)
+		-DWITH_LiboRTP=$(usex jingle)
+		-DWITH_Mediastreamer=$(usex jingle)
+		-DWITH_Speex=$(usex jingle)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
 			zeroconf) x2=bonjour ;;
 			xmpp) x2=jabber ;;
-			*) x2='' ;;
+			*) x2=${x/+/} ;;
 		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
 	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
 	done
 
 	kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
 			if ! has_version "app-crypt/qca:2[openssl]" ; then

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index ea8ef2f..2430c97 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
 	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
-#	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
 	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
 	local x x2
 	# Handle common stuff
 	local mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
+		-DWITH_GOOGLETALK=$(usex jingle)
+		-DWITH_LiboRTP=$(usex jingle)
+		-DWITH_Mediastreamer=$(usex jingle)
+		-DWITH_Speex=$(usex jingle)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
 			zeroconf) x2=bonjour ;;
 			xmpp) x2=jabber ;;
-			*) x2='' ;;
+			*) x2=${x/+/} ;;
 		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
 	done
 
 	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
 	done
 
 	kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
 			if ! has_version "app-crypt/qca:2[openssl]" ; then

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

[Johannes Huber]

commit:     c48b2b13186d75bc4a31adba138ff7c6bd675cb1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 21:36:35 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 21:36:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c48b2b13

kde-apps/kopete: Use https for HOMEPAGE

Package-Manager: portage-2.2.20.1

 kde-apps/kopete/kopete-15.04.3.ebuild       | 2 +-
 kde-apps/kopete/kopete-15.08.0.ebuild       | 2 +-
 kde-apps/kopete/kopete-15.08.49.9999.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kopete/kopete-15.04.3.ebuild b/kde-apps/kopete/kopete-15.04.3.ebuild
index c07b3da..c59f394 100644
--- a/kde-apps/kopete/kopete-15.04.3.ebuild
+++ b/kde-apps/kopete/kopete-15.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug ssl v4l"
 

diff --git a/kde-apps/kopete/kopete-15.08.0.ebuild b/kde-apps/kopete/kopete-15.08.0.ebuild
index c07b3da..c59f394 100644
--- a/kde-apps/kopete/kopete-15.08.0.ebuild
+++ b/kde-apps/kopete/kopete-15.08.0.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug ssl v4l"
 

diff --git a/kde-apps/kopete/kopete-15.08.49.9999.ebuild b/kde-apps/kopete/kopete-15.08.49.9999.ebuild
index cd8abb6..97f34e3 100644
--- a/kde-apps/kopete/kopete-15.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-15.08.49.9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index cd8abb6..97f34e3 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

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

[Johannes Huber]

commit:     eef6d33888ceb265d1a23a4da40301958c741b18
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 21:42:38 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 21:42:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eef6d338

kde-apps/kopete: Remove old

Moved to gentoo main repo.

Package-Manager: portage-2.2.20.1

 kde-apps/kopete/kopete-15.04.3.ebuild | 167 ----------------------------------
 kde-apps/kopete/kopete-15.08.0.ebuild | 167 ----------------------------------
 2 files changed, 334 deletions(-)

diff --git a/kde-apps/kopete/kopete-15.04.3.ebuild b/kde-apps/kopete/kopete-15.04.3.ebuild
deleted file mode 100644
index c59f394..0000000
--- a/kde-apps/kopete/kopete-15.04.3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT=test
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
-
-# Available protocols
-#
-#	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	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)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-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}"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kdelibs 'zeroconf?')
-	$(add_kdebase_dep kdepimlibs)
-	dev-libs/libpcre
-	>=dev-qt/qtgui-4.4.0:4[mng]
-	media-libs/phonon[qt4]
-	media-libs/qimageblitz
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt4(+)]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca:2[openssl] )
-	winpopup? ( net-fs/samba )
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	jingle? ( dev-libs/jsoncpp )
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
-			xmpp) x2=jabber ;;
-			*) x2='' ;;
-		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
-	done
-
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
-	done
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
-	if ! use ssl; then
-		if use xmpp ; then # || use irc; then
-			if ! has_version "app-crypt/qca:2[openssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=openssl."
-			fi
-		fi
-	fi
-}

diff --git a/kde-apps/kopete/kopete-15.08.0.ebuild b/kde-apps/kopete/kopete-15.08.0.ebuild
deleted file mode 100644
index c59f394..0000000
--- a/kde-apps/kopete/kopete-15.08.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT=test
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
-+nowlistening otr +pipes +privacy +statistics +texteffect +translator
-+urlpicpreview webpresence"
-
-# Available protocols
-#
-#	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	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)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-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}"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kdelibs 'zeroconf?')
-	$(add_kdebase_dep kdepimlibs)
-	dev-libs/libpcre
-	>=dev-qt/qtgui-4.4.0:4[mng]
-	media-libs/phonon[qt4]
-	media-libs/qimageblitz
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt4(+)]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca:2[openssl] )
-	winpopup? ( net-fs/samba )
-"
-#	telepathy? ( net-libs/decibel )"
-DEPEND="${COMMONDEPEND}
-	jingle? ( dev-libs/jsoncpp )
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		$(cmake-utils_use_with jingle GOOGLETALK)
-		$(cmake-utils_use_with jingle LiboRTP)
-		$(cmake-utils_use_with jingle Mediastreamer)
-		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			zeroconf) x2=bonjour ;;
-			xmpp) x2=jabber ;;
-			*) x2='' ;;
-		esac
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
-	done
-
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
-	done
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
-	#fi
-
-	if ! use ssl; then
-		if use xmpp ; then # || use irc; then
-			if ! has_version "app-crypt/qca:2[openssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=openssl."
-			fi
-		fi
-	fi
-}

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

[Johannes Huber]

commit:     632bdb95ade7f7bc8a0b2085f0b327746abd24b2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 21:48:30 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 21:48:30 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=632bdb95

[kde-apps/kopete] Sync with tree

Package-Manager: portage-2.2.17

---
 kde-apps/kopete/kopete-14.12.2.ebuild | 6 +++---
 kde-apps/kopete/kopete-9999.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-14.12.2.ebuild b/kde-apps/kopete/kopete-14.12.2.ebuild
index 7e9238d..469fa13 100644
--- a/kde-apps/kopete/kopete-14.12.2.ebuild
+++ b/kde-apps/kopete/kopete-14.12.2.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 0e7ae12..d4e07a0 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi

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

[Michael Palimaka]

commit:     84caaa9de4a4385342aa24f2f27b267c6d25e1bf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 13:47:29 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 13:47:29 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=84caaa9d

[kde-apps/kopete] Add missing dependency SLOT.

Package-Manager: portage-2.2.14

---
 kde-apps/kopete/kopete-14.12.1.ebuild | 2 +-
 kde-apps/kopete/kopete-14.12.2.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild
index ac708d2..7e9238d 100644
--- a/kde-apps/kopete/kopete-14.12.1.ebuild
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild
@@ -78,7 +78,7 @@ COMMONDEPEND="
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
 		dev-libs/expat
-		dev-libs/openssl
+		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
 		net-libs/libsrtp

diff --git a/kde-apps/kopete/kopete-14.12.2.ebuild b/kde-apps/kopete/kopete-14.12.2.ebuild
index ac708d2..7e9238d 100644
--- a/kde-apps/kopete/kopete-14.12.2.ebuild
+++ b/kde-apps/kopete/kopete-14.12.2.ebuild
@@ -78,7 +78,7 @@ COMMONDEPEND="
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
 		dev-libs/expat
-		dev-libs/openssl
+		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
 		net-libs/libsrtp

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 8131ba3..0e7ae12 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -78,7 +78,7 @@ COMMONDEPEND="
 	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
 		dev-libs/expat
-		dev-libs/openssl
+		dev-libs/openssl:0
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
 		net-libs/libsrtp

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

[Michael Palimaka]

commit:     a00b4aabbf8e21d8203ee3dfb7b2db77da01f222
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  6 17:06:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  6 17:06:49 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a00b4aab

[kde-apps/kopete] Add missing dependencies that prevented libjingle-call from being built wrt bug #536326.

Package-Manager: portage-2.2.14

---
 kde-apps/kopete/kopete-14.12.1.ebuild | 19 ++++++++++++++-----
 kde-apps/kopete/kopete-14.12.2.ebuild | 19 ++++++++++++++-----
 kde-apps/kopete/kopete-9999.ebuild    | 19 ++++++++++++++-----
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild
index 3295209..ac708d2 100644
--- a/kde-apps/kopete/kopete-14.12.1.ebuild
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	dev-libs/libpcre
 	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
-	media-libs/qimageblitz
+	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
-	!aqua? ( x11-libs/libXScrnSaver )
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
+		dev-libs/expat
+		dev-libs/openssl
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
+		net-libs/libsrtp
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
@@ -86,8 +93,9 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2[qt4]
+		app-crypt/qca:2[qt4(+)]
 		net-dns/libidn
+		sys-libs/zlib
 	)
 	yahoo? ( media-libs/jasper )
 "
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND}
 "
 #	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 

diff --git a/kde-apps/kopete/kopete-14.12.2.ebuild b/kde-apps/kopete/kopete-14.12.2.ebuild
index 3295209..ac708d2 100644
--- a/kde-apps/kopete/kopete-14.12.2.ebuild
+++ b/kde-apps/kopete/kopete-14.12.2.ebuild
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	dev-libs/libpcre
 	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
-	media-libs/qimageblitz
+	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
-	!aqua? ( x11-libs/libXScrnSaver )
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
+		dev-libs/expat
+		dev-libs/openssl
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
+		net-libs/libsrtp
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
@@ -86,8 +93,9 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2[qt4]
+		app-crypt/qca:2[qt4(+)]
 		net-dns/libidn
+		sys-libs/zlib
 	)
 	yahoo? ( media-libs/jasper )
 "
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND}
 "
 #	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index b5d2c61..8131ba3 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	dev-libs/libpcre
 	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
-	media-libs/qimageblitz
+	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
-	!aqua? ( x11-libs/libXScrnSaver )
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
+		dev-libs/expat
+		dev-libs/openssl
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
+		net-libs/libsrtp
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
@@ -86,8 +93,9 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2[qt4]
+		app-crypt/qca:2[qt4(+)]
 		net-dns/libidn
+		sys-libs/zlib
 	)
 	yahoo? ( media-libs/jasper )
 "
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND}
 "
 #	telepathy? ( net-libs/decibel )"
 DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 

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

[Johannes Huber]

commit:     672999f41c82bddb8da2edd99efd7f4330e8c673
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 23:37:42 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 23:37:47 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=672999f4

[kde-apps/kopete] Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1

Package-Manager: portage-2.2.15

---
 kde-apps/kopete/kopete-14.12.1.ebuild | 6 +++---
 kde-apps/kopete/kopete-9999.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild
index b28414f..3295209 100644
--- a/kde-apps/kopete/kopete-14.12.1.ebuild
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild
@@ -71,7 +71,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
+	groupwise? ( app-crypt/qca:2[qt4] )
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -86,7 +86,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4]
 		net-dns/libidn
 	)
 	yahoo? ( media-libs/jasper )
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl:2 )
+	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index b6a6493..b5d2c61 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -71,7 +71,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
+	groupwise? ( app-crypt/qca:2[qt4] )
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -86,7 +86,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4]
 		net-dns/libidn
 	)
 	yahoo? ( media-libs/jasper )
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl:2 )
+	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"