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

2024-06-16 Thread Andreas Sturmlechner
commit: 0531579f202ce7d50ac02fd56ce27b14ced53836
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 16 19:28:12 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 16 19:35:50 2024 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
deleted file mode 100644
index 94939134c8..00
--- a/kde-apps/kopete/kopete-.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

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

2023-03-23 Thread Andreas Sturmlechner
commit: 0d1b8417d9bebb58d0a5a678a00ea0e5dcb2aed5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 23 11:41:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 23 11:41:55 2023 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 014c5c5dc1..d59e233458 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2023-01-30 Thread Andreas Sturmlechner
commit: 9f2026c5cdbd47b21550d0ea3c7027501dfad502
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 30 20:50:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 30 20:50:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f2026c5

kde-apps/kopete: Drop oscar and xmpp PROTOCOLS

There is no sign of that stuff actually working anymore.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kopete/kopete-22.12.49..ebuild | 26 +-
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-22.12.49..ebuild
index e591c9c4de..7cb07bb451 100644
--- a/kde-apps/kopete/kopete-22.12.49..ebuild
+++ b/kde-apps/kopete/kopete-22.12.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 9fd41cc6b3..fd83313e3a 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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} ${PLUGIN

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

2023-01-30 Thread Andreas Sturmlechner
commit: 5857f4a5a325d3af0ba34a19b9965ab7eca54a3a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 30 20:28:50 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 30 20:28:50 2023 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index e591c9c4de..9fd41cc6b3 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2022-10-06 Thread Andreas Sturmlechner
commit: e6223c8b5299ef65396746fecea0626fd0d6e2db
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 08:16:36 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:01:57 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6223c8b

kde-apps/kopete: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner  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 @@


https://bugs.kde.org/
+   cpe:/a:kde:kopete






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

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

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

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

 kde-apps/kopete/kopete-22.03.90.ebuild  | 1 -
 kde-apps/kopete/kopete-22.04.49..ebuild | 1 -
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-22.04.49..ebuild
index 1fdb0b69f3..6573cfe61a 100644
--- a/kde-apps/kopete/kopete-22.04.49..ebuild
+++ b/kde-apps/kopete/kopete-22.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 1fdb0b69f3..6573cfe61a 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2022-02-17 Thread Sam James
commit: c8f5da8f77a47c9e196c1df559b9f9bda3ec757e
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 17 18:54:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 17 18:54:33 2022 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-21.12.49..ebuild 
b/kde-apps/kopete/kopete-21.12.49..ebuild
index 42405e9785..cc32abbea6 100644
--- a/kde-apps/kopete/kopete-21.12.49..ebuild
+++ b/kde-apps/kopete/kopete-21.12.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 42405e9785..cc32abbea6 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2021-05-07 Thread Andreas Sturmlechner
commit: 02a85370e2274e6718be713d33b42a1f2541a23a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  7 13:24:46 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  7 15:23:43 2021 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-21.04.49..ebuild 
b/kde-apps/kopete/kopete-21.04.49..ebuild
index b4055ce683..45c1319e81 100644
--- a/kde-apps/kopete/kopete-21.04.49..ebuild
+++ b/kde-apps/kopete/kopete-21.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 85851b67a8..c76ad96b99 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2020-10-29 Thread Andreas Sturmlechner
commit: 994b1c2a88a601d92dae2e506a83953ada0f6b5a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 19:37:13 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 19:37:13 2020 +
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  gentoo.org>

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

diff --git a/kde-apps/kopete/kopete-20.08.49..ebuild 
b/kde-apps/kopete/kopete-20.08.49..ebuild
index fb4b59cadd..466f2819b7 100644
--- a/kde-apps/kopete/kopete-20.08.49..ebuild
+++ b/kde-apps/kopete/kopete-20.08.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index befe9f065f..e9832574f2 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/, kde-apps/kldap/, kde-apps/kate/, kde-apps/kmix/, ...

2020-04-03 Thread Andreas Sturmlechner
commit: fa97b5296e63ccfc09c5a782d69050ea94f1b0a7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  4 00:13:53 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  4 00:13:53 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa97b529

kde-apps: Raise  QTMIN to 5.14.1

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/akonadi-calendar/akonadi-calendar-.ebuild  | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-.ebuild  | 2 +-
 kde-apps/akonadi-import-wizard/akonadi-import-wizard-.ebuild| 2 +-
 kde-apps/akonadi-mime/akonadi-mime-.ebuild  | 2 +-
 kde-apps/akonadi-notes/akonadi-notes-.ebuild| 2 +-
 kde-apps/akonadi-search/akonadi-search-.ebuild  | 2 +-
 kde-apps/akonadi/akonadi-.ebuild| 2 +-
 kde-apps/akonadiconsole/akonadiconsole-.ebuild  | 2 +-
 kde-apps/akregator/akregator-.ebuild| 2 +-
 kde-apps/amor/amor-.ebuild  | 2 +-
 kde-apps/analitza/analitza-.ebuild  | 2 +-
 kde-apps/ark/ark-.ebuild| 2 +-
 kde-apps/artikulate/artikulate-.ebuild  | 2 +-
 kde-apps/audiocd-kio/audiocd-kio-.ebuild| 2 +-
 kde-apps/baloo-widgets/baloo-widgets-.ebuild| 2 +-
 kde-apps/blinken/blinken-.ebuild| 2 +-
 kde-apps/bomber/bomber-.ebuild  | 2 +-
 kde-apps/bovo/bovo-.ebuild  | 2 +-
 kde-apps/calendarjanitor/calendarjanitor-.ebuild| 2 +-
 kde-apps/calendarsupport/calendarsupport-.ebuild| 2 +-
 kde-apps/cantor/cantor-.ebuild  | 2 +-
 kde-apps/cervisia/cervisia-.ebuild  | 2 +-
 kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-.ebuild  | 2 +-
 kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-.ebuild| 2 +-
 kde-apps/dolphin-plugins-git/dolphin-plugins-git-.ebuild| 2 +-
 .../dolphin-plugins-mercurial/dolphin-plugins-mercurial-.ebuild | 2 +-
 .../dolphin-plugins-subversion/dolphin-plugins-subversion-.ebuild   | 2 +-
 kde-apps/dolphin/dolphin-.ebuild| 2 +-
 kde-apps/dragon/dragon-.ebuild  | 2 +-
 kde-apps/eventviews/eventviews-.ebuild  | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild  | 2 +-
 kde-apps/filelight/filelight-.ebuild| 2 +-
 kde-apps/granatier/granatier-.ebuild| 2 +-
 kde-apps/grantlee-editor/grantlee-editor-.ebuild| 2 +-
 kde-apps/grantleetheme/grantleetheme-.ebuild| 2 +-
 kde-apps/gwenview/gwenview-.ebuild  | 2 +-
 kde-apps/incidenceeditor/incidenceeditor-.ebuild| 2 +-
 kde-apps/juk/juk-.ebuild| 2 +-
 kde-apps/k3b/k3b-.ebuild| 2 +-
 kde-apps/kaccounts-integration/kaccounts-integration-.ebuild| 2 +-
 kde-apps/kaccounts-mobile/kaccounts-mobile-.ebuild  | 2 +-
 kde-apps/kaccounts-providers/kaccounts-providers-.ebuild| 2 +-
 kde-apps/kaddressbook/kaddressbook-.ebuild  | 2 +-
 kde-apps/kajongg/kajongg-.ebuild| 2 +-
 kde-apps/kalarm/kalarm-.ebuild  | 2 +-
 kde-apps/kalarmcal/kalarmcal-.ebuild| 2 +-
 kde-apps/kalgebra/kalgebra-.ebuild  | 2 +-
 kde-apps/kalzium/kalzium-.ebuild| 2 +-
 kde-apps/kamera/kamera-.ebuild  | 2 +-
 kde-apps/kamoso/kamoso-.ebuild  | 2 +-
 kde-apps/kanagram/kanagram-.ebuild  | 2 +-
 kde-apps/kapman/kapman-.ebuild  | 2 +-
 kde-apps/kapptemplate/kapptemplate-.ebuild  | 2 +-
 kde-apps/kate/kate-.ebuild  | 2 +-
 kde-apps/katomic/katomic-.ebuild| 2 +-
 kde-apps/kbackup/kbackup-.ebuild| 2 +-
 kde-apps/kblackbox/kblackbox-.ebuild| 2 +

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

2019-11-24 Thread Andreas Sturmlechner
commit: 2734c16fdc9cd8d76735a8782064ddf3c0cf9220
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 24 17:42:01 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 24 17:42:01 2019 +
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  gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild  | 2 +-
 kde-apps/kopete/kopete-19.12.49..ebuild | 2 +-
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-19.12.49..ebuild
index 844bb750e8..b692ca8b86 100644
--- a/kde-apps/kopete/kopete-19.12.49..ebuild
+++ b/kde-apps/kopete/kopete-19.12.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 83192a11cf..07fb2f95bd 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2019-11-24 Thread Andreas Sturmlechner
commit: 3a7f3cfc5f259d36e261a6fcfdb86ccc41de1ef5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 24 11:02:59 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 24 11:05:34 2019 +
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  gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild  | 20 ++--
 kde-apps/kopete/kopete-19.12.49..ebuild | 20 ++--
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-19.12.49..ebuild
index 53d064e5db..844bb750e8 100644
--- a/kde-apps/kopete/kopete-19.12.49..ebuild
+++ b/kde-apps/kopete/kopete-19.12.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 81297d8e17..83192a11cf 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/kcont

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

2019-11-24 Thread Andreas Sturmlechner
commit: 32cc38bd4967afff847b1d141d7a754ddd73744d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 24 10:59:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 24 10:59:02 2019 +
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  gentoo.org>

 kde-apps/kopete/kopete-19.11.80.ebuild  | 30 ++---
 kde-apps/kopete/kopete-19.12.49..ebuild | 30 ++---
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-19.12.49..ebuild
index 4efd83c910..53d064e5db 100644
--- a/kde-apps/kopete/kopete-19.12.49..ebuild
+++ b/kde-apps/kopete/kopete-19.12.49..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 jingl

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

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

kde-apps/kopete: Make USE=oscar local

Signed-off-by: Michał Górny  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 @@
Enables saving chat history.
Embed latex formatted text into 
messages.
Shows song you currently listen to in 
your status/etc. Bindings for many players.
+   Enable Oscar (AIM/ICQ) IM protocol 
support
Allows crypting your chat (drugs and talking 
nonsense are considered as good alternatives ;]).
Send messages to external pipe.
Filter for incoming messages



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

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

kde-apps/kopete: Make USE=jingle local

Signed-off-by: Michał Górny  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 @@
Enables writing personal notes for 
contacts.
Allows you to specify highlights on 
specific events.
Enables saving chat history.
+   Enable voice calls for jabber
Embed latex formatted text into 
messages.
Shows song you currently listen to in 
your status/etc. Bindings for many players.
Enable Oscar (AIM/ICQ) IM protocol 
support



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

2018-08-16 Thread Andreas Sturmlechner
commit: 144c2568af1c381894aa76381d779712cd4e343b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 16 18:56:25 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 16 19:03:30 2018 +
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..ebuild | 1 +
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-18.08.49..ebuild
index 9c0c95d69e..b2961f2bd4 100644
--- a/kde-apps/kopete/kopete-18.08.49..ebuild
+++ b/kde-apps/kopete/kopete-18.08.49..ebuild
@@ -116,6 +116,7 @@ COMMONDEPEND="
)
 "
 RDEPEND="${COMMONDEPEND}
+   !kde-apps/kde4-l10n
latex? (
|| (
media-gfx/imagemagick

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 9c0c95d69e..b2961f2bd4 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-08-09 Thread Andreas Sturmlechner
commit: 7661f3103e903cca69ef2aca582b1868e686c995
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  9 21:40:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  9 21:40:50 2018 +
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-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index e85445d587..9c0c95d69e 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-07-07 Thread Andreas Sturmlechner
commit: c80dab032b6f76b7ab2b0c30ab55f1b59e241457
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  7 10:27:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  7 10:27:31 2018 +
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..ebuild | 6 +++---
 kde-apps/kopete/kopete-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-18.04.49..ebuild 
b/kde-apps/kopete/kopete-18.04.49..ebuild
index fc67469193..e85445d587 100644
--- a/kde-apps/kopete/kopete-18.04.49..ebuild
+++ b/kde-apps/kopete/kopete-18.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index fc67469193..e85445d587 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-06-16 Thread Andreas Sturmlechner
commit: 1b90e57fdb2f4478f3f9543c9239aa814ffabc5e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 12 17:37:39 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 16 18:55:08 2018 +
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..ebuild | 11 ---
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-18.04.49..ebuild
index 3509019389..fc67469193 100644
--- a/kde-apps/kopete/kopete-18.04.49..ebuild
+++ b/kde-apps/kopete/kopete-18.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 3509019389..fc67469193 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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 @@
Enable the Sametime protocol 
handler.
Enable the testbed protocol.
Enable pop-up messages sending on 
windows. (same as good old "net send" messages ;])
-   Enable yahoo protocol support.
Enable Link-Local Messaging via the 
bonjour protocol.

 



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

2018-05-18 Thread Andreas Sturmlechner
commit: 7765ebd353fbd3b2c4cbb64badc2ca9c285e52b7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 18 06:51:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 18 07:22:26 2018 +
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..ebuild | 2 --
 kde-apps/kopete/kopete-.ebuild  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-apps/kopete/kopete-18.04.49..ebuild 
b/kde-apps/kopete/kopete-18.04.49..ebuild
index 09727ab703..3509019389 100644
--- a/kde-apps/kopete/kopete-18.04.49..ebuild
+++ b/kde-apps/kopete/kopete-18.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 09727ab703..3509019389 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-02-22 Thread Andreas Sturmlechner
commit: 145168699f737010d5e9d94e96d590638d35f393
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 22 13:04:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 13:04:17 2018 +
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-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 689d5269f9..78f452e338 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-02-09 Thread Andreas Sturmlechner
commit: 22802ddeb04368b7ac9a349424a2b0aab6413a68
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb  9 21:43:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb  9 21:52:57 2018 +
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-.ebuild | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 96695e0c2c..689d5269f9 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2018-01-18 Thread Andreas Sturmlechner
commit: d8676342da31612f26b70c7591d2c1d7183c7857
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 18 13:28:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 18 13:28:26 2018 +
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-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 0463b149c2..96695e0c2c 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2017-11-19 Thread Andreas Sturmlechner
commit: 68572f8a77699470a0ebfa68a2545bb05e940410
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 19 19:07:46 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 19 19:07:46 2017 +
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-.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..00
--- 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}
- 

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

2017-11-19 Thread Andreas Sturmlechner
commit: d5b996d08fc0b98c8c59cb7853390e0be6efab3d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 19 18:01:56 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 19 18:01:56 2017 +
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-.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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 5b143ac46c..031314eee2 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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 

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

2017-11-19 Thread Andreas Sturmlechner
commit: 7dd24ef8cbd4a84ddd39fb700b9160f62a7652a8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 19 18:03:19 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 19 18:03:19 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dd24ef8

kde-apps/kopete: Drop obsolete patch

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../kopete/files/kopete-17.04.0-kde4qgpgme.patch   | 56 --
 1 file changed, 56 deletions(-)

diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch 
b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
deleted file mode 100644
index 59e2a3752e..00
--- a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
+++ /dev/null
@@ -1,56 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,8 +98,8 @@
- macro_optional_find_package(QJSON)
- macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" 
"http://qjson.sourceforge.net/"; FALSE "" "Required for the Jabber protocol")
- 
--macro_optional_find_package(QGpgme)
--macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" 
"http://www.kde.org/"; FALSE "" "Required for the Cryptography plugin")
-+macro_optional_find_package(KDE4_QGpgme)
-+macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from 
kdepimlibs)" "http://www.kde.org/"; FALSE "" "Required for the Cryptography 
plugin")
- 
- macro_optional_find_package(Sqlite)
- macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" 
"http://www.sqlite.org/"; FALSE "" "Required for the Statistic plugin")
 a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -74,6 +74,6 @@
- if (WITH_otr AND LIBOTR_FOUND)
-   add_subdirectory ( otr )
- endif (WITH_otr AND LIBOTR_FOUND)
--if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
-+if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
-   add_subdirectory ( cryptography )
--endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
-+endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
 a/plugins/cryptography/CMakeLists.txt
-+++ b/plugins/cryptography/CMakeLists.txt
-@@ -17,7 +17,7 @@
- 
- kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS})
- 
--target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  
${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} 
${QGPGME_LIBRARIES} )
-+target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  
${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} 
${KDE4_QGPGME_LIBRARIES} )
- 
- install(TARGETS kopete_cryptography  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
 a/plugins/cryptography/cryptographyplugin.cpp
-+++ b/plugins/cryptography/cryptographyplugin.cpp
-@@ -52,12 +52,12 @@
- #include 
- #include 
- #include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
- 
- // kabc stuff
- #include 



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

2017-11-19 Thread Andreas Sturmlechner
commit: 19629de61e4bcf3f2b69f16f679f0e45f2143af4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 19 18:02:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 19 18:02:26 2017 +
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/

2017-11-11 Thread Andreas Sturmlechner
commit: fd7262196a1c29d649013d2dea4fdd21e2ff11da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 11 22:05:04 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 11 22:05:04 2017 +
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 00..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? (
+   ||

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

2017-09-18 Thread Johannes Huber
commit: 148f236c1f18d7ab7c9d93b4b5be7979a553da77
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Sep 18 18:55:54 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Sep 18 18:55:54 2017 +
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..ebuild | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.08.49..ebuild 
b/kde-apps/kopete/kopete-17.08.49..ebuild
index 1251a9c1c4..32458a1fab 100644
--- a/kde-apps/kopete/kopete-17.08.49..ebuild
+++ b/kde-apps/kopete/kopete-17.08.49..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/, eclass/

2017-09-05 Thread Andreas Sturmlechner
commit: d4f6c986c9e495330017eff12b6d62988369386a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 30 18:08:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep  5 13:36:47 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4f6c986

kde4*.eclass: Drop USE=aqua

 eclass/kde4-base.eclass | 12 ++--
 eclass/kde4-functions.eclass| 14 ++
 kde-apps/kopete/kopete-17.08.49..ebuild |  8 +++-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 1a5a4e0c79..ec1082c835 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -392,10 +392,8 @@ unset kdelibsuse
 kdedepend="
dev-util/automoc
virtual/pkgconfig
-   !aqua? (
-   >=x11-libs/libXtst-1.1.0
-   x11-proto/xf86vidmodeproto
-   )
+   >=x11-libs/libXtst-1.1.0
+   x11-proto/xf86vidmodeproto
 "
 
 kderdepend=""
@@ -448,12 +446,6 @@ case ${KDE_SELINUX_MODULE} in
;;
 esac
 
-# We always need the aqua useflag because otherwise we cannot = refer to it 
inside
-# add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5
-# (where referring to a use flag not in IUSE masks the ebuild).
-# The only alternative would be to prohibit using add_kdebase_dep if 
KDE_REQUIRED=never
-IUSE+=" aqua"
-
 case ${KDE_REQUIRED} in
always)
[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" 
${kdecommondepend}"

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 7f3230d4d2..558191db5e 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,6 +296,10 @@ add_kdeapps_dep() {
 
local ver
 
+   if [[ -n ${2} ]] ; then
+   local use="[${2}]"
+   fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -313,9 +317,7 @@ add_kdeapps_dep() {
 
[[ -z ${1} ]] && die "Missing parameter"
 
-   #FIXME
-   # Drop aqua= from kf5 packages
-   echo " >=kde-apps/${1}-${ver}:4[aqua=${2:+,${2}}]"
+   echo " >=kde-apps/${1}-${ver}:4${use}"
 }
 
 # @FUNCTION: add_kdebase_dep
@@ -332,6 +334,10 @@ add_kdebase_dep() {
 
local ver
 
+   if [[ -n ${2} ]] ; then
+   local use="[${2}]"
+   fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -351,7 +357,7 @@ add_kdebase_dep() {
 
[[ -z ${1} ]] && die "Missing parameter"
 
-   echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
+   echo " >=kde-base/${1}-${ver}:4${use}"
 }
 
 # local function to enable specified translations for specified directory

diff --git a/kde-apps/kopete/kopete-17.08.49..ebuild 
b/kde-apps/kopete/kopete-17.08.49..ebuild
index df6a667b47..1251a9c1c4 100644
--- a/kde-apps/kopete/kopete-17.08.49..ebuild
+++ b/kde-apps/kopete/kopete-17.08.49..ebuild
@@ -71,10 +71,8 @@ COMMONDEPEND="
kde-frameworks/kdelibs:4[zeroconf?]
media-libs/phonon[qt4]
media-libs/qimageblitz[-qt5(-)]
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXScrnSaver
-   )
+   x11-libs/libX11
+   x11-libs/libXScrnSaver
cryptography? (
|| (
$(add_kdeapps_dep kdepim-common-libs)
@@ -117,8 +115,8 @@ RDEPEND="${COMMONDEPEND}
winpopup? ( net-fs/samba )
 "
 DEPEND="${COMMONDEPEND}
+   x11-proto/scrnsaverproto
jingle? ( dev-libs/jsoncpp )
-   !aqua? ( x11-proto/scrnsaverproto )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )



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

2017-08-11 Thread Andreas Sturmlechner
commit: 462379d391804ee6bb9a17cc247b45e44bd69c11
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 10 11:19:24 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 11 12:09:35 2017 +
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..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/kopete-17.08.49..ebuild 
b/kde-apps/kopete/kopete-17.08.49..ebuild
index 9786c7e276..df6a667b47 100644
--- a/kde-apps/kopete/kopete-17.08.49..ebuild
+++ b/kde-apps/kopete/kopete-17.08.49..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/

2017-05-11 Thread Andreas Sturmlechner
commit: e87ee18ee571319d7e6d9f60fa4d797bd31ecbbd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 11 21:32:47 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 11 21:32:47 2017 +
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..ebuild | 2 +-
 kde-apps/kopete/kopete-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-17.04.49..ebuild 
b/kde-apps/kopete/kopete-17.04.49..ebuild
index fde591c1fc..9786c7e276 100644
--- a/kde-apps/kopete/kopete-17.04.49..ebuild
+++ b/kde-apps/kopete/kopete-17.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index fde591c1fc..9786c7e276 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/, kde-apps/kopete/files/

2017-05-01 Thread Andreas Sturmlechner
commit: e26964494cd5a8ea670b5b497ff775b396db8dbb
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Mar  5 19:20:22 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 30 21:26:57 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e2696449

kde-apps/kopete: Fix configure w/ KDE4_QGpgme

Update gpgme++ and qgpgme references.

 .../kopete/files/kopete-17.04.0-kde4qgpgme.patch   | 56 ++
 kde-apps/kopete/kopete-17.04.49..ebuild|  5 +-
 kde-apps/kopete/kopete-.ebuild |  5 +-
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch 
b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
new file mode 100644
index 00..59e2a3752e
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
@@ -0,0 +1,56 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -98,8 +98,8 @@
+ macro_optional_find_package(QJSON)
+ macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" 
"http://qjson.sourceforge.net/"; FALSE "" "Required for the Jabber protocol")
+ 
+-macro_optional_find_package(QGpgme)
+-macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" 
"http://www.kde.org/"; FALSE "" "Required for the Cryptography plugin")
++macro_optional_find_package(KDE4_QGpgme)
++macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from 
kdepimlibs)" "http://www.kde.org/"; FALSE "" "Required for the Cryptography 
plugin")
+ 
+ macro_optional_find_package(Sqlite)
+ macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" 
"http://www.sqlite.org/"; FALSE "" "Required for the Statistic plugin")
+--- a/plugins/CMakeLists.txt
 b/plugins/CMakeLists.txt
+@@ -74,6 +74,6 @@
+ if (WITH_otr AND LIBOTR_FOUND)
+   add_subdirectory ( otr )
+ endif (WITH_otr AND LIBOTR_FOUND)
+-if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
++if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
+   add_subdirectory ( cryptography )
+-endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
++endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
+--- a/plugins/cryptography/CMakeLists.txt
 b/plugins/cryptography/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS})
+ 
+-target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  
${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} 
${QGPGME_LIBRARIES} )
++target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  
${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} 
${KDE4_QGPGME_LIBRARIES} )
+ 
+ install(TARGETS kopete_cryptography  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+--- a/plugins/cryptography/cryptographyplugin.cpp
 b/plugins/cryptography/cryptographyplugin.cpp
+@@ -52,12 +52,12 @@
+ #include 
+ #include 
+ #include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ // kabc stuff
+ #include 

diff --git a/kde-apps/kopete/kopete-17.04.49..ebuild 
b/kde-apps/kopete/kopete-17.04.49..ebuild
index d51b05e789..fde591c1fc 100644
--- a/kde-apps/kopete/kopete-17.04.49..ebuild
+++ b/kde-apps/kopete/kopete-17.04.49..ebuild
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-   $(add_kdeapps_dep kdepimlibs)
+   $(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
dev-libs/libpcre
>=dev-qt/qtgui-4.4.0:4[mng]
kde-frameworks/kdelibs:4[zeroconf?]
@@ -106,6 +106,7 @@ COMMONDEPEND="
yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+   !=kde-apps/kdepimlibs-4.14.11_pre20160211*
jingle? ( media-libs/speex )
latex? (
virtual/imagemagick-tools
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND}
!aqua? ( x11-proto/scrnsaverproto )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
+
 src_configure() {
local x x2
# Handle common stuff

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index d51b05e789..fde591c1fc 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.ebuild
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-   $(add_kdeapps_dep kdepimlibs)
+   $(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
dev-libs/libpcre
>=dev-qt/qtgui-4.4.0:4[mng]
kde-frameworks/kdelibs:4[zeroconf?]
@@ -106,6 +106,7 @@ COMMONDEPEND="
yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+   !=kde-apps/kdepimlibs-4.14.11_pre20160211*
jingle? ( media-libs/speex )
latex? (
virtual/imagemagick-tools
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND}
  

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

2017-04-05 Thread Andreas Sturmlechner
commit: 913bf31832851bbfb985f03494eabf0ebe145884
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  5 20:15:07 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  5 20:15:07 2017 +
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..ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kopete/kopete-5..ebuild 
b/kde-apps/kopete/kopete-5..ebuild
index be07a028bc..99c5c23871 100644
--- a/kde-apps/kopete/kopete-5..ebuild
+++ b/kde-apps/kopete/kopete-5..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/

2017-03-28 Thread Andreas Sturmlechner
commit: c6c9c0bec5ffd2e381cbab26e519913f611a1b95
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 28 12:13:25 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 28 12:13:25 2017 +
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..ebuild |  7 +++
 kde-apps/kopete/kopete-5..ebuild| 12 ++--
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-17.04.49..ebuild
index 72c5b2f385..d51b05e789 100644
--- a/kde-apps/kopete/kopete-17.04.49..ebuild
+++ b/kde-apps/kopete/kopete-17.04.49..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..ebuild 
b/kde-apps/kopete/kopete-5..ebuild
index b6441411dc..be07a028bc 100644
--- a/kde-apps/kopete/kopete-5..ebuild
+++ b/kde-apps/kopete/kopete-5..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=OF

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

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

kde-apps/kopete: Add missing DEPEND

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

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/kde-apps/kopete/kopete-5..ebuild 
b/kde-apps/kopete/kopete-5..ebuild
index 5dff05de5b..b6441411dc 100644
--- a/kde-apps/kopete/kopete-5..ebuild
+++ b/kde-apps/kopete/kopete-5..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/

2017-03-24 Thread Andreas Sturmlechner
commit: f8222979818521399e0e56a764c2059c0ecaf6f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 24 17:27:13 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 24 17:55:14 2017 +
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..ebuild | 180 +++
 1 file changed, 180 insertions(+)

diff --git a/kde-apps/kopete/kopete-5..ebuild 
b/kde-apps/kopete/kopete-5..ebuild
new file mode 100644
index 00..5dff05de5b
--- /dev/null
+++ b/kde-apps/kopete/kopete-5..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_GOOG

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

2017-03-21 Thread Andreas Sturmlechner
commit: 9173b363554db8a5ff6897c458831f9d6837b03b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Mar  5 19:18:28 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 21 22:22:51 2017 +
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..ebuild | 23 +++
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-17.04.49..ebuild
index be4a117b89..72c5b2f385 100644
--- a/kde-apps/kopete/kopete-17.04.49..ebuild
+++ b/kde-apps/kopete/kopete-17.04.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index be4a117b89..72c5b2f385 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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 D

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

2017-02-12 Thread Johannes Huber
commit: 3bac4715011dc59a55f63790e6e5ffb273d3dea4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Feb 12 20:05:44 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Feb 12 20:08:36 2017 +
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..ebuild | 7 ++-
 kde-apps/kopete/kopete-.ebuild  | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.12.49..ebuild 
b/kde-apps/kopete/kopete-16.12.49..ebuild
index 19bb156eeb..73653f9428 100644
--- a/kde-apps/kopete/kopete-16.12.49..ebuild
+++ b/kde-apps/kopete/kopete-16.12.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 19bb156eeb..73653f9428 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2016-11-12 Thread Michael Palimaka
commit: 016031fcdfaec6bd9739d0d55889c67d76a5823e
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Nov 11 21:38:26 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 12 10:55:01 2016 +
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-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 176986c..75fcb82 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/, kde-apps/ktp-auth-handler/, kde-misc/kdeconnect/, ...

2016-10-28 Thread Michael Palimaka
commit: be8c62b4afa945daa83195feb3e5cd31c1fb5b9e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 28 15:17:01 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 28 15:17:04 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=be8c62b4

app-crypt/qca[openssl] -> ssl

 kde-apps/kopete/kopete-16.08.49..ebuild | 6 +++---
 kde-apps/kopete/kopete-.ebuild  | 6 +++---
 kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.49..ebuild | 2 +-
 kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild  | 2 +-
 kde-misc/kdeconnect/kdeconnect-.ebuild  | 2 +-
 net-irc/konversation/konversation-.ebuild   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.08.49..ebuild 
b/kde-apps/kopete/kopete-16.08.49..ebuild
index e136108..176986c 100644
--- a/kde-apps/kopete/kopete-16.08.49..ebuild
+++ b/kde-apps/kopete/kopete-16.08.49..ebuild
@@ -107,7 +107,7 @@ RDEPEND="${COMMONDEPEND}
)
virtual/latex-base
)
-   ssl? ( app-crypt/qca:2[openssl] )
+   ssl? ( app-crypt/qca:2[ssl] )
winpopup? ( net-fs/samba )
 "
 DEPEND="${COMMONDEPEND}
@@ -150,9 +150,9 @@ pkg_postinst() {
 
if ! use ssl; then
if use xmpp ; then # || use irc; then
-   if ! has_version "app-crypt/qca:2[openssl]" ; 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=openssl."
+   elog "install app-crypt/qca package with 
USE=ssl."
fi
fi
fi

diff --git a/kde-apps/kopete/kopete-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index e136108..176986c 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.ebuild
@@ -107,7 +107,7 @@ RDEPEND="${COMMONDEPEND}
)
virtual/latex-base
)
-   ssl? ( app-crypt/qca:2[openssl] )
+   ssl? ( app-crypt/qca:2[ssl] )
winpopup? ( net-fs/samba )
 "
 DEPEND="${COMMONDEPEND}
@@ -150,9 +150,9 @@ pkg_postinst() {
 
if ! use ssl; then
if use xmpp ; then # || use irc; then
-   if ! has_version "app-crypt/qca:2[openssl]" ; 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=openssl."
+   elog "install app-crypt/qca package with 
USE=ssl."
fi
fi
fi

diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.49..ebuild 
b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.49..ebuild
index 5a828cc..32fb247 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.49..ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.49..ebuild
@@ -35,6 +35,6 @@ DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kdewebkit)
 "
 RDEPEND="${COMMON_DEPEND}
-   app-crypt/qca:2[openssl]
+   app-crypt/qca:2[ssl]
!kde-apps/ktp-auth-handler:4
 "

diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild 
b/kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild
index 5a828cc..32fb247 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-.ebuild
@@ -35,6 +35,6 @@ DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kdewebkit)
 "
 RDEPEND="${COMMON_DEPEND}
-   app-crypt/qca:2[openssl]
+   app-crypt/qca:2[ssl]
!kde-apps/ktp-auth-handler:4
 "

diff --git a/kde-misc/kdeconnect/kdeconnect-.ebuild 
b/kde-misc/kdeconnect/kdeconnect-.ebuild
index 9b4f339..ff552f9 100644
--- a/kde-misc/kdeconnect/kdeconnect-.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-.ebuild
@@ -34,7 +34,7 @@ DEPEND="
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
-   >=app-crypt/qca-2.1.0:2[qt5,openssl]
+   >=app-crypt/qca-2.1.0:2[qt5,ssl]
x11-libs/libfakekey
x11-libs/libX11
x11-libs/libXtst

diff --git a/net-irc/konversation/konversation-.ebuild 
b/net-irc/konversation/konversation-.ebuild
index 96b77f1..0eb5607 100644
--- a/net-irc/konversation/konversation-.ebuild
+++ b/net-irc/konversation/konversation-.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
!net-irc/konversation:4
-   crypt? ( app-crypt/qca:2[openssl] )
+   crypt? ( app-crypt/qca:2[ssl] )
 "
 
 src_configure() {



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

2016-08-10 Thread Michael Palimaka
commit: 52a73c5524eba1c5eceb433c86aabdd987180d4f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Aug 10 19:35:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 10 19:35:57 2016 +
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..ebuild | 5 ++---
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-16.08.49..ebuild
index 2430c97..e136108 100644
--- a/kde-apps/kopete/kopete-16.08.49..ebuild
+++ b/kde-apps/kopete/kopete-16.08.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 2430c97..e136108 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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 @@

-   Enable SMS sendinge functionality.
Enable the testbed protocol.
Enable XMPP protocol handler (this is also 
gmail).
Enable pop-up messages sending on 
windows. (same as good old "net send" messages ;])



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

2016-04-07 Thread Johannes Huber
commit: d353f20a60653029b84c4e91834688c39da3a4b4
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  7 18:58:21 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr  7 19:23:27 2016 +
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..ebuild | 25 +
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-16.04.49..ebuild
index ea8ef2f..2430c97 100644
--- a/kde-apps/kopete/kopete-16.04.49..ebuild
+++ b/kde-apps/kopete/kopete-16.04.49..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 )
 
#

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

2015-08-26 Thread Johannes Huber
commit: eef6d33888ceb265d1a23a4da40301958c741b18
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Aug 26 21:42:38 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Aug 26 21:42:38 2015 +
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..000
--- 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='' ;

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

2015-08-26 Thread Johannes Huber
commit: c48b2b13186d75bc4a31adba138ff7c6bd675cb1
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Aug 26 21:36:35 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Aug 26 21:36:35 2015 +
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..ebuild | 2 +-
 kde-apps/kopete/kopete-.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..ebuild 
b/kde-apps/kopete/kopete-15.08.49..ebuild
index cd8abb6..97f34e3 100644
--- a/kde-apps/kopete/kopete-15.08.49..ebuild
+++ b/kde-apps/kopete/kopete-15.08.49..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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index cd8abb6..97f34e3 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2015-02-22 Thread Johannes Huber
commit: 632bdb95ade7f7bc8a0b2085f0b327746abd24b2
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Feb 22 21:48:30 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Feb 22 21:48:30 2015 +
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-.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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 0e7ae12..d4e07a0 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2015-02-17 Thread Michael Palimaka
commit: 84caaa9de4a4385342aa24f2f27b267c6d25e1bf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Feb 17 13:47:29 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Feb 17 13:47:29 2015 +
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-.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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index 8131ba3..0e7ae12 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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/

2015-02-06 Thread Michael Palimaka
commit: a00b4aabbf8e21d8203ee3dfb7b2db77da01f222
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Feb  6 17:06:49 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  6 17:06:49 2015 +
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-.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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index b5d2c61..8131ba3 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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-li

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

2015-01-28 Thread Johannes Huber
commit: 672999f41c82bddb8da2edd99efd7f4330e8c673
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jan 28 23:37:42 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Jan 28 23:37:47 2015 +
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-.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-.ebuild 
b/kde-apps/kopete/kopete-.ebuild
index b6a6493..b5d2c61 100644
--- a/kde-apps/kopete/kopete-.ebuild
+++ b/kde-apps/kopete/kopete-.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 )"