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

[Andreas Sturmlechner]

commit:     84ca2b703b2d3dd717e0ce6b5d4a9838b757c092
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 12:15:38 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 12:16:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ca2b70

kde-apps/kopete: Fix DEPEND, silence cmake warnings

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kopete/kopete-16.12.3-r1.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kopete/kopete-16.12.3-r1.ebuild 
b/kde-apps/kopete/kopete-16.12.3-r1.ebuild
index fb5807f9319..be9563fab70 100644
--- a/kde-apps/kopete/kopete-16.12.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-16.12.3-r1.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/+/}) )